From 89859e7d92395e44357f0baf94b6911eecbdabd1 Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Mon, 30 Sep 2002 14:22:39 +0000
Subject: Bug 164038 - token.cgi: Cancel token messages should be moved into
 the templates. Patch by burnus; r=gerv.

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

(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 85c678fdc..482f7e35f 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -56,6 +56,23 @@
     [% title = "Change columns" %]
     Resubmitting your query with new columns...
 
+  [% 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.
+
+  [% 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.
+
+  [% 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 %] account to [% new_email %] has been cancelled.
+    Your old account settings have been reinstated.
+
   [% ELSIF message_tag == "logged_out" %]
     [% title = "Logged Out" %]
     [% url = "query.cgi?GoAheadAndLogIn=1" %]
-- 
cgit v1.2.3-24-g4f1b