diff options
| -rw-r--r-- | models/mail.go | 7 | ||||
| -rw-r--r-- | templates/mail/auth/activate.tmpl | 4 | ||||
| -rw-r--r-- | templates/mail/auth/activate_email.tmpl | 4 | ||||
| -rw-r--r-- | templates/mail/auth/register_notify.tmpl | 4 | ||||
| -rw-r--r-- | templates/mail/auth/reset_passwd.tmpl | 4 |
5 files changed, 12 insertions, 11 deletions
diff --git a/models/mail.go b/models/mail.go index 31ac4a3a5a..4f2bd548f7 100644 --- a/models/mail.go +++ b/models/mail.go @@ -47,7 +47,7 @@ func SendTestMail(email string) error { // SendUserMail sends a mail to the user func SendUserMail(c *macaron.Context, u *User, tpl base.TplName, code, subject, info string) { data := map[string]interface{}{ - "Username": u.DisplayName(), + "DisplayName": u.DisplayName(), "ActiveCodeLives": base.MinutesToFriendly(setting.Service.ActiveCodeLives, c.Locale.Language()), "ResetPwdCodeLives": base.MinutesToFriendly(setting.Service.ResetPwdCodeLives, c.Locale.Language()), "Code": code, @@ -79,7 +79,7 @@ func SendResetPasswordMail(c *macaron.Context, u *User) { // SendActivateEmailMail sends confirmation email to confirm new email address func SendActivateEmailMail(c *macaron.Context, u *User, email *EmailAddress) { data := map[string]interface{}{ - "Username": u.DisplayName(), + "DisplayName": u.DisplayName(), "ActiveCodeLives": base.MinutesToFriendly(setting.Service.ActiveCodeLives, c.Locale.Language()), "Code": u.GenerateEmailActivateCode(email.Email), "Email": email.Email, @@ -101,7 +101,8 @@ func SendActivateEmailMail(c *macaron.Context, u *User, email *EmailAddress) { // SendRegisterNotifyMail triggers a notify e-mail by admin created a account. func SendRegisterNotifyMail(c *macaron.Context, u *User) { data := map[string]interface{}{ - "Username": u.DisplayName(), + "DisplayName": u.DisplayName(), + "Username": u.Name, } var content bytes.Buffer diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl index 0f6afc196b..37fdbd7c7c 100644 --- a/templates/mail/auth/activate.tmpl +++ b/templates/mail/auth/activate.tmpl @@ -2,11 +2,11 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>{{.Username}}, please activate your account</title> + <title>{{.DisplayName}}, please activate your account</title> </head> <body> - <p>Hi <b>{{.Username}}</b>, thanks for registering at {{AppName}}!</p> + <p>Hi <b>{{.DisplayName}}</b>, thanks for registering at {{AppName}}!</p> <p>Please click the following link to activate your account within <b>{{.ActiveCodeLives}}</b>:</p> <p><a href="{{AppUrl}}user/activate?code={{.Code}}">{{AppUrl}}user/activate?code={{.Code}}</a></p> <p>Not working? Try copying and pasting it to your browser.</p> diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl index 7c47aaa7b8..ebcaa0ee79 100644 --- a/templates/mail/auth/activate_email.tmpl +++ b/templates/mail/auth/activate_email.tmpl @@ -2,11 +2,11 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>{{.Username}}, please verify your e-mail address</title> + <title>{{.DisplayName}}, please verify your e-mail address</title> </head> <body> - <p>Hi <b>{{.Username}}</b>,</p> + <p>Hi <b>{{.DisplayName}}</b>,</p> <p>Please click the following link to verify your email address within <b>{{.ActiveCodeLives}}</b>:</p> <p><a href="{{AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}">{{AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}</a></p> <p>Not working? Try copying and pasting it to your browser.</p> diff --git a/templates/mail/auth/register_notify.tmpl b/templates/mail/auth/register_notify.tmpl index 4c2a9c43ad..4ee25329c4 100644 --- a/templates/mail/auth/register_notify.tmpl +++ b/templates/mail/auth/register_notify.tmpl @@ -2,11 +2,11 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>{{.Username}}, welcome to {{AppName}}</title> + <title>{{.DisplayName}}, welcome to {{AppName}}</title> </head> <body> - <p>Hi <b>{{.Username}}</b>, this is your registration confirmation email for {{AppName}}!</p> + <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">reset your password</a> first.</p> diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl index 0a09c47e85..5fb98c7819 100644 --- a/templates/mail/auth/reset_passwd.tmpl +++ b/templates/mail/auth/reset_passwd.tmpl @@ -2,11 +2,11 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>{{.Username}}, you have requested to reset your password</title> + <title>{{.DisplayName}}, you have requested to reset your password</title> </head> <body> - <p>Hi <b>{{.Username}}</b>,</p> + <p>Hi <b>{{.DisplayName}}</b>,</p> <p>Please click the following link to reset your password within <b>{{.ResetPwdCodeLives}}</b>:</p> <p><a href="{{AppUrl}}user/reset_password?code={{.Code}}">{{AppUrl}}user/reset_password?code={{.Code}}</a></p> <p>Not working? Try copying and pasting it to your browser.</p> |