aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Azevedo <lhs_azevedo@hotmail.com>2022-09-02 16:18:34 -0300
committerGitHub <noreply@github.com>2022-09-02 15:18:34 -0400
commite3697efbb0fa4a1ab27162ec45529dcb850a7183 (patch)
tree8a70ffda9ee4cfb277bd5031fb44562e9a16f1c3
parent989dd5502cad270b461f8c59cf186638dc9a4f16 (diff)
downloadgitea-e3697efbb0fa4a1ab27162ec45529dcb850a7183.tar.gz
gitea-e3697efbb0fa4a1ab27162ec45529dcb850a7183.zip
Fix modified due date message (#20388) (#21032)
Backport #20388
-rw-r--r--options/locale/locale_en-US.ini2
-rw-r--r--templates/repo/issue/view_content/comments.tmpl3
2 files changed, 3 insertions, 2 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 84a7c237f5..2b21ccf20f 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1420,7 +1420,7 @@ issues.due_date_form_remove = "Remove"
issues.due_date_not_writer = "You need repository write access to update an issue's due date."
issues.due_date_not_set = "No due date set."
issues.due_date_added = "added the due date %s %s"
-issues.due_date_modified = "modified the due date to %s from %s %s"
+issues.due_date_modified = "modified the due date from %[2]s to %[1]s %[3]s"
issues.due_date_remove = "removed the due date %s %s"
issues.due_date_overdue = "Overdue"
issues.due_date_invalid = "The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'."
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 0258a9f969..359efeced4 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -340,7 +340,8 @@
</a>
<span class="text grey">
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
- {{$.i18n.Tr "repo.issues.due_date_modified" (.Content | ParseDeadline) $createdStr | Safe}}
+ {{$parsedDeadline := .Content | ParseDeadline}}
+ {{$.i18n.Tr "repo.issues.due_date_modified" (index $parsedDeadline 0) (index $parsedDeadline 1) $createdStr | Safe}}
</span>
</div>
{{else if eq .Type 18}}