OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2673 from jryans/username-label 

Clarify what the username error refers to
pull/21833/head
J. Ryan Stinnett 2019-02-22 10:17:58 +00:00 committed by GitHub
parent d6f8f8a7ba b74107116b
commit b6682c0469
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/auth/Registration.js
View File

@ -313,7 +313,7 @@ module.exports = React.createClass({
errMsg = _t('A phone number is required to register on this homeserver.'); errMsg = _t('A phone number is required to register on this homeserver.');
break; break;
case "RegistrationForm.ERR_USERNAME_INVALID": case "RegistrationForm.ERR_USERNAME_INVALID":
errMsg = _t("Only use lower case letters, numbers and '=_-./'"); errMsg = _t("A username can only contain lower case letters, numbers and '=_-./'");
break; break;
case "RegistrationForm.ERR_USERNAME_BLANK": case "RegistrationForm.ERR_USERNAME_BLANK":
errMsg = _t('You need to enter a username.'); errMsg = _t('You need to enter a username.');

2
src/components/views/dialogs/SetMxIdDialog.js
View File

@ -115,7 +115,7 @@ export default React.createClass({
// user ID roughly looks okay from a Matrix perspective. // user ID roughly looks okay from a Matrix perspective.
if (!SAFE_LOCALPART_REGEX.test(this.state.username)) { if (!SAFE_LOCALPART_REGEX.test(this.state.username)) {
this.setState({ this.setState({
usernameError: _t("Only use lower case letters, numbers and '=_-./'"), usernameError: _t("A username can only contain lower case letters, numbers and '=_-./'"),
}); });
return Promise.reject(); return Promise.reject();
} }

2
src/i18n/strings/en_EN.json
View File

@ -1129,7 +1129,7 @@
"Email address": "Email address", "Email address": "Email address",
"This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.", "This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.",
"Skip": "Skip", "Skip": "Skip",
"Only use lower case letters, numbers and '=_-./'": "Only use lower case letters, numbers and '=_-./'", "A username can only contain lower case letters, numbers and '=_-./'": "A username can only contain lower case letters, numbers and '=_-./'",
"Username not available": "Username not available", "Username not available": "Username not available",
"Username invalid: %(errMessage)s": "Username invalid: %(errMessage)s", "Username invalid: %(errMessage)s": "Username invalid: %(errMessage)s",
"An error occurred: %(error_string)s": "An error occurred: %(error_string)s", "An error occurred: %(error_string)s": "An error occurred: %(error_string)s",