Skip to content

Commit 5930d09

Browse files
authored
Fix Nits (#16234)
* template fix * nits * add doer to "created issue/pull"
1 parent 31f6b95 commit 5930d09

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

options/locale/locale_en-US.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -348,16 +348,16 @@ issue_assigned.issue = @%[1]s assigned you to the issue %[2]s in repository %[3]
348348
issue.x_mentioned_you = <b>@%s</b> mentioned you:
349349
issue.action.force_push = <b>%[1]s</b> force-pushed the <b>%[2]s</b> from %[3]s to %[4]s.
350350
issue.action.push_1 = <b>@%[1]s</b> pushed 1 commit to %[2]s
351-
issue.action.push_n = <b>@%[1]s</b> pushed %[3]d commits to %s: %[2]s
351+
issue.action.push_n = <b>@%[1]s</b> pushed %[3]d commits to %[2]s
352352
issue.action.close = <b>@%[1]s</b> closed #%[2]d.
353353
issue.action.reopen = <b>@%[1]s</b> reopened #%[2]d.
354-
issue.action.merge = <b>@%[1]s</b> merged #%[2]d into #%[3]s.
354+
issue.action.merge = <b>@%[1]s</b> merged #%[2]d into %[3]s.
355355
issue.action.approve = <b>@%[1]s</b> approved this pull request.
356356
issue.action.reject = <b>@%[1]s</b> requested changes on this pull request.
357357
issue.action.review = <b>@%[1]s</b> commented on this pull request.
358358
issue.action.review_dismissed = <b>@%[1]s</b> dismissed last review from %[2]s for this pull request.
359359
issue.action.ready_for_review = <b>@%[1]s</b> marked this pull request ready for review.
360-
issue.action.new = Created #%[2]d.
360+
issue.action.new = <b>@%[1]s</b> created #%[2]d.
361361
issue.in_tree_path = In %s:
362362
363363
release.new.subject = %s in %s released

templates/mail/issue/default.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
{{if eq .Comment.Commits.Len 1}}
3434
{{.i18n.Tr "mail.issue.action.push_1" .Doer.Name .Comment.Issue.PullRequest.HeadBranch | Str2html}}
3535
{{else}}
36-
{{.i18n.Tr "mail.issue.action.push_1" .Doer.Name .Comment.Issue.PullRequest.HeadBranch .Comment.Commits.Len | Str2html}}
36+
{{.i18n.Tr "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch .Comment.Commits.Len | Str2html}}
3737
{{end}}
3838
{{end}}
3939
</p>

0 commit comments

Comments
 (0)