third_party
/
gitea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Meano <meanocat@gmail.com>
tokarchuk/v1.17
Meano 3 years ago committed by GitHub
parent 7a402067ce
commit 07284792d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      options/locale/locale_en-US.ini
  2. 6
      templates/mail/auth/activate.tmpl
  3. 2
      templates/mail/auth/activate_email.tmpl

4
options/locale/locale_en-US.ini
Unescape View File

@ -326,8 +326,8 @@ hi_user_x = Hi <b>%s</b>,
activate_account = Please activate your account activate_account = Please activate your account
activate_account.title = %s, 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.text_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_2 = Please click the following link to activate your account within <b>%s</b>:
activate_email = Verify your email address activate_email = Verify your email address
activate_email.title = %s, please verify your e-mail address activate_email.title = %s, please verify your e-mail address

6
templates/mail/auth/activate.tmpl
Unescape View File

@ -7,9 +7,9 @@
{{ $activate_url := printf "%suser/activate?code=%s" AppUrl .Code}} {{ $activate_url := printf "%suser/activate?code=%s" AppUrl .Code}}
<body> <body>
<p>{{.i18n.Tr "mail.activate_account.test_1" .DisplayName AppName | Str2html}}</p><br> <p>{{.i18n.Tr "mail.activate_account.text_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.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" .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> <p>© <a target="_blank" rel="noopener noreferrer" href="{{AppUrl}}">{{AppName}}</a></p>
</body> </body>

2
templates/mail/auth/activate_email.tmpl
Unescape View File

@ -9,7 +9,7 @@
<body> <body>
<p>{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}</p><br> <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.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> <p>© <a target="_blank" rel="noopener noreferrer" href="{{AppUrl}}">{{AppName}}</a></p>
</body> </body>

Write Preview
Loading…
Cancel
Save