From a8d09f0eff7dd4678dc33538da76e0d5f31e5a64 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Fri, 25 Mar 2022 13:36:06 +0800 Subject: [PATCH] fix: reset pw validation logic Signed-off-by: Wing-Kam Wong --- packages/nc-gui/pages/user/settings/index.vue | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/packages/nc-gui/pages/user/settings/index.vue b/packages/nc-gui/pages/user/settings/index.vue index dfcd2d0dea..a842696d5c 100644 --- a/packages/nc-gui/pages/user/settings/index.vue +++ b/packages/nc-gui/pages/user/settings/index.vue @@ -219,16 +219,36 @@ export default { valid: true, formRules: { email: [ - v => !!v || 'E-mail is required', - v => isEmail(v) || 'E-mail must be valid' + // E-mail is required + v => !!v || this.$t('msg.error.signUpRules.emailReqd'), + // E-mail must be valid + v => isEmail(v) || + this.$t('msg.error.signUpRules.emailInvalid') ], password: [ - [v => !!v || 'Password is required'], - [v => !!v || 'New Password is required'], - [v => v === this.passwordDetails.newPassword || 'Confirm password should match'] + // Current Password + [ + // Password is required + v => !!v || this.$t('msg.error.signUpRules.passwdRequired') + ], + // New Password + [ + // Password is required + v => !!v || this.$t('msg.error.signUpRules.passwdRequired'), + // You password must be atleast 8 characters + v => (v && v.length >= 8) || this.$t('msg.error.signUpRules.passwdLength') + ], + // Confirm Password + [ + // Password is required + v => !!v || this.$t('msg.error.signUpRules.passwdRequired'), + // TODO: i18n + v => v === this.passwordDetails.newPassword || 'Confirm password should match', + // You password must be atleast 8 characters + v => (v && v.length >= 8) || this.$t('msg.error.signUpRules.passwdLength') + ] ] } - } }, head() {