mirror of
https://github.com/go-gitea/gitea.git
synced 2024-08-13 19:44:18 -04:00
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 <art27@cantab.net> * issues.force_push_codes needs this too. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
parent
136a20926c
commit
9a0858cecf
@ -1123,8 +1123,8 @@ issues.context.edit = Edit
|
|||||||
issues.context.delete = Delete
|
issues.context.delete = Delete
|
||||||
issues.no_content = There is no content yet.
|
issues.no_content = There is no content yet.
|
||||||
issues.close_issue = Close
|
issues.close_issue = Close
|
||||||
issues.pull_merged_at = `merged commit <a href="%[1]s">%[2]s</a> into <b>%[3]s</b> %[4]s`
|
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`
|
||||||
issues.manually_pull_merged_at = `merged commit <a href="%[1]s">%[2]s</a> into <b>%[3]s</b> %[4]s manually`
|
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`
|
||||||
issues.close_comment_issue = Comment and Close
|
issues.close_comment_issue = Comment and Close
|
||||||
issues.reopen_issue = Reopen
|
issues.reopen_issue = Reopen
|
||||||
issues.reopen_comment_issue = Comment and 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.error_removing_due_date = "Failed to remove the due date."
|
||||||
issues.push_commit_1 = "added %d commit %s"
|
issues.push_commit_1 = "added %d commit %s"
|
||||||
issues.push_commits_n = "added %d commits %s"
|
issues.push_commits_n = "added %d commits %s"
|
||||||
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`
|
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`
|
||||||
issues.due_date_form = "yyyy-mm-dd"
|
issues.due_date_form = "yyyy-mm-dd"
|
||||||
issues.due_date_form_add = "Add due date"
|
issues.due_date_form_add = "Add due date"
|
||||||
issues.due_date_form_edit = "Edit"
|
issues.due_date_form_edit = "Edit"
|
||||||
|
Loading…
Reference in New Issue
Block a user