From 3ef886b241c5654bf21e5326d1299ccde161b228 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 29 Sep 2013 13:09:30 +0300 Subject: Fix password length limit messages. --- src/gui/changeemaildialog.cpp | 2 +- src/gui/changepassworddialog.cpp | 2 +- src/gui/registerdialog.cpp | 2 +- src/gui/unregisterdialog.cpp | 2 +- src/net/ea/loginhandler.h | 2 +- src/net/eathena/loginhandler.h | 2 +- src/net/tmwa/loginhandler.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp index 3cf519336..cd10b8dfa 100644 --- a/src/gui/changeemaildialog.cpp +++ b/src/gui/changeemaildialog.cpp @@ -141,7 +141,7 @@ void ChangeEmailDialog::action(const gcn::ActionEvent &event) "least %u characters long."), min); error = 1; } - else if (newFirstEmail.length() > max - 1 ) + else if (newFirstEmail.length() > max) { // First email address too long // TRANSLATORS: change email error diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp index c337dccdf..3f41df3c5 100644 --- a/src/gui/changepassworddialog.cpp +++ b/src/gui/changepassworddialog.cpp @@ -129,7 +129,7 @@ void ChangePasswordDialog::action(const gcn::ActionEvent &event) " %u characters long."), min); error = 2; } - else if (newFirstPass.length() > max - 1 ) + else if (newFirstPass.length() > max) { // First password too long // TRANSLATORS: change password error diff --git a/src/gui/registerdialog.cpp b/src/gui/registerdialog.cpp index bafcad58a..183f6b6b8 100644 --- a/src/gui/registerdialog.cpp +++ b/src/gui/registerdialog.cpp @@ -219,7 +219,7 @@ void RegisterDialog::action(const gcn::ActionEvent &event) minPass); error = 2; } - else if (mPasswordField->getText().length() > maxPass - 1 ) + else if (mPasswordField->getText().length() > maxPass) { // Pass too long errorMsg = strprintf diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp index a88ac7e16..3640456d0 100644 --- a/src/gui/unregisterdialog.cpp +++ b/src/gui/unregisterdialog.cpp @@ -126,7 +126,7 @@ void UnRegisterDialog::action(const gcn::ActionEvent &event) "characters long."), min); error = true; } - else if (password.length() > max - 1) + else if (password.length() > max) { // TRANSLATORS: unregister dialog. error message. errorMsg << strprintf(_("The password needs to be less than " diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index e84da5ce4..d1994f73d 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -51,7 +51,7 @@ class LoginHandler : public Net::LoginHandler virtual unsigned int getMaxPasswordLength() const override A_WARN_UNUSED - { return 25; } + { return 24; } virtual void loginAccount(LoginData *const loginData) const override; diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h index 7c9b5eb61..f7c136e39 100644 --- a/src/net/eathena/loginhandler.h +++ b/src/net/eathena/loginhandler.h @@ -55,7 +55,7 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler { return SetGenderOnRegister; } unsigned int getMaxPasswordLength() const override A_WARN_UNUSED - { return 25; } + { return 24; } void changePassword(const std::string &username, const std::string &oldPassword, diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index 972bf353a..30a0bd286 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -52,7 +52,7 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler int supportedOptionalActions() const override A_WARN_UNUSED; unsigned int getMaxPasswordLength() const override A_WARN_UNUSED - { return 25; } + { return 24; } void changePassword(const std::string &username, const std::string &oldPassword, -- cgit v1.2.3-60-g2f50