Merge pull request #14310 from abpframework/liangshiwei/account

Not allowed user change password same as current password

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "تم حفظ الإعدادات الشخصية",
     "PasswordChanged": "تم تغيير كلمة المرور",
     "NewPasswordConfirmFailed": "يرجى تأكيد كلمة المرور الجديدة.",
+    "NewPasswordSameAsOld": "يجب أن تكون كلمة المرور الجديدة مختلفة عن كلمة المرور الحالية.",
     "Manage": "إدارة",
     "MyAccount": "حسابي",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "هل تم تمكين التسجيل الذاتي",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json

@@ -35,6 +35,7 @@
     "PersonalSettingsSaved": "Osobní nastavení uloženo",
     "PasswordChanged": "Heslo změněno",
     "NewPasswordConfirmFailed": "Potvrďte nové heslo.",
+    "NewPasswordSameAsOld": "Nové heslo musí být odlišné od současného.",
     "Manage": "Spravovat",
     "MyAccount": "Můj účet",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Je povolena automatická registrace",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/da.json

@@ -35,6 +35,7 @@
     "PersonalSettingsSaved": "Personlige indstillinger gemt",
     "PasswordChanged": "Kodeord gemt",
     "NewPasswordConfirmFailed": "Bekræft venligst det nye kodeord.",
+    "NewPasswordSameAsOld": "Det nye kodeord skal være anderledes end det gamle.",
     "Manage": "Administrer",
     "MyAccount": "Min konto",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Er registrering aktiveret",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "Persönliche Einstellungen gespeichert",
     "PasswordChanged": "Passwort geändert",
     "NewPasswordConfirmFailed": "Bitte bestätigen Sie das neue Passwort.",
+    "NewPasswordSameAsOld": "Das neue Passwort muss sich vom alten Passwort unterscheiden.",
     "Manage": "Verwalten",
     "MyAccount": "Mein Benutzerkonto",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Selbstregistrierung ist aktiviert",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de.json

@@ -35,6 +35,7 @@
     "PersonalSettingsSaved": "Persönliche Einstellungen gespeichert",
     "PasswordChanged": "Passwort geändert",
     "NewPasswordConfirmFailed": "Bitte bestätigen Sie das neue Passwort.",
+    "NewPasswordSameAsOld": "Das neue Passwort muss sich vom alten Passwort unterscheiden.",
     "Manage": "Verwalten",
     "MyAccount": "Mein Konto",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Ist die Selbstregistrierung aktiviert",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/el.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "Οι προσωπικές ρυθμίσεις αποθηκεύτηκαν",
     "PasswordChanged": "Ο κωδικός πρόσβασης άλλαξε",
     "NewPasswordConfirmFailed": "Παρακαλώ επιβεβαιώστε τον νέο κωδικό πρόσβασης.",
+    "NewPasswordSameAsOld": "Ο νέος κωδικός πρόσβασης πρέπει να είναι διαφορετικός από τον τρέχοντα.",
     "Manage": "Διαχείρηση",
     "MyAccount": "Ο λογαριασμός μου",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Είναι ενεργοποιημένη η αυτοεγγραφή",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en-GB.json

@@ -35,6 +35,7 @@
     "PersonalSettingsSaved": "Personal settings saved",
     "PasswordChanged": "Password changed",
     "NewPasswordConfirmFailed": "Please confirm the new password.",
+    "NewPasswordSameAsOld": "The new password must be different from the old one.",
     "Manage": "Manage",
     "MyAccount": "My account",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Is self-registration enabled",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "Personal settings saved",
     "PasswordChanged": "Password changed",
     "NewPasswordConfirmFailed": "Please confirm the new password.",
+    "NewPasswordSameAsOld": "New password must be different from the old one.",
     "Manage": "Manage",
     "MyAccount": "My account",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Is self-registration enabled",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es-mx.json

@@ -32,6 +32,7 @@
     "PersonalSettingsSaved": "Ajustes personales guardados",
     "PasswordChanged": "Cambia la contraseña",
     "NewPasswordConfirmFailed": "Por favor, confirme la nueva contraseña.",
+    "NewPasswordSameAsOld": "La nueva contraseña debe ser diferente de la contraseña actual.",
     "Manage": "Administrar",
     "MyAccount": "Mi cuenta"
   }

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "Ajustes personales guardados",
     "PasswordChanged": "Cambiar la contraseña",
     "NewPasswordConfirmFailed": "Por favor, confirme la nueva contraseña.",
+    "NewPasswordSameAsOld": "La nueva contraseña debe ser diferente de la contraseña actual.",
     "Manage": "Administrar",
     "MyAccount": "Mi cuenta",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "¿El auto-registro está habilitado?",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fa.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "تنظیمات شخصی ذخیره گردید",
     "PasswordChanged": "گذرواژه تغییر کرد",
     "NewPasswordConfirmFailed": "لطفاً گذرواژه جدید را تأیید کنید.",
+    "NewPasswordSameAsOld": "گذرواژه جدید نباید با گذرواژه قبلی یکسان باشد.",
     "Manage": "مدیریت",
     "MyAccount": "حساب من",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "آیا امکان ثبت نام فعال است",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fi.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "Henkilökohtaiset asetukset tallennettu",
     "PasswordChanged": "Salasana vaihdettu",
     "NewPasswordConfirmFailed": "Vahvista uusi salasana.",
+    "NewPasswordSameAsOld": "Uusi salasana ei voi olla sama kuin vanha salasana.",
     "Manage": "Hallitse",
     "MyAccount": "Tilini",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Onko itserekisteröinti käytössä",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "Paramètres personnels enregistrés",
     "PasswordChanged": "Mot de passe changé",
     "NewPasswordConfirmFailed": "Veuillez confirmer le nouveau mot de passe.",
+    "NewPasswordSameAsOld": "Le nouveau mot de passe doit être différent de l'ancien.",
     "Manage": "Gérer",
     "MyAccount": "Mon compte",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "L’auto-inscription est-elle activée",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hi.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "व्यक्तिगत सेटिंग्स सहेजे गए",
     "PasswordChanged": "पासवर्ड बदला गया",
     "NewPasswordConfirmFailed": "कृपया नए पासवर्ड की पुष्टि करें।",
+    "NewPasswordSameAsOld": "नया पासवर्ड वर्तमान पासवर्ड से एक ही होना चाहिए।",
     "Manage": "प्रबंधित",
     "MyAccount": "मेरा खाता",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "क्या स्व-पंजीकरण सक्षम है",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "Személyes beállítások mentve",
     "PasswordChanged": "Jelszó megváltoztatva",
     "NewPasswordConfirmFailed": "Kérjük, erősítse meg az új jelszót.",
+    "NewPasswordSameAsOld": "Az új jelszó nem lehet azonos a régi jelszóval.",
     "Manage": "Kezelés",
     "MyAccount": "A fiókom",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Engedélyezve van az önregisztráció",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/is.json

@@ -35,6 +35,7 @@
     "PersonalSettingsSaved": "Persónulegar stillingar vistaðar",
     "PasswordChanged": "Lykilorði breytt",
     "NewPasswordConfirmFailed": "Vinsamlegast staðfestu nýja lykilorðið.",
+    "NewPasswordSameAsOld": "Nýtt lykilorð verður að vera frábrugðið núverandi lykilorði.",
     "Manage": "Umsjá",
     "MyAccount": "Minn aðgangur",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Er sjálfskráning virk",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/it.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "Impostazioni personali salvate",
     "PasswordChanged": "Password cambiata",
     "NewPasswordConfirmFailed": "Conferma la nuova password.",
+    "NewPasswordSameAsOld": "La nuova password deve essere diversa dalla vecchia.",
     "Manage": "Gestire",
     "MyAccount": "Il mio account",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "L'auto-registrazione è abilitata",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/nl.json

@@ -35,6 +35,7 @@
     "PersonalSettingsSaved": "Persoonlijke instellingen opgeslagen",
     "PasswordChanged": "Wachtwoord veranderd",
     "NewPasswordConfirmFailed": "Bevestig het nieuwe wachtwoord a.u.b.",
+    "NewPasswordSameAsOld": "Het nieuwe wachtwoord moet verschillen van het huidige wachtwoord.",
     "Manage": "Beheer",
     "MyAccount": "Mijn rekening",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Is zelfregistratie ingeschakeld",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pl-PL.json

@@ -35,6 +35,7 @@
     "PersonalSettingsSaved": "Zapisano ustawienia osobiste",
     "PasswordChanged": "Hasło zostało zmienione",
     "NewPasswordConfirmFailed": "Potwierdź nowe hasło.",
+    "NewPasswordSameAsOld": "Nowe hasło musi być inne niż poprzednie.",
     "Manage": "Zarządzać",
     "MyAccount": "Moje konto",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Czy włączona jest samodzielna rejestracja?",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "Configurações pessoais salvas",
     "PasswordChanged": "Senha alterada",
     "NewPasswordConfirmFailed": "Por favor, confirme a nova senha.",
+    "NewPasswordSameAsOld": "A nova senha deve ser diferente da senha atual.",
     "Manage": "Gerenciar",
     "MyAccount": "Minha conta",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "O autorregistro está habilitado",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json

@@ -35,6 +35,7 @@
     "PersonalSettingsSaved": "Setări personale salvate",
     "PasswordChanged": "Parola schimbată",
     "NewPasswordConfirmFailed": "Vă rugăm să confirmaţi noua parolă.",
+    "NewPasswordSameAsOld": "Noua parolă trebuie să fie diferită de cea curentă.",
     "Manage": "Administrează",
     "MyAccount": "Contul meu",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Este înregistrarea personală activată",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ru.json

@@ -35,6 +35,7 @@
     "PersonalSettingsSaved": "Персональные настройки сохранены",
     "PasswordChanged": "Пароль изменен",
     "NewPasswordConfirmFailed": "Пожалуйста подтвердите новый пароль.",
+    "NewPasswordSameAsOld": "Новый пароль не должен совпадать со старым.",
     "Manage": "Управление учетной записью",
     "MyAccount": "Мой аккаунт",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Самостоятельная регистрация включена",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sk.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "Osobné nastavenia boli uložené",
     "PasswordChanged": "Heslo bolo zmenené",
     "NewPasswordConfirmFailed": "Prosím potvrďte nové heslo.",
+    "NewPasswordSameAsOld": "Nové heslo musí byť odlišné od aktuálneho.",
     "Manage": "Spravovať",
     "MyAccount": "Môj účet",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Je povolená samoregistrácia",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sl.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "Osebne nastavitve so shranjene",
     "PasswordChanged": "Geslo je spremenjeno",
     "NewPasswordConfirmFailed": "Prosimo potrdite novo geslo.",
+    "NewPasswordSameAsOld": "Novo geslo mora biti drugačno od starega.",
     "Manage": "Upravljaj",
     "MyAccount": "Moj račun",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Je lastna registracija uporabnika omogočena",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "Kişisel ayarlar kaydedildi",
     "PasswordChanged": "Şifre değiştirildi",
     "NewPasswordConfirmFailed": "Lütfen yeni şifreyi onaylayın.",
+    "NewPasswordSameAsOld": "Yeni şifre eski şifre ile aynı olamaz.",
     "Manage": "Manage",
     "MyAccount": "Hesabım",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "self-registration etkin mi ?",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/vi.json

@@ -35,6 +35,7 @@
     "PersonalSettingsSaved": "Đã lưu cài đặt cá nhân",
     "PasswordChanged": "mật khẩu đã được thay đổi",
     "NewPasswordConfirmFailed": "Vui lòng xác nhận mật khẩu mới.",
+    "NewPasswordSameAsOld": "Mật khẩu mới không được giống như mật khẩu cũ.",
     "Manage": "Quản lý",
     "MyAccount": "Tài khoản của tôi",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Tự đăng ký có được bật không",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "个人设置已保存",
     "PasswordChanged": "修改密码",
     "NewPasswordConfirmFailed": "请确认新密码",
+    "NewPasswordSameAsOld": "新密码不能与旧密码相同",
     "Manage": "管理",
     "MyAccount": "我的账户",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "启用自行注册",

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hant.json

@@ -36,6 +36,7 @@
     "PersonalSettingsSaved": "個人設置已保存",
     "PasswordChanged": "修改密碼",
     "NewPasswordConfirmFailed": "請確認新密碼",
+    "NewPasswordSameAsOld": "新密碼不能與舊密碼相同",
     "Manage": "管理",
     "MyAccount": "我的賬戶",
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "啟用自行註冊",

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js

@@ -22,7 +22,12 @@
             if (input.currentPassword && input.currentPassword == ''){
                 return;
             }
-
+            
+            if(input.currentPassword == input.newPassword) {
+                abp.message.error(l('NewPasswordSameAsOld'));
+                return;
+            }
+            
             volo.abp.account.profile.changePassword(input).then(function (result) {
                 abp.message.success(l('PasswordChanged'));
                 abp.event.trigger('passwordChanged');