From 37e9cc14243e37b1b14188150709856848c83d2f Mon Sep 17 00:00:00 2001 From: Dachi Date: Thu, 12 Sep 2024 07:44:50 -0700 Subject: [PATCH 1/4] fixed suggestion for new username when registering if the current one is taken --- dump.rdb | Bin 0 -> 5220 bytes public/language/en-US/error.json | 2 +- public/src/client/register.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 dump.rdb diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 0000000000000000000000000000000000000000..76bd30e5839de8e2450b39c76b6a7cc8e96a68ba GIT binary patch literal 5220 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 literal 0 HcmV?d00001 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..0e4dc8f27d 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(); From 981cc6162f265f416f02e6858f08a34b4d56ec0a Mon Sep 17 00:00:00 2001 From: Dachi Date: Thu, 12 Sep 2024 07:52:28 -0700 Subject: [PATCH 2/4] fixed lint issues --- public/src/client/register.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/register.js b/public/src/client/register.js index 0e4dc8f27d..467564e3f0 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, ' + '"' + username + 'suffix' + '""' + ']]'); + showError(usernameInput, username_notify, `[[error:username-taken, "${username}suffix"]]`); } callback(); From 0cddaad65363a70c26b0d7a36467d233f89c106f Mon Sep 17 00:00:00 2001 From: Dachi Date: Thu, 12 Sep 2024 08:10:23 -0700 Subject: [PATCH 3/4] fixed database --- public/src/client/register.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/src/client/register.js b/public/src/client/register.js index 467564e3f0..743d0f5b63 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -143,6 +143,11 @@ define('forum/register', [ } } + function hello() { + x = 15 + y = 20 + } + function validatePassword(password, password_confirm) { const passwordInput = $('#password'); const password_notify = $('#password-notify'); From ed9b2ddd67d8865d6bc85442797bc442715b57f8 Mon Sep 17 00:00:00 2001 From: Dachi Date: Thu, 12 Sep 2024 08:18:42 -0700 Subject: [PATCH 4/4] all the lint issues fixed --- public/src/client/register.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/public/src/client/register.js b/public/src/client/register.js index 743d0f5b63..0e31ea0073 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -143,11 +143,14 @@ define('forum/register', [ } } - function hello() { - x = 15 - y = 20 + 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');