From 121b82397195659a37e22d5a3ff0c3e24e1b5b39 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 28 Nov 2024 12:35:51 -0800 Subject: [PATCH] Follow template change --- .../sidebar_development.tmpl => sidebar/development.tmpl} | 6 +++--- templates/repo/issue/view_content/sidebar.tmpl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename templates/repo/issue/{view_content/sidebar_development.tmpl => sidebar/development.tmpl} (91%) diff --git a/templates/repo/issue/view_content/sidebar_development.tmpl b/templates/repo/issue/sidebar/development.tmpl similarity index 91% rename from templates/repo/issue/view_content/sidebar_development.tmpl rename to templates/repo/issue/sidebar/development.tmpl index b12da6e8a1..7f9ba6ed63 100644 --- a/templates/repo/issue/view_content/sidebar_development.tmpl +++ b/templates/repo/issue/sidebar/development.tmpl @@ -15,7 +15,7 @@
- {{ctx.Locale.Tr "repo.issues.link.created" (DateTime "short" .PullRequest.Issue.CreatedUnix)}} + {{ctx.Locale.Tr "repo.issues.link.created" (DateUtils.AbsoluteShort .PullRequest.Issue.CreatedUnix)}} {{if .PullRequest.HasMerged}} {{ctx.Locale.Tr "repo.issues.pr.completed"}}
@@ -23,7 +23,7 @@ {{svg "octicon-git-commit" 14}} {{.PullRequest.MergedCommitID | ShortSha}}
- {{ctx.Locale.Tr "repo.issues.link.created" (DateTime "short" .PullRequest.MergedUnix)}} + {{ctx.Locale.Tr "repo.issues.link.created" (DateUtils.AbsoluteShort .PullRequest.MergedUnix)}} {{else if .PullRequest.ChangedProtectedFiles}} {{ctx.Locale.Tr "repo.issues.pr.conflicted"}} {{end}} @@ -42,7 +42,7 @@
-
{{ctx.Locale.Tr "repo.issues.branch.latest" (DateTime "short" .Branch.CommitTime)}}
+
{{ctx.Locale.Tr "repo.issues.branch.latest" (DateUtils.AbsoluteShort .Branch.CommitTime)}}
{{end}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 948f5b73ad..42b93478d4 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -15,7 +15,7 @@ {{end}} {{template "repo/issue/sidebar/assignee_list" $.IssuePageMetaData}} - {{template "repo/issue/view_content/sidebar_development" .}} + {{template "repo/issue/sidebar/development" .}} {{template "repo/issue/sidebar/participant_list" $}} {{template "repo/issue/sidebar/watch_notification" $}} {{template "repo/issue/sidebar/stopwatch_timetracker" $}}