From e2473ad484bd6c35ff28131c0d89af45caa79f13 Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org"
 <timeless%mozdev.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 10 Jul 2007 07:08:12 +0000
Subject: [PATCH] Bug 365472 rename 'token_inexistent' to
 'token_does_not_exist' or something r=lpsolit a=lpsolit

git-svn-id: svn://10.0.0.236/trunk@229594 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/attachment.cgi                        | 2 +-
 mozilla/webtools/bugzilla/post_bug.cgi                          | 2 +-
 .../bugzilla/template/en/default/global/user-error.html.tmpl    | 2 +-
 mozilla/webtools/bugzilla/token.cgi                             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/webtools/bugzilla/attachment.cgi b/mozilla/webtools/bugzilla/attachment.cgi
index 923af74b76f..690a42d6712 100755
--- a/mozilla/webtools/bugzilla/attachment.cgi
+++ b/mozilla/webtools/bugzilla/attachment.cgi
@@ -684,7 +684,7 @@ sub delete_attachment {
                   && ($event eq 'attachment' . $attachment->id))
         {
             # The token is invalid.
-            ThrowUserError('token_inexistent');
+            ThrowUserError('token_does_not_exist');
         }
 
         # The token is valid. Delete the content of the attachment.
diff --git a/mozilla/webtools/bugzilla/post_bug.cgi b/mozilla/webtools/bugzilla/post_bug.cgi
index 35a43feaa4d..b873d8f72f5 100755
--- a/mozilla/webtools/bugzilla/post_bug.cgi
+++ b/mozilla/webtools/bugzilla/post_bug.cgi
@@ -62,7 +62,7 @@ if ($token) {
               && ($old_bug_id =~ "^createbug:"))
     {
         # The token is invalid.
-        ThrowUserError('token_inexistent');
+        ThrowUserError('token_does_not_exist');
     }
 
     $old_bug_id =~ s/^createbug://;
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
index c2bbde28c5e..05aa0e4b34f 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
@@ -1412,7 +1412,7 @@
     <tt>[% product FILTER html %]</tt> product, which exceeds the maximum of
     [%+ max FILTER html %] votes for this product.
 
-  [% ELSIF error == "token_inexistent" %]
+  [% ELSIF error == "token_does_not_exist" %]
     [% title = "Token Does Not Exist" %]
     The token you submitted does not exist, has expired, or has
     been canceled.
diff --git a/mozilla/webtools/bugzilla/token.cgi b/mozilla/webtools/bugzilla/token.cgi
index 66ce2c052df..a07a969fd1b 100755
--- a/mozilla/webtools/bugzilla/token.cgi
+++ b/mozilla/webtools/bugzilla/token.cgi
@@ -72,7 +72,7 @@ if ($cgi->param('t')) {
   # Make sure the token exists in the database.
   my ($tokentype) = $dbh->selectrow_array('SELECT tokentype FROM tokens
                                            WHERE token = ?', undef, $::token);
-  $tokentype || ThrowUserError("token_inexistent");
+  $tokentype || ThrowUserError("token_does_not_exist");
 
   # Make sure the token is the correct type for the action being taken.
   if ( grep($::action eq $_ , qw(cfmpw cxlpw chgpw)) && $tokentype ne 'password' ) {