From d00895d0fb6da4bc03be9121c59ca0d532b2751a Mon Sep 17 00:00:00 2001 From: Haya Date: Thu, 12 Sep 2024 17:38:20 +0300 Subject: [PATCH 1/2] fixed-username-taken-issue --- public/language/en-US/error.json | 2 +- public/src/client/register.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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..3bdee41e38 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -126,7 +126,7 @@ define('forum/register', [ } else if (username.length > ajaxify.data.maximumUsernameLength) { showError(usernameInput, username_notify, '[[error:username-too-long]]'); } else if (!utils.isUserNameValid(username) || !userslug) { - showError(usernameInput, username_notify, '[[error:invalid-username]]'); + showError(usernameInput, username_notify, 'Username taken. Maybe try &(currentUsername)suffix'); } else { Promise.allSettled([ api.head(`/users/bySlug/${userslug}`, {}), From 9ad63144ae9d924e70146a912d98916acfc1132e Mon Sep 17 00:00:00 2001 From: Haya Date: Thu, 12 Sep 2024 21:44:43 +0300 Subject: [PATCH 2/2] fixed-usernametaken-issue --- public/language/en-US/error.json | 2 +- public/src/client/register.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index ab96f8f8bc..f12e15c94f 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. Maybe try %1", + "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 3bdee41e38..2512529bdc 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -126,7 +126,7 @@ define('forum/register', [ } else if (username.length > ajaxify.data.maximumUsernameLength) { showError(usernameInput, username_notify, '[[error:username-too-long]]'); } else if (!utils.isUserNameValid(username) || !userslug) { - showError(usernameInput, username_notify, 'Username taken. Maybe try &(currentUsername)suffix'); + showError(usernameInput, username_notify, '[[error:username-taken]]'); } else { Promise.allSettled([ api.head(`/users/bySlug/${userslug}`, {}), @@ -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]] Maybe try ${usernameInput.val()}suffix`); } callback();