lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Nits (#16234) 

* template fix

* nits

* add doer to "created issue/pull"
release/v1.15
6543 2021-06-23 19:43:33 +02:00 committed by GitHub
parent 31f6b95dfa
commit 5930d09096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
options/locale/locale_en-US.ini
View File

@ -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.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.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_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.close = <b>@%[1]s</b> closed #%[2]d.
issue.action.reopen = <b>@%[1]s</b> reopened #%[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.approve = <b>@%[1]s</b> approved this pull request.
issue.action.reject = <b>@%[1]s</b> requested changes on 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 = <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.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.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: issue.in_tree_path = In %s:
release.new.subject = %s in %s released release.new.subject = %s in %s released

2
templates/mail/issue/default.tmpl
View File

@ -33,7 +33,7 @@
{{if eq .Comment.Commits.Len 1}} {{if eq .Comment.Commits.Len 1}}
{{.i18n.Tr "mail.issue.action.push_1" .Doer.Name .Comment.Issue.PullRequest.HeadBranch | Str2html}} {{.i18n.Tr "mail.issue.action.push_1" .Doer.Name .Comment.Issue.PullRequest.HeadBranch | Str2html}}
{{else}} {{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}}
{{end}} {{end}}
</p> </p>