summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorkiko%async.com.br <>2003-12-08 06:12:41 +0100
committerkiko%async.com.br <>2003-12-08 06:12:41 +0100
commiteef0d2856605458a57b08d2d50981df10fb6a3a6 (patch)
treeb9e37a3ec5715852eda073125869729ef803d1b4 /template/en/default
parentce24d01076ccec6e0e0f30d30d4b726fbf0452c4 (diff)
downloadbugzilla-eef0d2856605458a57b08d2d50981df10fb6a3a6.tar.gz
bugzilla-eef0d2856605458a57b08d2d50981df10fb6a3a6.tar.xz
Fix for bug 227213: Chomping murder in token emails and pages. Fix
chomping issues, a spurious &nbsp; 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.
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/account/email/change-new.txt.tmpl12
-rw-r--r--template/en/default/account/email/change-old.txt.tmpl12
-rw-r--r--template/en/default/account/password/forgotten-password.txt.tmpl10
-rw-r--r--template/en/default/global/messages.html.tmpl12
4 files changed, 23 insertions, 23 deletions
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) %]).
diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl
index e5fa87e7f..323f71373 100644
--- a/template/en/default/account/email/change-old.txt.tmpl
+++ b/template/en/default/account/email/change-old.txt.tmpl
@@ -34,14 +34,14 @@ Importance: High
X-MSMail-Priority: High
X-Priority: 1
-[% terms.Bugzilla %] has received a request to change the email address
-for your account to [% newemailaddress %].
+[%+ 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
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
-change will be made permanent after
-[%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
+If you do nothing, and [%+ newemailaddress %] confirms this request, the
+change will be made permanent after [%+ max_token_age %] days (at precisely
+[%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl
index c6b04b35a..b5e156231 100644
--- a/template/en/default/account/password/forgotten-password.txt.tmpl
+++ b/template/en/default/account/password/forgotten-password.txt.tmpl
@@ -26,8 +26,8 @@ From: bugzilla-admin-daemon
To: [% emailaddress %]
Subject: [% terms.Bugzilla %] Change Password Request
-You (or someone impersonating you) has requested to change your [% terms.Bugzilla %]
-&nbsp;password. To change your password, visit the following link:
+You have (or someone impersonating you has) requested to change your
+[%+ terms.Bugzilla %] password. To complete the change, visit the following link:
[%+ Param('urlbase') %]token.cgi?a=cfmpw&t=[% token FILTER url_quote %]
@@ -36,6 +36,6 @@ this request, visit the following link:
[%+ Param('urlbase') %]token.cgi?a=cxlpw&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) -%]) or when you log in successfully.
+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) -%]) or when you
+log in successfully.
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 57994ebb2..2744e7d8b 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -67,19 +67,19 @@
[% ELSIF message_tag == "emailold_change_cancelled" %]
[% title = "Cancel Request to Change Email Address" %]
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" %]
[% title = "Cancel Request to Change Email Address" %]
The request to change the email address for the
- [% old_email FILTER html %] account to
- [% new_email FILTER html %] has been cancelled.
+ account [%+ old_email FILTER html %] to
+ [%+ new_email FILTER html %] has been cancelled.
[% ELSIF message_tag == "email_change_cancelled_reinstated" %]
[% title = "Cancel Request to Change Email Address" %]
The request to change the email address for the
- [% old_email FILTER html %] account to
- [% new_email FILTER html %] has been cancelled.
+ account [%+ old_email FILTER html %] to
+ [%+ new_email FILTER html %] has been cancelled.
Your old account settings have been reinstated.
[% ELSIF message_tag == "logged_out" %]
@@ -152,7 +152,7 @@
[%+ series.subcategory FILTER html %] /
[%+ series.name FILTER html %]</em>
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.
<br><br>
Go back or