summaryrefslogtreecommitdiffstats
path: root/template/en/default/global/messages.html.tmpl
diff options
context:
space:
mode:
authorgerv%gerv.net <>2002-09-30 16:22:39 +0200
committergerv%gerv.net <>2002-09-30 16:22:39 +0200
commit89859e7d92395e44357f0baf94b6911eecbdabd1 (patch)
tree2ed43ec6b5916b77d11ef3d75de5eeff09355e69 /template/en/default/global/messages.html.tmpl
parent60df4e0a216d538ffc39cbb58c470261f3bf2af2 (diff)
downloadbugzilla-89859e7d92395e44357f0baf94b6911eecbdabd1.tar.gz
bugzilla-89859e7d92395e44357f0baf94b6911eecbdabd1.tar.xz
Bug 164038 - token.cgi: Cancel token messages should be moved into the templates. Patch by burnus; r=gerv.
Diffstat (limited to 'template/en/default/global/messages.html.tmpl')
-rw-r--r--template/en/default/global/messages.html.tmpl17
1 files changed, 17 insertions, 0 deletions
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" %]