diff --git a/.gitignore b/.gitignore index 42a1b3c705..b1c4a1508d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ provision.sh feeds/recent.rss .eslintcache .svn +dump.rdb logs/ diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 0000000000..164aae358e 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..b707a370ee 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();