From 44b48df3901d829e1423749136d142964ccb4a3e Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" <> Date: Fri, 4 Jul 2003 04:31:13 +0000 Subject: Bug 13540 - allow key terms, like "Bugzilla" and "bug", to be altered without changing all the templates. Patch by jwilmoth@starbucks.com; r=gerv, a=justdave. --- template/en/default/account/email/change-new.txt.tmpl | 9 ++++++--- template/en/default/account/email/change-old.txt.tmpl | 11 +++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'template/en/default/account/email') diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl index b07be609c..5568acc0c 100644 --- a/template/en/default/account/email/change-new.txt.tmpl +++ b/template/en/default/account/email/change-new.txt.tmpl @@ -18,12 +18,15 @@ # # Contributor(s): John Vandenberg #%] + +[% PROCESS global/variables.none.tmpl %] + [% expiration_ts = token_ts + (max_token_age * 86400) %] From: bugzilla-admin-daemon To: [% emailaddress %] -Subject: Bugzilla Change Email Address Request +Subject: [% terms.Bugzilla %] Change Email Address Request -Bugzilla has received a request to change the email address +[% terms.Bugzilla %] has received a request to change the email address for the [% oldemailaddress %] account to your address. To confirm the change, visit the following link: @@ -35,5 +38,5 @@ this request, visit the following link: [% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %] -If you do nothing, the request will lapse after +If you do nothing, the request will lapse after [%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]). diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl index cd1334d3f..e5fa87e7f 100644 --- a/template/en/default/account/email/change-old.txt.tmpl +++ b/template/en/default/account/email/change-old.txt.tmpl @@ -23,15 +23,18 @@ # newemailaddress: string. The user's new Bugzilla login email address. # token: string. The token associated with this change. #%] + +[% PROCESS global/variables.none.tmpl %] + [% expiration_ts = token_ts + (max_token_age * 86400) %] From: bugzilla-admin-daemon To: [% emailaddress %] -Subject: Bugzilla Change Email Address Request +Subject: [% terms.Bugzilla %] Change Email Address Request Importance: High X-MSMail-Priority: High X-Priority: 1 -Bugzilla has received a request to change the email address +[% terms.Bugzilla %] has received a request to change the email address for your account to [% newemailaddress %]. If you are not the person who made this request, or you wish to cancel @@ -39,6 +42,6 @@ this request, visit the following link: [% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %] -If you do nothing, and [% newemailaddress %] confirms this request, the -change will be made permanent after +If you do nothing, and [% newemailaddress %] confirms this request, the +change will be made permanent after [%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]). -- cgit v1.2.3-24-g4f1b