summaryrefslogtreecommitdiffstats
path: root/template/en/default/global
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/global
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/global')
-rw-r--r--template/en/default/global/messages.html.tmpl12
1 files changed, 6 insertions, 6 deletions
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