Bug 931765 - When you enter your login or password wrong, the error message shown...

r=dkl,a=sgreen

diff --git a/Bugzilla/Auth.pm b/Bugzilla/Auth.pm
index c46e554a3bd362e7ae3be5b71dbc1a06df0f518f..4e766cf0bc9f2b94e2a14fdfc827c84f01dbd587 100644 (file)
--- a/Bugzilla/Auth.pm
+++ b/Bugzilla/Auth.pm
@@ -178,7 +178,7 @@ sub _handle_login_result {
     elsif ($fail_code == AUTH_LOGINFAILED or $fail_code == AUTH_NO_SUCH_USER) {
         my $remaining_attempts = MAX_LOGIN_ATTEMPTS 
                                  - ($result->{failure_count} || 0);
-        ThrowUserError("invalid_username_or_password", 
+        ThrowUserError("invalid_login_or_password", 
                        { remaining => $remaining_attempts });
     }
     # The account may be disabled

diff --git a/Bugzilla/WebService/Constants.pm b/Bugzilla/WebService/Constants.pm
index e4325d9d3f41cf556651bd2f831e8f0abe869683..1c3929e537c4a0398e59bce1f66ba29519cbae97 100644 (file)
--- a/Bugzilla/WebService/Constants.pm
+++ b/Bugzilla/WebService/Constants.pm
@@ -123,7 +123,7 @@ use constant WS_ERROR_CODE => {
     illegal_bug_status_transition => 123,
 
     # Authentication errors are usually 300-400.
-    invalid_username_or_password => 300,
+    invalid_login_or_password => 300,
     account_disabled             => 301,
     auth_invalid_email           => 302,
     extern_id_conflict           => -303,

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 939eb2c3c8428ce51d5e48de431ddeceef8609fd..7ca3461884cf24709b95d431f5fc735ba2daa162 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1046,9 +1046,9 @@
     Either you misspelled it, or the person has not
     registered for a [% terms.Bugzilla %] account.
 
-  [% ELSIF error == "invalid_username_or_password" %]
-    [% title = "Invalid Username Or Password" %]
-    The username or password you entered is not valid.
+  [% ELSIF error == "invalid_login_or_password" %]
+    [% title = "Invalid Login Or Password" %]
+    The login or password you entered is not valid.
     [%# People get two login attempts before being warned about
       # being locked out.
       #%]