From d427910e83a2b909e09b7d7aa4d22315c9837e8b Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 12 Apr 2023 15:07:11 +0800 Subject: [PATCH 1/3] Fix difficult translation for other languages --- options/locale/locale_en-US.ini | 2 +- templates/repo/issue/milestones.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index cf3208b5bdcb1..616f77fa0f241 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1710,7 +1710,7 @@ pulls.delete.text = Do you really want to delete this pull request? (This will p milestones.new = New Milestone milestones.closed = Closed %s -milestones.updated = Updated +milestones.updated = Updated %s milestones.no_due_date = No due date milestones.open = Open milestones.close = Close diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 2864d38a08e9b..94091f1a38fa8 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -88,7 +88,7 @@ {{svg "octicon-check" 16 "gt-mr-3"}} {{LocaleNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} {{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}} - {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.updated"}} {{TimeSinceUnix .UpdatedUnix $.locale}}{{end}} + {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.updated" (TimeSinceUnix .UpdatedUnix $.locale)}}{{end}} {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} From 729f1742fc480462c4d523a130eb4535c9eaca62 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 12 Apr 2023 15:18:38 +0800 Subject: [PATCH 2/3] Fix time render --- templates/repo/issue/milestones.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 94091f1a38fa8..7ba6727b79386 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -88,7 +88,7 @@ {{svg "octicon-check" 16 "gt-mr-3"}} {{LocaleNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} {{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}} - {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.updated" (TimeSinceUnix .UpdatedUnix $.locale)}}{{end}} + {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.updated" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}}{{end}} {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} From 536456622132a863293ff69ca79e1bf349a1be07 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 12 Apr 2023 15:29:14 +0800 Subject: [PATCH 3/3] Improvement --- options/locale/locale_en-US.ini | 2 +- templates/repo/issue/milestones.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 616f77fa0f241..cd95771a4d3d3 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1710,7 +1710,7 @@ pulls.delete.text = Do you really want to delete this pull request? (This will p milestones.new = New Milestone milestones.closed = Closed %s -milestones.updated = Updated %s +milestones.update_ago = Updated %s milestones.no_due_date = No due date milestones.open = Open milestones.close = Close diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 7ba6727b79386..602461400b928 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -88,7 +88,7 @@ {{svg "octicon-check" 16 "gt-mr-3"}} {{LocaleNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} {{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}} - {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.updated" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}}{{end}} + {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}}{{end}} {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}}