diff options
Diffstat (limited to 'template/en/default/account/email')
4 files changed, 9 insertions, 13 deletions
diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl index e7f32e8d7..5803b0274 100644 --- a/template/en/default/account/email/change-new.txt.tmpl +++ b/template/en/default/account/email/change-new.txt.tmpl @@ -20,7 +20,6 @@ [% PROCESS global/variables.none.tmpl %] -[% expiration_ts = token_ts + (max_token_age * 86400) %] From: [% Param('mailfrom') %] To: [% emailaddress %] Subject: [% terms.Bugzilla %] Change Email Address Request @@ -38,5 +37,5 @@ this request, visit the following link: [%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem -If you do nothing, the request will lapse after [%+ max_token_age %] days -(on [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]). +If you do nothing, the request will lapse after [% constants.MAX_TOKEN_AGE %] days +(on [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]). diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl index cf00ebbcf..6b7774420 100644 --- a/template/en/default/account/email/change-old.txt.tmpl +++ b/template/en/default/account/email/change-old.txt.tmpl @@ -25,7 +25,6 @@ [% PROCESS global/variables.none.tmpl %] -[% expiration_ts = token_ts + (max_token_age * 86400) %] From: [% Param('mailfrom') %] To: [% emailaddress %] Subject: [% terms.Bugzilla %] Change Email Address Request @@ -43,5 +42,5 @@ this request, visit the following link: [%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem If you do nothing, and [%+ newemailaddress %] confirms this request, -the change will be made permanent after [%+ max_token_age %] days -(on [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]). +the change will be made permanent after [% constants.MAX_TOKEN_AGE %] days +(on [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]). diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl index 437c1b758..ed0ff3405 100644 --- a/template/en/default/account/email/confirm-new.html.tmpl +++ b/template/en/default/account/email/confirm-new.html.tmpl @@ -16,7 +16,7 @@ [%# INTERFACE: # token: string. The token to be used in the user account creation. # email: email address of the user account. - # date: creation date of the token. + # expiration_ts: expiration date of the token. #%] [% title = BLOCK %]Create a new user account for '[% email FILTER html %]'[% END %] @@ -24,7 +24,6 @@ title = title onload = "document.forms['confirm_account_form'].realname.focus();" %] -[% expiration_ts = date + (constants.MAX_TOKEN_AGE * 86400) %] <div> To create your account, you must enter a password in the form below. Your email address and Real Name (if provided) will be shown with @@ -60,7 +59,7 @@ <p> This account will not be created if this form is not completed by - <u>[%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]</u>. + <u>[% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]</u>. </p> <p> diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl index 36cd94787..c56054b94 100644 --- a/template/en/default/account/email/request-new.txt.tmpl +++ b/template/en/default/account/email/request-new.txt.tmpl @@ -15,13 +15,12 @@ [%# INTERFACE: # token: random string used to authenticate the transaction. - # token_ts: creation date of the token. + # expiration_ts: expiration date of the token. # email: email address of the new account. #%] [% PROCESS global/variables.none.tmpl %] -[% expiration_ts = token_ts + (constants.MAX_TOKEN_AGE * 86400) %] From: [% Param('mailfrom') %] To: [% email %] Subject: [% terms.Bugzilla %]: confirm account creation @@ -31,11 +30,11 @@ X-Bugzilla-Type: admin using your email address ([% email %]). To continue creating an account using this email address, visit the -following link by [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]: +following link by [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]: [%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=request_new_account -If you did not receive this email before [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %] or +If you did not receive this email before [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %] or you wish to create an account using a different email address you can begin again by going to: |