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 &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.

---
 template/en/default/global/messages.html.tmpl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'template/en/default/global/messages.html.tmpl')

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 
-- 
cgit v1.2.3-24-g4f1b