diff options
author | tinajohnson.1234@gmail.com <> | 2013-11-06 00:26:45 +0100 |
---|---|---|
committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-11-06 00:26:45 +0100 |
commit | d8d3c0edd90267e23e4910fe550df4604a5ad75b (patch) | |
tree | 8c3a0e59035ec29519dbe444cdda8269b9466b31 /Bugzilla | |
parent | 5189d82750da1b7d336bedf21927970feac0ee17 (diff) | |
download | bugzilla-d8d3c0edd90267e23e4910fe550df4604a5ad75b.tar.gz bugzilla-d8d3c0edd90267e23e4910fe550df4604a5ad75b.tar.xz |
Bug 931765 - When you enter your login or password wrong, the error message shown "The username or password you entered is not valid" should be edited to "The login or password you entered is not valid"
r=dkl,a=sgreen
Diffstat (limited to 'Bugzilla')
-rw-r--r-- | Bugzilla/Auth.pm | 2 | ||||
-rw-r--r-- | Bugzilla/WebService/Constants.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Bugzilla/Auth.pm b/Bugzilla/Auth.pm index c46e554a3..4e766cf0b 100644 --- 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 e4325d9d3..1c3929e53 100644 --- 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, |