From e3697efbb0fa4a1ab27162ec45529dcb850a7183 Mon Sep 17 00:00:00 2001
From: Lucas Azevedo <lhs_azevedo@hotmail.com>
Date: Fri, 2 Sep 2022 16:18:34 -0300
Subject: [PATCH] Fix modified due date message (#20388) (#21032)

Backport #20388
---
 options/locale/locale_en-US.ini                 | 2 +-
 templates/repo/issue/view_content/comments.tmpl | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 84a7c237f5211..2b21ccf20fd91 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 0258a9f9691c0..359efeced45d0 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}}