diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-11 17:48:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-11 17:48:13 +0800 |
| commit | 25faee3c5f5be23c99b3b7e50418fc0dbad7a41b (patch) | |
| tree | 95b83bbbc7787b7cbaec01554f72ae7d4083ba05 /templates | |
| parent | 704f3aa91c05aeab7ba18bda62f768ab9233cf6f (diff) | |
| download | gitea-25faee3c5f5be23c99b3b7e50418fc0dbad7a41b.tar.gz gitea-25faee3c5f5be23c99b3b7e50418fc0dbad7a41b.zip | |
Fix date display bug (#24047)
Follow
https://github.com/go-gitea/gitea/pull/23988#pullrequestreview-1377696819
Many template helper functions are not good enough and cause various
problems, that's why I am cleaning them.
## Before
## After
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/projects/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/milestone_issues.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/milestones.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/comments.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/projects/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/milestones.tmpl | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 73ae5ab6e4..213bab70b6 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -42,7 +42,7 @@ <div class="meta"> {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} {{end}} <span class="issue-stats"> {{svg "octicon-issue-opened" 16 "gt-mr-3"}} diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 123845de68..c3c25843e8 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -31,7 +31,7 @@ <div class="column"> {{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.locale}} {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} {{else}} {{svg "octicon-calendar"}} {{if .Milestone.DeadlineString}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 0336d35c17..42a6c4f919 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -73,7 +73,7 @@ <div class="meta"> {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} {{else}} {{svg "octicon-calendar"}} {{if .DeadlineString}} diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 91bef4fe1a..251f205a03 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -125,9 +125,9 @@ {{template "shared/user/authorlink" .Poster}} {{$link := printf "%s/commit/%s" $.Repository.Link ($.Issue.PullRequest.MergedCommitID|PathEscape)}} {{if eq $.Issue.PullRequest.Status 3}} - {{$.locale.Tr "repo.issues.manually_pull_merged_at" ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID) ($.BaseTarget|Escape) $createdStr | Str2html}} + {{$.locale.Tr "repo.issues.manually_pull_merged_at" ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID) ($.BaseTarget|Escape) $createdStr | Safe}} {{else}} - {{$.locale.Tr "repo.issues.pull_merged_at" ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID) ($.BaseTarget|Escape) $createdStr | Str2html}} + {{$.locale.Tr "repo.issues.pull_merged_at" ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID) ($.BaseTarget|Escape) $createdStr | Safe}} {{end}} </span> </div> diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 227a272705..fb5bc4f48d 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -44,7 +44,7 @@ <div class="meta"> {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} {{end}} <span class="issue-stats"> {{svg "octicon-issue-opened" 16 "gt-mr-3"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 1c379ac09d..6788aa09a2 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -93,7 +93,7 @@ <div class="meta"> {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} {{else}} {{svg "octicon-calendar"}} {{if .DeadlineString}} |