register_notify

6543 · 6543 · commit de006727278c · 2021-06-19T03:50:33.000+02:00
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -321,15 +321,16 @@ activate_account = Please activate your account
 activate_account.title = %s, please activate your account
 activate_account.body = <p>Hi <b>%[1]s</b>, thanks for registering at %[5]s!</p><br><p>Please click the following link to activate your account within <b>%[2]s</b>:</p><br><p><a href="%[3]s">%[3]s</a></p><br><p>Not working? Try copying and pasting it to your browser.</p><br><p>© <a target="_blank" rel="noopener noreferrer" href="%[4]s">%[5]s</a></p>
 
-
+activate_email = Verify your email address
 activate_email.title = %s, please verify your e-mail address
 activate_email.body = <p>Hi <b>%[1]s</b>,</p><br><p>Please click the following link to verify your email address within <b>%[2]s</b>:</p><br><p><a href="%[3]s">%[3]s</a></p><br><p>Not working? Try copying and pasting it to your browser.</p><br><p>© <a target="_blank" rel="noopener noreferrer" href="%[4]s">%[5]s</a></p>
-activate_email = Verify your email address
 
+register_notify = Welcome to Gitea
+register_notify.title = %[1]s, welcome to %[2]s
+register_notify.body = <p>Hi <b>%[1]s</b>, this is your registration confirmation email for %[4]s!</p><br><br><p>You can now login via username: %[2]s.</p><br><p><a href="%[3]suser/login">%[3]suser/login</a></p><br><p>If this account has been created for you, please <a href="%[3]suser/forgot_password">set your password</a> first.</p><br><p>© <a target="_blank" rel="noopener noreferrer" href="%[3]s">%[4]s</a></p>
 
 reset_password = Recover your account
 register_success = Registration successful
-register_notify = Welcome to Gitea
 
 release.new.subject = %s in %s released
 
diff --git a/templates/mail/auth/register_notify.tmpl b/templates/mail/auth/register_notify.tmpl
@@ -2,14 +2,10 @@
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>{{.DisplayName}}, welcome to {{AppName}}</title>
+	<title>{{.i18n.Tr "mail.register_notify.title" .DisplayName AppName}}</title>
 </head>
 
 <body>
-	<p>Hi <b>{{.DisplayName}}</b>, this is your registration confirmation email for {{AppName}}!</p>
-	<p>You can now login via username: {{.Username}}.</p>
-	<p><a href="{{AppUrl}}user/login">{{AppUrl}}user/login</a></p>
-	<p>If this account has been created for you, please <a href="{{AppUrl}}user/forgot_password">set your password</a> first.</p>
-	<p>© <a target="_blank" rel="noopener noreferrer" href="{{AppUrl}}">{{AppName}}</a></p>
+	{{.i18n.Tr "mail.register_notify.body" .DisplayName .Username AppUrl AppName | Str2html}}
 </body>
 </html>
