diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-01-21 09:59:38 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-01-21 09:59:38 -0500 |
| commit | 868eece9879131e9f2093a0e858533c9df76b55c (patch) | |
| tree | 5117de60eb860c6328a0e4a1dd4404a89252364b /web/react/components/user_settings | |
| parent | 2fdfdaeff7a0bf29fd21eec6d4f48abe579d5048 (diff) | |
| parent | 76f000056512d323febeb6c941e43efb438030ba (diff) | |
| download | chat-868eece9879131e9f2093a0e858533c9df76b55c.tar.gz chat-868eece9879131e9f2093a0e858533c9df76b55c.tar.bz2 chat-868eece9879131e9f2093a0e858533c9df76b55c.zip | |
Merge pull request #1927 from rgarmsen2295/plt-1668
PLT-1668 Removes duplicate short username error message
Diffstat (limited to 'web/react/components/user_settings')
| -rw-r--r-- | web/react/components/user_settings/user_settings_general.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/user_settings/user_settings_security.jsx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index 75a0e6b6a..df7ae4a25 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -47,7 +47,7 @@ export default class UserSettingsGeneralTab extends React.Component { this.setState({clientError: 'This username is reserved, please choose a new one.'}); return; } else if (usernameError) { - this.setState({clientError: "Username must begin with a letter, and contain between 3 to 15 lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'."}); + this.setState({clientError: '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 '_'."}); return; } diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx index d1266dd3f..5a21abd19 100644 --- a/web/react/components/user_settings/user_settings_security.jsx +++ b/web/react/components/user_settings/user_settings_security.jsx @@ -48,8 +48,8 @@ export default class SecurityTab extends React.Component { return; } - if (newPassword.length < 5) { - this.setState({passwordError: 'New passwords must be at least 5 characters', serverError: ''}); + if (newPassword.length < Constants.MIN_PASSWORD_LENGTH) { + this.setState({passwordError: 'New passwords must be at least ' + Constants.MIN_PASSWORD_LENGTH + ' characters', serverError: ''}); return; } @@ -337,7 +337,7 @@ export default class SecurityTab extends React.Component { className='security-links theme' dialogType={AccessHistoryModal} > - <i className='fa fa-clock-o'></i>View Access History + <i className='fa fa-clock-o'></i>{'View Access History'} </ToggleModalButton> <b> </b> <ToggleModalButton |