diff --git a/public/language/en-GB/error.json b/public/language/en-GB/error.json index ec51a88ead..0725edf579 100644 --- a/public/language/en-GB/error.json +++ b/public/language/en-GB/error.json @@ -35,8 +35,7 @@ "folder-exists": "Folder exists", "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2", - - "username-taken": "Username taken", + "username-taken": "Username taken", "email-taken": "Email address is already taken.", "email-nochange": "The email entered is the same as the email already on file.", "email-invited": "Email was already invited", diff --git a/public/src/client/register.js b/public/src/client/register.js index f989901e7b..ca915cbb61 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -121,6 +121,7 @@ define('forum/register', [ username_notify.text(''); const usernameInput = $('#username'); const userslug = slugify(username); + if (username.length < ajaxify.data.minimumUsernameLength || userslug.length < ajaxify.data.minimumUsernameLength) { showError(usernameInput, username_notify, '[[error:username-too-short]]'); } else if (username.length > ajaxify.data.maximumUsernameLength) { @@ -135,14 +136,18 @@ define('forum/register', [ if (results.every(obj => obj.status === 'rejected')) { showSuccess(usernameInput, username_notify, successIcon); } else { - showError(usernameInput, username_notify, '[[error:username-taken]]'); + const currentUsername = username + 'suffix'; + showError(usernameInput, username_notify, `[[error:username-taken]]. Try "${currentUsername}" instead.`); } - callback(); }); } } + + + + function validatePassword(password, password_confirm) { const passwordInput = $('#password'); const password_notify = $('#password-notify');