Skip to content

Commit

Permalink
PATCH: AR-3091 Login form "Email or username" label incorrect
Browse files Browse the repository at this point in the history
Our hack to the login form currently only supports identifying the user
by email address, not by username.  Until that is fixed, we should change
the field label to read "Email address" rather than "Email or username".

Concurrent with this patch, we should remove the custom configuration
for `Accounts_EmailOrUsernamePlaceholder`, returning it to the default empty string.
We had customized it "Email address" when 5.x treated the empty string as "Email or username".
However 6.x treats the empty string as "[email protected]".
  • Loading branch information
nmagedman committed Sep 3, 2023
1 parent dbfba6b commit 7b784aa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -5741,7 +5741,7 @@
"registration.component.login.incorrectPassword": "Incorrect password",
"registration.component.switchLanguage": "Switch to <1>en</1>",
"registration.component.resetPassword": "Reset password",
"registration.component.form.emailOrUsername": "Email or username",
"registration.component.form.emailOrUsername": "Email address",
"registration.component.form.username": "Username",
"registration.component.form.name": "Name",
"registration.component.form.nameOptional": "Name optional",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const RegisterTitle = (): ReactElement | null => {
return null;
}

return (
return(

Check failure on line 11 in packages/web-ui-registration/src/components/RegisterTitle.tsx

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint

Insert `·`

Check failure on line 11 in packages/web-ui-registration/src/components/RegisterTitle.tsx

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint

Insert `·`
<>
Seeking Alpha
<br />
Expand Down

0 comments on commit 7b784aa

Please sign in to comment.