diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 0000000000..76bd30e583 Binary files /dev/null and b/dump.rdb differ diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index f12e15c94f..ab96f8f8bc 100644 --- a/public/language/en-US/error.json +++ b/public/language/en-US/error.json @@ -31,7 +31,7 @@ "invalid-path": "Invalid path", "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. Maybe try %1", "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 d8144d26d5..0e31ea0073 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -135,7 +135,7 @@ define('forum/register', [ if (results.every(obj => obj.status === 'rejected')) { showSuccess(usernameInput, username_notify, successIcon); } else { - showError(usernameInput, username_notify, '[[error:username-taken]]'); + showError(usernameInput, username_notify, `[[error:username-taken, "${username}suffix"]]`); } callback(); @@ -143,6 +143,14 @@ define('forum/register', [ } } + function hello() { + const x = 15; + const y = 20; + return x + y; + } + + hello(); + function validatePassword(password, password_confirm) { const passwordInput = $('#password'); const password_notify = $('#password-notify');