forked from fedi/mastodon
Show correct error message if chosen password is too long (#17082)
* Add correct error message for exceeding max length on password confirmation field * Code style fixes
This commit is contained in:
parent
0fb9536d38
commit
66baa629ea
|
@ -120,7 +120,9 @@ function main() {
|
||||||
delegate(document, '#registration_user_password_confirmation,#registration_user_password', 'input', () => {
|
delegate(document, '#registration_user_password_confirmation,#registration_user_password', 'input', () => {
|
||||||
const password = document.getElementById('registration_user_password');
|
const password = document.getElementById('registration_user_password');
|
||||||
const confirmation = document.getElementById('registration_user_password_confirmation');
|
const confirmation = document.getElementById('registration_user_password_confirmation');
|
||||||
if (password.value && password.value !== confirmation.value) {
|
if (confirmation.value && confirmation.value.length > password.maxLength) {
|
||||||
|
confirmation.setCustomValidity((new IntlMessageFormat(messages['password_confirmation.exceeds_maxlength'] || 'Password confirmation exceeds the maximum password length', locale)).format());
|
||||||
|
} else if (password.value && password.value !== confirmation.value) {
|
||||||
confirmation.setCustomValidity((new IntlMessageFormat(messages['password_confirmation.mismatching'] || 'Password confirmation does not match', locale)).format());
|
confirmation.setCustomValidity((new IntlMessageFormat(messages['password_confirmation.mismatching'] || 'Password confirmation does not match', locale)).format());
|
||||||
} else {
|
} else {
|
||||||
confirmation.setCustomValidity('');
|
confirmation.setCustomValidity('');
|
||||||
|
@ -132,7 +134,9 @@ function main() {
|
||||||
const confirmation = document.getElementById('user_password_confirmation');
|
const confirmation = document.getElementById('user_password_confirmation');
|
||||||
if (!confirmation) return;
|
if (!confirmation) return;
|
||||||
|
|
||||||
if (password.value && password.value !== confirmation.value) {
|
if (confirmation.value && confirmation.value.length > password.maxLength) {
|
||||||
|
confirmation.setCustomValidity((new IntlMessageFormat(messages['password_confirmation.exceeds_maxlength'] || 'Password confirmation exceeds the maximum password length', locale)).format());
|
||||||
|
} else if (password.value && password.value !== confirmation.value) {
|
||||||
confirmation.setCustomValidity((new IntlMessageFormat(messages['password_confirmation.mismatching'] || 'Password confirmation does not match', locale)).format());
|
confirmation.setCustomValidity((new IntlMessageFormat(messages['password_confirmation.mismatching'] || 'Password confirmation does not match', locale)).format());
|
||||||
} else {
|
} else {
|
||||||
confirmation.setCustomValidity('');
|
confirmation.setCustomValidity('');
|
||||||
|
|
Loading…
Reference in a new issue