summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--template/en/default/account/cancel-token.txt.tmpl2
-rw-r--r--template/en/default/global/messages.html.tmpl2
-rwxr-xr-xtoken.cgi2
3 files changed, 3 insertions, 3 deletions
diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index f014820ef..de2278419 100644
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/template/en/default/account/cancel-token.txt.tmpl
@@ -70,7 +70,7 @@ Cancelled Because:
The request to change the email address for your account
to [% new_email %] has been cancelled.
- [% ELSIF cancelaction == 'password_change_canceled' %]
+ [% ELSIF cancelaction == 'password_change_cancelled' %]
You have requested cancellation.
[% ELSIF cancelaction == 'user_logged_in' %]
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 7fc93f013..de518dc0a 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -94,7 +94,7 @@
[% title = "$terms.Bugzilla Login Changed" %]
Your [% terms.Bugzilla %] login has been changed.
- [% ELSIF message_tag == "password_change_canceled" %]
+ [% ELSIF message_tag == "password_change_cancelled" %]
[% title = "Cancel Request to Change Password" %]
Your request has been cancelled.
diff --git a/token.cgi b/token.cgi
index 2a0f3c515..c29749551 100755
--- a/token.cgi
+++ b/token.cgi
@@ -175,7 +175,7 @@ sub confirmChangePassword {
}
sub cancelChangePassword {
- $vars->{'message'} = "password_change_canceled";
+ $vars->{'message'} = "password_change_cancelled";
Bugzilla::Token::Cancel($::token, $vars->{'message'});
print $cgi->header();