Skip to content

Commit 9a0858c

Browse files
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 <[email protected]> * issues.force_push_codes needs this too. Signed-off-by: Andrew Thornton <[email protected]> Co-authored-by: techknowlogick <[email protected]>
1 parent 136a209 commit 9a0858c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

options/locale/locale_en-US.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,8 +1123,8 @@ issues.context.edit = Edit
11231123
issues.context.delete = Delete
11241124
issues.no_content = There is no content yet.
11251125
issues.close_issue = Close
1126-
issues.pull_merged_at = `merged commit <a href="%[1]s">%[2]s</a> into <b>%[3]s</b> %[4]s`
1127-
issues.manually_pull_merged_at = `merged commit <a href="%[1]s">%[2]s</a> into <b>%[3]s</b> %[4]s manually`
1126+
issues.pull_merged_at = `merged commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> into <b>%[3]s</b> %[4]s`
1127+
issues.manually_pull_merged_at = `merged commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> into <b>%[3]s</b> manually %[4]s`
11281128
issues.close_comment_issue = Comment and Close
11291129
issues.reopen_issue = Reopen
11301130
issues.reopen_comment_issue = Comment and Reopen
@@ -1218,7 +1218,7 @@ issues.error_modifying_due_date = "Failed to modify the due date."
12181218
issues.error_removing_due_date = "Failed to remove the due date."
12191219
issues.push_commit_1 = "added %d commit %s"
12201220
issues.push_commits_n = "added %d commits %s"
1221-
issues.force_push_codes = `force-pushed %[1]s from <a href="%[3]s">%[2]s</a> to <a href="%[5]s">%[4]s</a> %[6]s`
1221+
issues.force_push_codes = `force-pushed %[1]s from <a class="ui sha" href="%[3]s"><code>%[2]s</code></a> to <a class="ui sha" href="%[5]s"><code>%[4]s</code></a> %[6]s`
12221222
issues.due_date_form = "yyyy-mm-dd"
12231223
issues.due_date_form_add = "Add due date"
12241224
issues.due_date_form_edit = "Edit"

0 commit comments

Comments
 (0)