From d1c4a8e2ad2072a9f4a617d8271d592a67ca84cd Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 9 Apr 2021 18:03:39 +0100 Subject: [PATCH 1/2] SHA in merged commit comment should be rendered ui sha On a PR page the sha of the merge commit should be rendered in monospace as a SHA. Also fixes an issue with the manually merged string. Fix #15049 Signed-off-by: Andrew Thornton --- options/locale/locale_en-US.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 5e88a6861e4b..e3393da00e4f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1123,8 +1123,8 @@ issues.context.edit = Edit issues.context.delete = Delete issues.no_content = There is no content yet. issues.close_issue = Close -issues.pull_merged_at = `merged commit %[2]s into %[3]s %[4]s` -issues.manually_pull_merged_at = `merged commit %[2]s into %[3]s %[4]s manually` +issues.pull_merged_at = `merged commit %[2]s into %[3]s %[4]s` +issues.manually_pull_merged_at = `merged commit %[2]s into %[3]s manually %[4]s` issues.close_comment_issue = Comment and Close issues.reopen_issue = Reopen issues.reopen_comment_issue = Comment and Reopen From 1754aa321b1581a8c5c62a1a4f737986a5684e71 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 9 Apr 2021 18:41:50 +0100 Subject: [PATCH 2/2] issues.force_push_codes needs this too. Signed-off-by: Andrew Thornton --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index e3393da00e4f..c2f835a98c0d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1218,7 +1218,7 @@ issues.error_modifying_due_date = "Failed to modify the due date." issues.error_removing_due_date = "Failed to remove the due date." issues.push_commit_1 = "added %d commit %s" issues.push_commits_n = "added %d commits %s" -issues.force_push_codes = `force-pushed %[1]s from %[2]s to %[4]s %[6]s` +issues.force_push_codes = `force-pushed %[1]s from %[2]s to %[4]s %[6]s` issues.due_date_form = "yyyy-mm-dd" issues.due_date_form_add = "Add due date" issues.due_date_form_edit = "Edit"