From f4fdb38f5c5515c83a9f7b892a84ff1e17f2199e Mon Sep 17 00:00:00 2001 From: Zhanhan Liu Date: Mon, 2 Feb 2026 19:37:59 -0500 Subject: [PATCH 1/2] Clarify username taken error message during registration --- public/language/en-US/error.json | 4 +++- public/src/client/register.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index ea28a9a51c..e33768e211 100644 --- a/public/language/en-US/error.json +++ b/public/language/en-US/error.json @@ -264,5 +264,7 @@ "activitypub.pubKey-not-found": "Unable to resolve public key, so payload verification cannot take place.", "activitypub.origin-mismatch": "The received object's origin does not match the sender's origin", "activitypub.actor-mismatch": "The received activity is being carried out by an actor that is different from expected.", - "activitypub.not-implemented": "The request was denied because it or an aspect of it is not implemented by the recipient server" + "activitypub.not-implemented": "The request was denied because it or an aspect of it is not implemented by the recipient server", + "username-or-group-taken": "Username unavailable (conflicts with an existing user or group).", + } \ No newline at end of file diff --git a/public/src/client/register.js b/public/src/client/register.js index f989901e7b..170c9bc480 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-or-group-taken]]'); } callback(); From 64580052f5e0319ef7d5d87a625b035254115fd5 Mon Sep 17 00:00:00 2001 From: Zhanhan Liu Date: Mon, 2 Feb 2026 19:47:16 -0500 Subject: [PATCH 2/2] Fix error.json syntax --- public/language/en-US/error.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index e33768e211..3e2d03ca35 100644 --- a/public/language/en-US/error.json +++ b/public/language/en-US/error.json @@ -265,6 +265,6 @@ "activitypub.origin-mismatch": "The received object's origin does not match the sender's origin", "activitypub.actor-mismatch": "The received activity is being carried out by an actor that is different from expected.", "activitypub.not-implemented": "The request was denied because it or an aspect of it is not implemented by the recipient server", - "username-or-group-taken": "Username unavailable (conflicts with an existing user or group).", + "username-or-group-taken": "Username unavailable (conflicts with an existing user or group)." } \ No newline at end of file