diff options
| author | Jonas Östanbäck <cez81@users.noreply.github.com> | 2017-05-29 09:35:47 +0200 |
|---|---|---|
| committer | Bo-Yi Wu <appleboy.tw@gmail.com> | 2017-05-29 02:35:47 -0500 |
| commit | b93568cce4717abd97f1f92341ce9fdf331a7e98 (patch) | |
| tree | 9234c805be991b8d1876bb4641d07b1f6f1251c8 /templates | |
| parent | e0c6ab2d44d17b72a7ea6f8b4c829c42baeaae3b (diff) | |
| download | gitea-b93568cce4717abd97f1f92341ce9fdf331a7e98.tar.gz gitea-b93568cce4717abd97f1f92341ce9fdf331a7e98.zip | |
xxx_active_code_live setting in printed in hours and minutes instead … (#1814)
* xxx_active_code_live setting in printed in hours and minutes instead of just hours
* Update app.ini description of xxx_code_lives settings
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/mail/auth/activate.tmpl | 2 | ||||
| -rw-r--r-- | templates/mail/auth/activate_email.tmpl | 2 | ||||
| -rw-r--r-- | templates/mail/auth/reset_passwd.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/auth/activate.tmpl | 4 | ||||
| -rw-r--r-- | templates/user/auth/forgot_passwd.tmpl | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl index 4a2e7eeb84..5721199a2e 100644 --- a/templates/mail/auth/activate.tmpl +++ b/templates/mail/auth/activate.tmpl @@ -7,7 +7,7 @@ <body> <p>Hi <b>{{.Username}}</b>, thanks for registering at {{AppName}}!</p> - <p>Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>:</p> + <p>Please click the following link to verify your e-mail address 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> <p>© <a target="_blank" rel="noopener" href="{{AppUrl}}">{{AppName}}</a></p> diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl index c1031b2831..5111de06c5 100644 --- a/templates/mail/auth/activate_email.tmpl +++ b/templates/mail/auth/activate_email.tmpl @@ -7,7 +7,7 @@ <body> <p>Hi <b>{{.Username}}</b>,</p> - <p>Please click the following link to verify your email address within <b>{{.ActiveCodeLives}} hours</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> <p>© <a target="_blank" rel="noopener" href="{{AppUrl}}">{{AppName}}</a></p> diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl index 69719bce4b..ed51896b03 100644 --- a/templates/mail/auth/reset_passwd.tmpl +++ b/templates/mail/auth/reset_passwd.tmpl @@ -7,7 +7,7 @@ <body> <p>Hi <b>{{.Username}}</b>,</p> - <p>Please click the following link to verify your email address within <b>{{.ResetPwdCodeLives}} hours</b>:</p> + <p>Please click the following link to verify your email address 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> <p>© <a target="_blank" rel="noopener" href="{{AppUrl}}">{{AppName}}</a></p> diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 8bff54aaf4..9805067ae1 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -15,11 +15,11 @@ {{else if .ResendLimited}} <p class="center">{{.i18n.Tr "auth.resent_limit_prompt"}}</p> {{else}} - <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}</p> + <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .ActiveCodeLives | Str2html}}</p> {{end}} {{else}} {{if .IsSendRegisterMail}} - <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}</p> + <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .ActiveCodeLives | Str2html}}</p> {{else if .IsActivateFailed}} <p>{{.i18n.Tr "auth.invalid_code"}}</p> {{else}} diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl index 412b5b8847..2aeee300f0 100644 --- a/templates/user/auth/forgot_passwd.tmpl +++ b/templates/user/auth/forgot_passwd.tmpl @@ -10,7 +10,7 @@ <div class="ui attached segment"> {{template "base/alert" .}} {{if .IsResetSent}} - <p>{{.i18n.Tr "auth.reset_password_mail_sent_prompt" .Email .Hours | Str2html}}</p> + <p>{{.i18n.Tr "auth.reset_password_mail_sent_prompt" .Email .ResetPwdCodeLives | Str2html}}</p> {{else if .IsResetRequest}} <div class="required inline field {{if .Err_Email}}error{{end}}"> <label for="email">{{.i18n.Tr "email"}}</label> |