summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorDavid Lu <david.lu@hotmail.com>2016-05-11 08:02:36 -0400
committerChristopher Speller <crspeller@gmail.com>2016-05-11 08:02:36 -0400
commit95cc21fb716c1810041c2b438641125ec71dbf5c (patch)
treec8ef40ef3bc21f0171a623509ef0f76698462cef /webapp/components
parent2dbc1a50fa6deb6e79e6ee463740ee14eaa7a55e (diff)
downloadchat-95cc21fb716c1810041c2b438641125ec71dbf5c.tar.gz
chat-95cc21fb716c1810041c2b438641125ec71dbf5c.tar.bz2
chat-95cc21fb716c1810041c2b438641125ec71dbf5c.zip
Fixed username restriction display errors (#2952)
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/user_settings/user_settings_general.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index b48026a39..be1d1e6c5 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -23,7 +23,7 @@ const holders = defineMessages({
},
usernameRestrictions: {
id: 'user.settings.general.usernameRestrictions',
- defaultMessage: "Pick something easy for teammates to recognize and recall. Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-', and '_'"
+ defaultMessage: "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-', and '_'."
},
validEmail: {
id: 'user.settings.general.validEmail',
@@ -108,7 +108,7 @@ class UserSettingsGeneralTab extends React.Component {
this.setState({clientError: formatMessage(holders.usernameReserved)});
return;
} else if (usernameError) {
- this.setState({clientError: formatMessage(holders.usernameRestrictions, {min: Constants.MIN_USERNAME_LENGTH}, {max: Constants.MAX_USERNAME_LENGTH})});
+ this.setState({clientError: formatMessage(holders.usernameRestrictions, {min: Constants.MIN_USERNAME_LENGTH, max: Constants.MAX_USERNAME_LENGTH})});
return;
}
@@ -773,7 +773,7 @@ class UserSettingsGeneralTab extends React.Component {
<span>
<FormattedMessage
id='user.settings.general.usernameInfo'
- defaultMessage="Pick something easy for teammates to recognize and recall. Username must begin with a letter, and contain between {Constants.MIN_USERNAME_LENGTH to {Constants.MAX_USERNAME_LENGTH} lowercase characters made up of numbers, letters, and the symbols '.', '-', and '_'"
+ defaultMessage='Pick something easy for teammates to recognize and recall.'
/>
</span>
);