Bug 237517 inconsistent spelling of cancelled or canceled

r=kiko a=justdave

diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index f014820ef5f2ec2a2556d09225af540e90937f08..de2278419409673b004005afc57c8a6f8666e2e4 100644 (file)
--- 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 7fc93f01387ee0804c37590d667914ece1c49c9b..de518dc0a53a094454756a1ca1406e6d71bbc231 100644 (file)
--- 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 2a0f3c515535b80c33cd100de0b71cfc6c5bf5e5..c297495510b9d4d24b558f68cd1cbc950c4b3fd6 100755 (executable)
--- 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();