From eef0d2856605458a57b08d2d50981df10fb6a3a6 Mon Sep 17 00:00:00 2001 From: "kiko%async.com.br" <> Date: Mon, 8 Dec 2003 05:12:41 +0000 Subject: Fix for bug 227213: Chomping murder in token emails and pages. Fix chomping issues, a spurious   in an email template, and minor rewordings to make the text prettier -- oh, I realize this isn't Chaucer yet, but who knows? r=jouni, a=justdave. --- template/en/default/account/email/change-new.txt.tmpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'template/en/default/account/email/change-new.txt.tmpl') diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl index 5568acc0c..8841891f3 100644 --- a/template/en/default/account/email/change-new.txt.tmpl +++ b/template/en/default/account/email/change-new.txt.tmpl @@ -26,17 +26,17 @@ From: bugzilla-admin-daemon To: [% emailaddress %] Subject: [% terms.Bugzilla %] Change Email Address Request -[% terms.Bugzilla %] has received a request to change the email address -for the [% oldemailaddress %] account to your address. +[%+ terms.Bugzilla %] has received a request to change the email address +for the account [% oldemailaddress %] to your address. To confirm the change, visit the following link: -[% Param('urlbase') %]token.cgi?a=cfmem&t=[% token FILTER url_quote %] +[%+ Param('urlbase') %]token.cgi?a=cfmem&t=[% token FILTER url_quote %] If you are not the person who made this request, or you wish to cancel this request, visit the following link: -[% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %] +[%+ Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %] -If you do nothing, the request will lapse after -[%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]). +If you do nothing, the request will lapse after [%+ max_token_age %] days +(at precisely [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]). -- cgit v1.2.3-24-g4f1b