From f1b8d52eb3ac230ed5a275f4a844ddb0cf48041e Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 16 Jul 2016 00:36:39 +0800 Subject: #2854 fix no mail notification when issue is closed/reopened --- templates/mail/auth/activate.tmpl | 8 ++++---- templates/mail/auth/activate_email.tmpl | 10 +++++----- templates/mail/auth/register_notify.tmpl | 10 +++++----- templates/mail/auth/reset_passwd.tmpl | 10 +++++----- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'templates/mail/auth') diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl index dfbc3ba86b..f03c165694 100644 --- a/templates/mail/auth/activate.tmpl +++ b/templates/mail/auth/activate.tmpl @@ -2,14 +2,14 @@ - {{.User.Name}}, please activate your account + {{.Username}}, please activate your account -

Hi {{.User.Name}}, thanks for registering at {{.AppName}}!

+

Hi {{.Username}}, thanks for registering at {{AppName}}!

Please click the following link to verify your e-mail address within {{.ActiveCodeLives}} hours:

-

{{.AppUrl}}user/activate?code={{.Code}}

+

{{AppUrl}}user/activate?code={{.Code}}

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

-

© 2015 Gogs: Go Git Service

+

© 2016 {{AppName}}

diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl index 73d7f616ef..65cb5045b3 100644 --- a/templates/mail/auth/activate_email.tmpl +++ b/templates/mail/auth/activate_email.tmpl @@ -2,14 +2,14 @@ - {{.User.Name}}, please verify your e-mail address + {{.Username}}, please verify your e-mail address -

Hi {{.User.Name}},

-

Please click the following link to verify your e-mail address within {{.ActiveCodeLives}} hours:

-

{{.AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}

+

Hi {{.Username}},

+

Please click the following link to verify your email address within {{.ActiveCodeLives}} hours:

+

{{AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}

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

-

© 2015 Gogs: Go Git Service

+

© 2016 {{AppName}}

diff --git a/templates/mail/auth/register_notify.tmpl b/templates/mail/auth/register_notify.tmpl index 864ed55acd..75a4356459 100644 --- a/templates/mail/auth/register_notify.tmpl +++ b/templates/mail/auth/register_notify.tmpl @@ -2,13 +2,13 @@ - {{.User.Name}}, welcome to {{.AppName}} + {{.Username}}, welcome to {{AppName}} -

Hi {{.User.Name}}, this is your registration confirmation email for {{.AppName}}!

-

You can now login via username: {{.User.Name}}.

-

{{.AppUrl}}user/login

-

© 2015 Gogs: Go Git Service

+

Hi {{.Username}}, this is your registration confirmation email for {{AppName}}!

+

You can now login via username: {{.Username}}.

+

{{AppUrl}}user/login

+

© 2016 {{AppName}}

diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl index eb29477828..aae0558052 100644 --- a/templates/mail/auth/reset_passwd.tmpl +++ b/templates/mail/auth/reset_passwd.tmpl @@ -2,14 +2,14 @@ - {{.User.Name}}, you have requested to reset your password + {{.Username}}, you have requested to reset your password -

Hi {{.User.Name}},

-

Please click the following link to verify your e-mail address within {{.ActiveCodeLives}} hours:

-

{{.AppUrl}}user/reset_password?code={{.Code}}

+

Hi {{.Username}},

+

Please click the following link to verify your email address within {{.ResetPwdCodeLives}} hours:

+

{{AppUrl}}user/reset_password?code={{.Code}}

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

-

© 2015 Gogs: Go Git Service

+

© 2016 {{AppName}}

-- cgit v1.2.3