diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 214cdb96aab5..096585df2db4 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -318,24 +318,27 @@ password_pwned_err = Could not complete request to HaveIBeenPwned [mail] view_it_on = View it on %s +link_not_working_do_paste = Not working? Try copying and pasting it to your browser. +hi_user_x = Hi %s, activate_account = Please activate your account activate_account.title = %s, please activate your account activate_account.test_1 = Hi %[1]s, thanks for registering at %[2]s! activate_account.test_2 = Please click the following link to activate your account within %s: -activate_account.test_3 = Not working? Try copying and pasting it to your browser. activate_email = Verify your email address activate_email.title = %s, please verify your e-mail address -activate_email.body =

Hi %[1]s,


Please click the following link to verify your email address within %[2]s:

%[3]s


Not working? Try copying and pasting it to your browser.

+activate_email.text = Please click the following link to verify your email address within %s: register_notify = Welcome to Gitea register_notify.title = %[1]s, welcome to %[2]s -register_notify.body =

Hi %[1]s, this is your registration confirmation email for %[4]s!


You can now login via username: %[2]s.

%[3]suser/login


If this account has been created for you, please set your password first.

+register_notify.text_1 = this is your registration confirmation email for %s! +register_notify.text_2 = You can now login via username: %s. +register_notify.text_3 = If this account has been created for you, please set your password first. reset_password = Recover your account reset_password.title = %s, you have requested to recover your account -reset_password.body =

Hi %[1]s,


Please click the following link to recover your account within %[2]s:

%[3]s


Not working? Try copying and pasting it to your browser.

+reset_password.text = Please click the following link to recover your account within %s: register_success = Registration successful diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl index 3b1a8f90f7c8..1f0204157895 100644 --- a/templates/mail/auth/activate.tmpl +++ b/templates/mail/auth/activate.tmpl @@ -9,7 +9,7 @@

{{.i18n.Tr "mail.activate_account.test_1" .DisplayName AppName | Str2html}}


{{.i18n.Tr "mail.activate_account.test_2" .ActiveCodeLives | Str2html}}

{{$activate_url}}


-

{{.i18n.Tr "mail.activate_account.test_3" .DisplayName AppName | Str2html}}

+

{{.i18n.Tr "mail.link_not_working_do_paste" .DisplayName AppName | Str2html}}

© {{AppName}}

diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl index 0c7c09f30d91..27cff3ba4c51 100644 --- a/templates/mail/auth/activate_email.tmpl +++ b/templates/mail/auth/activate_email.tmpl @@ -7,7 +7,9 @@ {{ $activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl .Code .Email}} - {{.i18n.Tr "mail.activate_email.body" .DisplayName .ActiveCodeLives $activate_url | Str2html}} +

{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}


+

{{.i18n.Tr "mail.activate_email.text" .ActiveCodeLives | Str2html}}

{{$activate_url}}


+

{{.i18n.Tr "mail.link_not_working_do_paste" .DisplayName AppName | Str2html}}

© {{AppName}}

diff --git a/templates/mail/auth/register_notify.tmpl b/templates/mail/auth/register_notify.tmpl index 3acdd7e894dc..e1ab97b760e1 100644 --- a/templates/mail/auth/register_notify.tmpl +++ b/templates/mail/auth/register_notify.tmpl @@ -5,8 +5,12 @@ {{.i18n.Tr "mail.register_notify.title" .DisplayName AppName}} +{{$set_pwd_url := printf "%[1]suser/forgot_password" AppUrl}} - {{.i18n.Tr "mail.register_notify.body" .DisplayName .Username AppUrl AppName | Str2html}} +

{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}


+

{{.i18n.Tr "mail.register_notify.text_1" AppName}}


+

{{.i18n.Tr "mail.register_notify.text_2" .Username}}

{{AppUrl}}user/login


+

{{.i18n.Tr "mail.register_notify.text_3" $set_pwd_url | Str2html}}


© {{AppName}}

diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl index ca206a6705b1..2a85abc6c580 100644 --- a/templates/mail/auth/reset_passwd.tmpl +++ b/templates/mail/auth/reset_passwd.tmpl @@ -7,7 +7,9 @@ {{ $recover_url := printf "%suser/recover_account?code=%s" AppUrl .Code}} - {{.i18n.Tr "mail.reset_password.body" .DisplayName .ResetPwdCodeLives $recover_url | Str2html}} +

{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}


+

{{.i18n.Tr "mail.reset_password.text" .ResetPwdCodeLives | Str2html}}

{{$recover_url}}


+

{{.i18n.Tr "mail.link_not_working_do_paste" .DisplayName AppName | Str2html}}

© {{AppName}}