summaryrefslogtreecommitdiffstats
path: root/template/en/default
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
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')
-rw-r--r--template/en/default/account/cancel-token.txt.tmpl44
-rw-r--r--template/en/default/global/code-error.html.tmpl9
-rw-r--r--template/en/default/global/messages.html.tmpl17
-rw-r--r--template/en/default/global/user-error.html.tmpl40
4 files changed, 107 insertions, 3 deletions
diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index b37d0da2d..b1545f6d3 100644
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/template/en/default/account/cancel-token.txt.tmpl
@@ -17,6 +17,7 @@
# Rights Reserved.
#
# Contributor(s): John Vandenberg <zeroj@null.net>
+ # Tobias Burnus <burnus@net-b.de>
#%]
From: bugzilla-admin-daemon
To: [% emailaddress %]
@@ -34,6 +35,47 @@ to [% maintainer %] if you suspect foul play.
User: [% emailaddress %]
Issue Date: [% issuedate %]
Event Data: [% eventdata %]
-Cancelled Because: [% cancelaction %]
+Cancelled Because:
+[% PROCESS cancelactionmessage %]
+[% BLOCK cancelactionmessage %]
+ [% IF cancelaction == 'account_exists' %]
+ Account [% email %] already exists.
+ [% ELSIF cancelaction == 'email_change_cancelled' %]
+ The request to change the email address for the
+ [% old_email %] account to [% new_email %]
+ has been cancelled.
+
+ [% ELSIF cancelaction == 'email_change_cancelled_reinstated' %]
+ The request to change the email address for your account to
+ [% new_email %] has been cancelled. Your old account
+ settings have been reinstated.
+
+ [% ELSIF cancelaction == 'emailold_change_cancelled' %]
+ The request to change the email address for your account
+ to [% new_email %] has been cancelled.
+
+ [% ELSIF cancelaction == 'password_change_canceled' %]
+ The user requested cancellation.
+
+ [% ELSIF cancelaction == 'wrong_token_for_changing_passwd' %]
+ The user tried to use the token to change the password.
+
+ [% ELSIF cancelaction == 'wrong_token_for_cancelling_email_change' %]
+ The user tried to use the token to cancel the email address change.
+
+ [% ELSIF cancelaction == 'wrong_token_for_confirming_email_change' %]
+ The user tried to use the token to confirm the email address change.
+
+ [% ELSE %]
+ [%# Give sensible error if the cancel-token function is used incorrectly.
+ #%]
+ You are using Bugzilla's cancel-token function incorrectly. You
+ passed in the string '[% cancelaction %]'. The correct use is to pass
+ in a tag, and define that tag in the file cancel-token.txt.tmpl.
+
+ If you are a Bugzilla end-user seeing this message, please forward this
+ email to [% Param('maintainer') %].
+ [% END %]
+[% END %]
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index dbe4a1732..0f767ded8 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -127,6 +127,9 @@
[% ELSIF error == "request_queue_group_invalid" %]
The group field <em>[% group FILTER html %]</em> is invalid.
+ [% ELSIF error == "token_generation_error" %]
+ Something is seriously wrong with the token generation system.
+
[% ELSIF error == "template_error" %]
[% template_error_msg %]
@@ -134,7 +137,11 @@
[% field FILTER html %] was not defined; [% Param('browserbugmessage') %]
[% ELSIF error == "unknown_action" %]
- Unknown action [% action FILTER html %]!
+ [% IF action %]
+ Unknown action [% action FILTER html %]!
+ [% ELSE %]
+ I could not figure out what you wanted to do.
+ [% END %]
[% ELSIF error == "unknown_component" %]
[% title = "Unknown Component" %]
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" %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 593c8bede..10c50cc9e 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -48,8 +48,17 @@
[% ELSIF error == "account_exists" %]
[% title = "Account Already Exists" %]
- That account already exists.
+ There is already an account with
+ [% IF email %]
+ the login name [% email FILTER html %].
+ [% ELSE %]
+ that login name.
+ [% END %]
+ [% ELSIF error == "account_inexistent" %]
+ [% title = "Account Does Not Exist" %]
+ There is no Bugzilla account with that login name.
+
[% ELSIF error == "alias_has_comma_or_space" %]
[% title = "Invalid Characters In Alias" %]
The alias you entered, <em>[% alias FILTER html %]</em>,
@@ -134,6 +143,10 @@
really make sense to mark a bug as a duplicate of itself,
does it?
+ [% ELSIF error == "email_confirmation_failed" %]
+ [% title = "Email Address Email Address Confirmation Failed" %]
+ Email address confirmation failed.
+
[% ELSIF error == "file_not_specified" %]
[% title = "No File Specified" %]
You did not specify a file to attach.
@@ -259,6 +272,10 @@
[% title = "Invalid Username Or Password" %]
The username or password you entered is not valid.
+ [% ELSIF error == "login_needed_for_password_change" %]
+ [% title = "Login Name Required" %]
+ You must enter a login name when requesting to change your password.
+
[% ELSIF error == "milestone_required" %]
[% title = "Milestone Required" %]
You must determine a target milestone for bug [% bug_id %]
@@ -366,6 +383,15 @@
100 users. Enter more of the name to bring the number of matches
down to a reasonable amount.
+ [% ELSIF error == "require_new_password" %]
+ [% title = "New Password Needed" %]
+ You cannot change your password without submitting a new one.
+
+ [% ELSIF error == "token_inexistent" %]
+ [% title = "Token Does Not Exist" %]
+ The token you submitted does not exist, has expired, or has
+ been cancelled.
+
[% ELSIF error == "unknown_keyword" %]
[% title = "Unknown Keyword" %]
<code>[% keyword FILTER html %]</code> is not a known keyword.
@@ -375,6 +401,18 @@
[% title = "Unknown Tab" %]
<code>[% current_tab_name FILTER html %]</code> is not a legal tab name.
+ [% ELSIF error == "wrong_token_for_cancelling_email_change" %]
+ [% title = "Wrong Token" %]
+ That token cannot be used to cancel an email address change.
+
+ [% ELSIF error == "wrong_token_for_changing_passwd" %]
+ [% title = "Wrong Token" %]
+ That token cannot be used to change your password.
+
+ [% ELSIF error == "wrong_token_for_confirming_email_change" %]
+ [% title = "Wrong Token" %]
+ That token cannot be used to change your email address.
+
[% ELSIF error == "zero_length_file" %]
[% title = "File Is Empty" %]
The file you are trying to attach is empty!