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/account/cancel-token.txt.tmpl | 44 ++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'template/en/default/account/cancel-token.txt.tmpl') 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 + # Tobias Burnus #%] 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 %] -- cgit v1.2.3-24-g4f1b