From 3ce940a70dc15afe504ddcf772d088b952e0b9d9 Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com" <>
Date: Sun, 11 Mar 2007 09:11:16 +0000
Subject: Bug 366466 - "flag notification mail has canceled spelled
 incorrectly" [p=reed r=timeless a=mkanat]

---
 token.cgi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'token.cgi')

diff --git a/token.cgi b/token.cgi
index e45f49fba..66ce2c052 100755
--- a/token.cgi
+++ b/token.cgi
@@ -194,7 +194,7 @@ sub confirmChangePassword {
 }
 
 sub cancelChangePassword {    
-    $vars->{'message'} = "password_change_cancelled";
+    $vars->{'message'} = "password_change_canceled";
     Bugzilla::Token::Cancel($::token, $vars->{'message'});
 
     print $cgi->header();
@@ -300,7 +300,7 @@ sub cancelChangeEmail {
     my ($old_email, $new_email) = split(/:/,$eventdata);
 
     if($tokentype eq "emailold") {
-        $vars->{'message'} = "emailold_change_cancelled";
+        $vars->{'message'} = "emailold_change_canceled";
 
         my $actualemail = $dbh->selectrow_array(
                             q{SELECT login_name FROM profiles
@@ -324,11 +324,11 @@ sub cancelChangeEmail {
             my $user = new Bugzilla::User($userid);
             $user->derive_regexp_groups;
 
-            $vars->{'message'} = "email_change_cancelled_reinstated";
+            $vars->{'message'} = "email_change_canceled_reinstated";
         } 
     } 
     else {
-        $vars->{'message'} = 'email_change_cancelled'
+        $vars->{'message'} = 'email_change_canceled'
      }
 
     $vars->{'old_email'} = $old_email;
@@ -394,7 +394,7 @@ sub confirm_create_account {
 sub cancel_create_account {
     my (undef, undef, $login_name) = Bugzilla::Token::GetTokenData($::token);
 
-    $vars->{'message'} = 'account_creation_cancelled';
+    $vars->{'message'} = 'account_creation_canceled';
     $vars->{'account'} = $login_name;
     Bugzilla::Token::Cancel($::token, $vars->{'message'});
 
-- 
cgit v1.2.3-24-g4f1b