From 3016468cd570929c8389a2fb8dd0a5a84a8940e2 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 23 Jun 2021 17:31:46 +0200 Subject: [PATCH 1/3] template fix --- options/locale/locale_en-US.ini | 2 +- templates/mail/issue/default.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ded76272b64ad..ac84914595f92 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -348,7 +348,7 @@ issue_assigned.issue = @%[1]s assigned you to the issue %[2]s in repository %[3] issue.x_mentioned_you = @%s mentioned you: issue.action.force_push = %[1]s force-pushed the %[2]s from %[3]s to %[4]s. issue.action.push_1 = @%[1]s pushed 1 commit to %[2]s -issue.action.push_n = @%[1]s pushed %[3]d commits to %s: %[2]s +issue.action.push_n = @%[1]s pushed %[3]d commits to %[2]s issue.action.close = @%[1]s closed #%[2]d. issue.action.reopen = @%[1]s reopened #%[2]d. issue.action.merge = @%[1]s merged #%[2]d into #%[3]s. diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl index 61fe02037c557..f7257f6e6b5ce 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}}

From 676998912b930d49acc03bf2a641eaef8dd41c85 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 23 Jun 2021 17:39:35 +0200 Subject: [PATCH 2/3] nits --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ac84914595f92..2b90b1f8842ef 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -351,7 +351,7 @@ issue.action.push_1 = @%[1]s pushed 1 commit to %[2]s issue.action.push_n = @%[1]s pushed %[3]d commits to %[2]s issue.action.close = @%[1]s closed #%[2]d. issue.action.reopen = @%[1]s reopened #%[2]d. -issue.action.merge = @%[1]s merged #%[2]d into #%[3]s. +issue.action.merge = @%[1]s merged #%[2]d into %[3]s. issue.action.approve = @%[1]s approved this pull request. issue.action.reject = @%[1]s requested changes on this pull request. issue.action.review = @%[1]s commented on this pull request. From 875c41cdcc127870d585e409697ed6cfbdc4f842 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 23 Jun 2021 17:42:34 +0200 Subject: [PATCH 3/3] add doer to "created issue/pull" --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2b90b1f8842ef..59ee6e48ea7f8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -357,7 +357,7 @@ issue.action.reject = @%[1]s requested changes on this pull request. issue.action.review = @%[1]s commented on this pull request. issue.action.review_dismissed = @%[1]s dismissed last review from %[2]s for this pull request. issue.action.ready_for_review = @%[1]s marked this pull request ready for review. -issue.action.new = Created #%[2]d. +issue.action.new = @%[1]s created #%[2]d. issue.in_tree_path = In %s: release.new.subject = %s in %s released