From 9a0858cecf3518c9c5808bc2aeaa99278fd86cd0 Mon Sep 17 00:00:00 2001 From: zeripath Date: Sat, 10 Apr 2021 03:24:59 +0100 Subject: [PATCH] SHA in merged commit comment should be rendered ui sha (#15376) * 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 * issues.force_push_codes needs this too. Signed-off-by: Andrew Thornton Co-authored-by: techknowlogick --- options/locale/locale_en-US.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 5e88a6861e4..c2f835a98c0 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 @@ -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"