From 12c23314a5a5aa6c4b9eeb51e6af319178708563 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Tue, 11 Apr 2023 16:22:47 +0000
Subject: [PATCH] Localize the issue due date events

---
 options/locale/locale_en-US.ini                 |  7 ++++---
 templates/repo/issue/view_content/comments.tmpl | 14 +++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 0a10b70d9daa1..db91bc659567a 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1505,9 +1505,10 @@ issues.due_date_form_edit = "Edit"
 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 from %[2]s to %[1]s %[3]s"
-issues.due_date_remove = "removed the due date %s %s"
+issues.due_date_added = "added the due date"
+issues.due_date_modified_from = "modified the due date from"
+issues.due_date_modified_to = "to"
+issues.due_date_remove = "removed the due date"
 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'."
 issues.dependency.title = Dependencies
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 251f205a0312c..46ca9de8f337e 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -295,7 +295,9 @@
 				{{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}}
 				<span class="text grey muted-links">
 					{{template "shared/user/authorlink" .Poster}}
-					{{$.locale.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}}
+					{{$.locale.Tr "repo.issues.due_date_added"}}
+					{{template "shared/datetime/short" (dict "Datetime" .Content "Fallback" .Content)}}
+					{{$createdStr}}
 				</span>
 			</div>
 		{{else if eq .Type 17}}
@@ -305,7 +307,11 @@
 				<span class="text grey muted-links">
 					{{template "shared/user/authorlink" .Poster}}
 					{{$parsedDeadline := .Content | ParseDeadline}}
-					{{$.locale.Tr "repo.issues.due_date_modified" (index $parsedDeadline 0) (index $parsedDeadline 1) $createdStr | Safe}}
+					{{$.locale.Tr "repo.issues.due_date_modified_from"}}
+					{{template "shared/datetime/short" (dict "Datetime" (index $parsedDeadline 1) "Fallback" (index $parsedDeadline 1))}}
+					{{$.locale.Tr "repo.issues.due_date_modified_to"}}
+					{{template "shared/datetime/short" (dict "Datetime" (index $parsedDeadline 0) "Fallback" (index $parsedDeadline 0))}}
+					{{$createdStr}}
 				</span>
 			</div>
 		{{else if eq .Type 18}}
@@ -314,7 +320,9 @@
 				{{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}}
 				<span class="text grey muted-links">
 					{{template "shared/user/authorlink" .Poster}}
-					{{$.locale.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}}
+					{{$.locale.Tr "repo.issues.due_date_remove"}}
+					{{template "shared/datetime/short" (dict "Datetime" .Content "Fallback" .Content)}}
+					{{$createdStr}}
 				</span>
 			</div>
 		{{else if eq .Type 19}}