From: timeless%mozdev.org <>
Date: Fri, 19 Mar 2004 00:14:54 +0000 (+0000)
Subject: Bug 237517 inconsistent spelling of cancelled or canceled
X-Git-Tag: bugzilla-2.18rc1~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d00f3ac25660d8f535f6ae00c54fc0c08bcae7f3;p=thirdparty%2Fbugzilla.git

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 f014820ef5..de22784194 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 7fc93f0138..de518dc0a5 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 2a0f3c5155..c297495510 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();