Fix invalid params and typo of email templates (go-gitea#16394)

Signed-off-by: Meano <meanocat@gmail.com>
lengyuqu · Jul 13, 2021 · 118cfbc · 118cfbc
1 parent b26728e
commit 118cfbc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -326,8 +326,8 @@ hi_user_x = Hi <b>%s</b>,
 
 activate_account = Please activate your account
 activate_account.title = %s, please activate your account
-activate_account.test_1 = Hi <b>%[1]s</b>, thanks for registering at %[2]s!
-activate_account.test_2 = Please click the following link to activate your account within <b>%s</b>:
+activate_account.text_1 = Hi <b>%[1]s</b>, thanks for registering at %[2]s!
+activate_account.text_2 = Please click the following link to activate your account within <b>%s</b>:
 
 activate_email = Verify your email address
 activate_email.title = %s, please verify your e-mail address

diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl
@@ -7,9 +7,9 @@
 
 {{ $activate_url := printf "%suser/activate?code=%s" AppUrl .Code}}
 <body>
-	<p>{{.i18n.Tr "mail.activate_account.test_1" .DisplayName AppName | Str2html}}</p><br>
-	<p>{{.i18n.Tr "mail.activate_account.test_2" .ActiveCodeLives | Str2html}}</p><p><a href="{{$activate_url}}">{{$activate_url}}</a></p><br>
-	<p>{{.i18n.Tr "mail.link_not_working_do_paste" .DisplayName AppName | Str2html}}</p>
+	<p>{{.i18n.Tr "mail.activate_account.text_1" .DisplayName AppName | Str2html}}</p><br>
+	<p>{{.i18n.Tr "mail.activate_account.text_2" .ActiveCodeLives | Str2html}}</p><p><a href="{{$activate_url}}">{{$activate_url}}</a></p><br>
+	<p>{{.i18n.Tr "mail.link_not_working_do_paste"}}</p>
 
 	<p>© <a target="_blank" rel="noopener noreferrer" href="{{AppUrl}}">{{AppName}}</a></p>
 </body>

diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl
@@ -9,7 +9,7 @@
 <body>
 	<p>{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}</p><br>
 	<p>{{.i18n.Tr "mail.activate_email.text" .ActiveCodeLives | Str2html}}</p><p><a href="{{$activate_url}}">{{$activate_url}}</a></p><br>
-	<p>{{.i18n.Tr "mail.link_not_working_do_paste" .DisplayName AppName | Str2html}}</p>
+	<p>{{.i18n.Tr "mail.link_not_working_do_paste"}}</p>
 
 	<p>© <a target="_blank" rel="noopener noreferrer" href="{{AppUrl}}">{{AppName}}</a></p>
 </body>