aboutsummaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2021-09-30 00:20:18 +0100
committerGitHub <noreply@github.com>2021-09-30 01:20:18 +0200
commitddd3586c06d81d8732dd96498b63de029f30349e (patch)
tree10d29163b0e996f8535c3ac929794d7c670de6b9 /options
parentecfac78f6ef2cc01e4397c1a92b9a59b7ff0b2ff (diff)
downloadgitea-ddd3586c06d81d8732dd96498b63de029f30349e.tar.gz
gitea-ddd3586c06d81d8732dd96498b63de029f30349e.zip
Fix missing repo link in issue/pull assigned emails (#17183)
There was a mistake in the template file: `templates/mail/issue/assigned.tmpl` where the repourl was generated from a non-existent release instead of the issue. This PR changes this to use the issue but also ensure that the issue repo is loaded. It also slightly improves the English locale string. Fix #17160 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: delvh <dev.lh@web.de>
Diffstat (limited to 'options')
-rw-r--r--options/locale/locale_en-US.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 028c25a768..bd95cc8d89 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -346,8 +346,8 @@ reset_password.text = Please click the following link to recover your account wi
register_success = Registration successful
-issue_assigned.pull = @%[1]s assigned you to the pull request %[2]s in repository %[3]s.
-issue_assigned.issue = @%[1]s assigned you to the issue %[2]s in repository %[3]s.
+issue_assigned.pull = @%[1]s assigned you to pull request %[2]s in repository %[3]s.
+issue_assigned.issue = @%[1]s assigned you to issue %[2]s in repository %[3]s.
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.