Skip to content

bugzilla
bugzilla
Commit eef0d285 authored by kiko%async.com.br's avatar kiko%async.com.br
Browse files
Options

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.
parent ce24d010
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
template/en/default/account/email/change-new.txt.tmpl
View file @ eef0d285
...@@ -26,17 +26,17 @@ From: bugzilla-admin-daemon ...@@ -26,17 +26,17 @@ From: bugzilla-admin-daemon
To: [% emailaddress %] To: [% emailaddress %]
Subject: [% terms.Bugzilla %] Change Email Address Request Subject: [% terms.Bugzilla %] Change Email Address Request
[% terms.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. for the account [% oldemailaddress %] to your address.
To confirm the change, visit the following link: 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 If you are not the person who made this request, or you wish to cancel
this request, visit the following link: 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 If you do nothing, the request will lapse after [%+ max_token_age %] days
[%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]). (at precisely [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
template/en/default/account/email/change-old.txt.tmpl
View file @ eef0d285
...@@ -34,14 +34,14 @@ Importance: High ...@@ -34,14 +34,14 @@ Importance: High
X-MSMail-Priority: High X-MSMail-Priority: High
X-Priority: 1 X-Priority: 1
[% terms.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 %]. for your account to [%+ newemailaddress %].
If you are not the person who made this request, or you wish to cancel If you are not the person who made this request, or you wish to cancel
this request, visit the following link: 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, and [% newemailaddress %] confirms this request, the If you do nothing, and [%+ newemailaddress %] confirms this request, the
change will be made permanent after change will be made permanent after [%+ max_token_age %] days (at precisely
[%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]). [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
template/en/default/account/password/forgotten-password.txt.tmpl
View file @ eef0d285
...@@ -26,8 +26,8 @@ From: bugzilla-admin-daemon ...@@ -26,8 +26,8 @@ From: bugzilla-admin-daemon
To: [% emailaddress %] To: [% emailaddress %]
Subject: [% terms.Bugzilla %] Change Password Request Subject: [% terms.Bugzilla %] Change Password Request
You (or someone impersonating you) has requested to change your [% terms.Bugzilla %] You have (or someone impersonating you has) requested to change your
 password. To change your password, visit the following link: [%+ terms.Bugzilla %] password. To complete the change, visit the following link:
[%+ Param('urlbase') %]token.cgi?a=cfmpw&t=[% token FILTER url_quote %] [%+ Param('urlbase') %]token.cgi?a=cfmpw&t=[% token FILTER url_quote %]
...@@ -36,6 +36,6 @@ this request, visit the following link: ...@@ -36,6 +36,6 @@ this request, visit the following link:
[%+ Param('urlbase') %]token.cgi?a=cxlpw&t=[% token FILTER url_quote %] [%+ Param('urlbase') %]token.cgi?a=cxlpw&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 (at
[%- max_token_age %] days precisely [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) -%]) or when you
([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) -%]) or when you log in successfully. log in successfully.
template/en/default/global/messages.html.tmpl
View file @ eef0d285
...@@ -67,19 +67,19 @@ ...@@ -67,19 +67,19 @@
[% ELSIF message_tag == "emailold_change_cancelled" %] [% ELSIF message_tag == "emailold_change_cancelled" %]
[% title = "Cancel Request to Change Email Address" %] [% title = "Cancel Request to Change Email Address" %]
The request to change the email address for your account to The request to change the email address for your account to
[% new_email FILTER html %] has been cancelled. [%+ new_email FILTER html %] has been cancelled.
[% ELSIF message_tag == "email_change_cancelled" %] [% ELSIF message_tag == "email_change_cancelled" %]
[% title = "Cancel Request to Change Email Address" %] [% title = "Cancel Request to Change Email Address" %]
The request to change the email address for the The request to change the email address for the
[% old_email FILTER html %] account to account [%+ old_email FILTER html %] to
[% new_email FILTER html %] has been cancelled. [%+ new_email FILTER html %] has been cancelled.
[% ELSIF message_tag == "email_change_cancelled_reinstated" %] [% ELSIF message_tag == "email_change_cancelled_reinstated" %]
[% title = "Cancel Request to Change Email Address" %] [% title = "Cancel Request to Change Email Address" %]
The request to change the email address for the The request to change the email address for the
[% old_email FILTER html %] account to account [%+ old_email FILTER html %] to
[% new_email FILTER html %] has been cancelled. [%+ new_email FILTER html %] has been cancelled.
Your old account settings have been reinstated. Your old account settings have been reinstated.
[% ELSIF message_tag == "logged_out" %] [% ELSIF message_tag == "logged_out" %]
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
[%+ series.subcategory FILTER html %] / [%+ series.subcategory FILTER html %] /
[%+ series.name FILTER html %]</em> [%+ series.name FILTER html %]</em>
has been created. Note that you may need to wait up to has been created. Note that you may need to wait up to
[% series.frequency * 2 %] days before there will be enough data for a [%+ series.frequency * 2 %] days before there will be enough data for a
chart of this series to be produced. chart of this series to be produced.
<br><br> <br><br>
Go back or Go back or
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment