From 5930d09096b6ab8d55aabf490ed4ea27faa7f17f Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Wed, 23 Jun 2021 19:43:33 +0200
Subject: [PATCH] Fix Nits (#16234)
* template fix
* nits
* add doer to "created issue/pull"
---
options/locale/locale_en-US.ini | 6 +++---
templates/mail/issue/default.tmpl | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index ded76272b6..59ee6e48ea 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -348,16 +348,16 @@ issue_assigned.issue = @%[1]s assigned you to the issue %[2]s in repository %[3]
issue.x_mentioned_you = <b>@%s</b> mentioned you:
issue.action.force_push = <b>%[1]s</b> force-pushed the <b>%[2]s</b> from %[3]s to %[4]s.
issue.action.push_1 = <b>@%[1]s</b> pushed 1 commit to %[2]s
-issue.action.push_n = <b>@%[1]s</b> pushed %[3]d commits to %s: %[2]s
+issue.action.push_n = <b>@%[1]s</b> pushed %[3]d commits to %[2]s
issue.action.close = <b>@%[1]s</b> closed #%[2]d.
issue.action.reopen = <b>@%[1]s</b> reopened #%[2]d.
-issue.action.merge = <b>@%[1]s</b> merged #%[2]d into #%[3]s.
+issue.action.merge = <b>@%[1]s</b> merged #%[2]d into %[3]s.
issue.action.approve = <b>@%[1]s</b> approved this pull request.
issue.action.reject = <b>@%[1]s</b> requested changes on this pull request.
issue.action.review = <b>@%[1]s</b> commented on this pull request.
issue.action.review_dismissed = <b>@%[1]s</b> dismissed last review from %[2]s for this pull request.
issue.action.ready_for_review = <b>@%[1]s</b> marked this pull request ready for review.
-issue.action.new = Created #%[2]d.
+issue.action.new = <b>@%[1]s</b> created #%[2]d.
issue.in_tree_path = In %s:
release.new.subject = %s in %s released
diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl
index 61fe02037c..f7257f6e6b 100644
--- a/templates/mail/issue/default.tmpl
+++ b/templates/mail/issue/default.tmpl
@@ -33,7 +33,7 @@
{{if eq .Comment.Commits.Len 1}}
{{.i18n.Tr "mail.issue.action.push_1" .Doer.Name .Comment.Issue.PullRequest.HeadBranch | Str2html}}
{{else}}
- {{.i18n.Tr "mail.issue.action.push_1" .Doer.Name .Comment.Issue.PullRequest.HeadBranch .Comment.Commits.Len | Str2html}}
+ {{.i18n.Tr "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch .Comment.Commits.Len | Str2html}}
{{end}}
{{end}}
</p>