Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 159901 - token.cgi: localize strings send to message.html.tmpl. Patch by burnus; r=gerv.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@126978 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gerv%gerv.net
2002-08-10 08:06:58 +00:00
parent 2f2ceac598
commit 4ce72048de
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/webtools/bugzilla/template/en/default/account/email/confirm.html.tmpl
View File

@@ -23,6 +23,7 @@
# token: string. The token to be used in this address change.
#%]
[% title = "Confirm Change Email" %]
[% PROCESS global/header.html.tmpl %]
<p>

1
mozilla/webtools/bugzilla/template/en/default/account/password/set-forgotten-password.html.tmpl
View File

@@ -19,6 +19,7 @@
# Contributor(s): Gervase Markham <gerv@gerv.net>
#%]
[% title = "Change Password" %]
[% PROCESS global/header.html.tmpl %]
<p>

17
mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl
View File

@@ -40,6 +40,23 @@
The cookie that was remembering your login is now gone. You will be
prompted for a login the next time it is required.
[% ELSIF message_tag == "login_changed" %]
[% title = "Bugzilla Login Changed" %]
Your Bugzilla login has been changed.
[% ELSIF message_tag == "password_changed" %]
[% title = "Password Changed" %]
Your password has been changed.
[% ELSIF message_tag == "password_change_canceled"
[% title = "Cancel Request to Change Password" %]
Your request has been cancelled.
[% ELSIF message_tag == "password_change_request" %]
[% title = "Request to Change Password" %]
A token for changing your password has been emailed to you.
Follow the instructions in that email to change your password.
[% ELSE %]
[%# Cope with legacy calling convention, where "message" was the string
# to print.

16
mozilla/webtools/bugzilla/token.cgi
View File

@@ -172,10 +172,7 @@ exit;
sub requestChangePassword {
Token::IssuePasswordToken($::FORM{'loginname'});
$vars->{'title'} = "Request to Change Password";
$vars->{'message'} = "A token for changing your password has been
emailed to you. Follow the instructions in
that email to change your password.";
$vars->{'message'} = "password_change_request";
print "Content-Type: text/html\n\n";
$template->process("global/message.html.tmpl", $vars)
@@ -183,7 +180,6 @@ sub requestChangePassword {
}
sub confirmChangePassword {
$vars->{'title'} = "Change Password";
$vars->{'token'} = $::token;
print "Content-Type: text/html\n\n";
@@ -194,8 +190,7 @@ sub confirmChangePassword {
sub cancelChangePassword {
Token::Cancel($::token, "user requested cancellation");
$vars->{'title'} = "Cancel Request to Change Password";
$vars->{'message'} = "Your request has been cancelled.";
$vars->{'message'} = "password_change_canceled";
print "Content-Type: text/html\n\n";
$template->process("global/message.html.tmpl", $vars)
@@ -222,8 +217,7 @@ sub changePassword {
InvalidateLogins($userid);
$vars->{'title'} = "Password Changed";
$vars->{'message'} = "Your password has been changed.";
$vars->{'message'} = "password_changed";
print "Content-Type: text/html\n\n";
$template->process("global/message.html.tmpl", $vars)
@@ -234,7 +228,6 @@ sub confirmChangeEmail {
# Return HTTP response headers.
print "Content-Type: text/html\n\n";
$vars->{'title'} = "Confirm Change Email";
$vars->{'token'} = $::token;
$template->process("account/email/confirm.html.tmpl", $vars)
@@ -279,8 +272,7 @@ sub changeEmail {
# Let the user know their email address has been changed.
$vars->{'title'} = "Bugzilla Login Changed";
$vars->{'message'} = "Your Bugzilla login has been changed.";
$vars->{'message'} = "login_changed";
$template->process("global/message.html.tmpl", $vars)
|| ThrowTemplateError($template->error());