Skip to content

Commit 4332116

Browse files
65436543
committed
finish
1 parent a65f67a commit 4332116

File tree

5 files changed

+19
-8
lines changed

5 files changed

+19
-8
lines changed

‎options/locale/locale_en-US.ini

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,24 +318,27 @@ password_pwned_err = Could not complete request to HaveIBeenPwned
318318
319319
[mail]
320320
view_it_on = View it on %s
321+
link_not_working_do_paste = Not working? Try copying and pasting it to your browser.
322+
hi_user_x = Hi <b>%s</b>,
321323
322324
activate_account = Please activate your account
323325
activate_account.title = %s, please activate your account
324326
activate_account.test_1 = Hi <b>%[1]s</b>, thanks for registering at %[2]s!
325327
activate_account.test_2 = Please click the following link to activate your account within <b>%s</b>:
326-
activate_account.test_3 = Not working? Try copying and pasting it to your browser.
327328
328329
activate_email = Verify your email address
329330
activate_email.title = %s, please verify your e-mail address
330-
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><p><a href="%[3]s">%[3]s</a></p><br><p>Not working? Try copying and pasting it to your browser.</p>
331+
activate_email.text = Please click the following link to verify your email address within <b>%s</b>:
331332
332333
register_notify = Welcome to Gitea
333334
register_notify.title = %[1]s, welcome to %[2]s
334-
register_notify.body = <p>Hi <b>%[1]s</b>, this is your registration confirmation email for %[4]s!</p><br><p>You can now login via username: %[2]s.</p><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>
335+
register_notify.text_1 = this is your registration confirmation email for %s!
336+
register_notify.text_2 = You can now login via username: %s.
337+
register_notify.text_3 = If this account has been created for you, please <a href="%s">set your password</a> first.
335338
336339
reset_password = Recover your account
337340
reset_password.title = %s, you have requested to recover your account
338-
reset_password.body = <p>Hi <b>%[1]s</b>,</p><br><p>Please click the following link to recover your account within <b>%[2]s</b>:</p><p><a href="%[3]s">%[3]s</a></p><br><p>Not working? Try copying and pasting it to your browser.</p>
341+
reset_password.text = Please click the following link to recover your account within <b>%s</b>:
339342
340343
register_success = Registration successful
341344

‎templates/mail/auth/activate.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<body>
1010
<p>{{.i18n.Tr "mail.activate_account.test_1" .DisplayName AppName | Str2html}}</p><br>
1111
<p>{{.i18n.Tr "mail.activate_account.test_2" .ActiveCodeLives | Str2html}}</p><p><a href="{{$activate_url}}">{{$activate_url}}</a></p><br>
12-
<p></p>{{.i18n.Tr "mail.activate_account.test_3" .DisplayName AppName | Str2html}}</p>
12+
<p>{{.i18n.Tr "mail.link_not_working_do_paste" .DisplayName AppName | Str2html}}</p>
1313

1414
<p>© <a target="_blank" rel="noopener noreferrer" href="{{AppUrl}}">{{AppName}}</a></p>
1515
</body>

‎templates/mail/auth/activate_email.tmpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
{{ $activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl .Code .Email}}
99
<body>
10-
{{.i18n.Tr "mail.activate_email.body" .DisplayName .ActiveCodeLives $activate_url | Str2html}}
10+
<p>{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}</p><br>
11+
<p>{{.i18n.Tr "mail.activate_email.text" .ActiveCodeLives | Str2html}}</p><p><a href="{{$activate_url}}">{{$activate_url}}</a></p><br>
12+
<p>{{.i18n.Tr "mail.link_not_working_do_paste" .DisplayName AppName | Str2html}}</p>
1113

1214
<p>© <a target="_blank" rel="noopener noreferrer" href="{{AppUrl}}">{{AppName}}</a></p>
1315
</body>

‎templates/mail/auth/register_notify.tmpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
<title>{{.i18n.Tr "mail.register_notify.title" .DisplayName AppName}}</title>
66
</head>
77

8+
{{$set_pwd_url := printf "%[1]suser/forgot_password" AppUrl}}
89
<body>
9-
{{.i18n.Tr "mail.register_notify.body" .DisplayName .Username AppUrl AppName | Str2html}}
10+
<p>{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}</p><br>
11+
<p>{{.i18n.Tr "mail.register_notify.text_1" AppName}}</p><br>
12+
<p>{{.i18n.Tr "mail.register_notify.text_2" .Username}}</p><p><a href="{{AppUrl}}user/login">{{AppUrl}}user/login</a></p><br>
13+
<p>{{.i18n.Tr "mail.register_notify.text_3" $set_pwd_url | Str2html}}</p><br>
1014

1115
<p>© <a target="_blank" rel="noopener noreferrer" href="{{AppUrl}}">{{AppName}}</a></p>
1216
</body>

‎templates/mail/auth/reset_passwd.tmpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
{{ $recover_url := printf "%suser/recover_account?code=%s" AppUrl .Code}}
99
<body>
10-
{{.i18n.Tr "mail.reset_password.body" .DisplayName .ResetPwdCodeLives $recover_url | Str2html}}
10+
<p>{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}</p><br>
11+
<p>{{.i18n.Tr "mail.reset_password.text" .ResetPwdCodeLives | Str2html}}</p><p><a href="{{$recover_url}}">{{$recover_url}}</a></p><br>
12+
<p>{{.i18n.Tr "mail.link_not_working_do_paste" .DisplayName AppName | Str2html}}</p>
1113

1214
<p>© <a target="_blank" rel="noopener noreferrer" href="{{AppUrl}}">{{AppName}}</a></p>
1315
</body>

0 commit comments

Comments
 (0)