summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorRyan Wang <R-Wang97@users.noreply.github.com>2017-04-16 17:08:37 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-04-16 17:08:37 -0400
commitc7f26bb1103e75c451eba3b720ac41097c427fbc (patch)
tree0c2b946523e7f32198dfb36570ff2ee6272653b2 /webapp/components
parentd8d0716122be5eebab85b89f5a5a522fcaed3bd1 (diff)
downloadchat-c7f26bb1103e75c451eba3b720ac41097c427fbc.tar.gz
chat-c7f26bb1103e75c451eba3b720ac41097c427fbc.tar.bz2
chat-c7f26bb1103e75c451eba3b720ac41097c427fbc.zip
Update error message when password is too long (#6001)
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/admin_console/password_settings.jsx10
1 files changed, 6 insertions, 4 deletions
diff --git a/webapp/components/admin_console/password_settings.jsx b/webapp/components/admin_console/password_settings.jsx
index 2b0ea652f..68506fcfe 100644
--- a/webapp/components/admin_console/password_settings.jsx
+++ b/webapp/components/admin_console/password_settings.jsx
@@ -53,9 +53,10 @@ export default class PasswordSettings extends AdminSettings {
this.sampleErrorMsg = (
<FormattedMessage
id={sampleErrorMsgId}
- default='Your password must be at least {min} characters.'
+ default='Your password must contain between {min} and {max} characters.'
values={{
- min: (this.state.passwordMinimumLength || Constants.MIN_PASSWORD_LENGTH)
+ min: (this.state.passwordMinimumLength || Constants.MIN_PASSWORD_LENGTH),
+ max: Constants.MAX_PASSWORD_LENGTH
}}
/>
);
@@ -115,9 +116,10 @@ export default class PasswordSettings extends AdminSettings {
return (
<FormattedMessage
id={sampleErrorMsgId}
- default='Your password must be at least {min} characters.'
+ default='Your password must contain between {min} and {max} characters.'
values={{
- min: (minLength || Constants.MIN_PASSWORD_LENGTH)
+ min: (minLength || Constants.MIN_PASSWORD_LENGTH),
+ max: Constants.MAX_PASSWORD_LENGTH
}}
/>
);