summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/email_authentication_settings.jsx
diff options
context:
space:
mode:
authorJason Blais <jason@spinpunch.com>2017-07-19 16:54:50 -0400
committerChristopher Speller <crspeller@gmail.com>2017-07-19 13:54:50 -0700
commitecb82dbd1286f0cc722c082eada862b35fe92105 (patch)
treee83667786ae6b60d007a0081364cadb01d401e86 /webapp/components/admin_console/email_authentication_settings.jsx
parent673f3a1144884373540030a8f5cca3bad3d00b63 (diff)
downloadchat-ecb82dbd1286f0cc722c082eada862b35fe92105.tar.gz
chat-ecb82dbd1286f0cc722c082eada862b35fe92105.tar.bz2
chat-ecb82dbd1286f0cc722c082eada862b35fe92105.zip
PLT-6958: Update Email Auth System Console settings texts (#6948)
* Update email_authentication_settings.jsx * Update en.json
Diffstat (limited to 'webapp/components/admin_console/email_authentication_settings.jsx')
-rw-r--r--webapp/components/admin_console/email_authentication_settings.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/admin_console/email_authentication_settings.jsx b/webapp/components/admin_console/email_authentication_settings.jsx
index 6c25c15c5..9cc3ab3d7 100644
--- a/webapp/components/admin_console/email_authentication_settings.jsx
+++ b/webapp/components/admin_console/email_authentication_settings.jsx
@@ -37,7 +37,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
return (
<FormattedMessage
id='admin.authentication.email'
- defaultMessage='Email'
+ defaultMessage='Email Authentication'
/>
);
}
@@ -56,7 +56,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.email.allowSignupDescription'
- defaultMessage='When true, Mattermost allows team creation and account signup using email and password. This value should be false only when you want to limit signup to a single sign-on service like OAuth or AD/LDAP.'
+ defaultMessage='When true, Mattermost allows account creation using email and password. This value should be false only when you want to limit sign up to a single sign-on service like AD/LDAP, SAML or GitLab.'
/>
}
value={this.state.enableSignUpWithEmail}
@@ -90,7 +90,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.email.allowUsernameSignInDescription'
- defaultMessage='When true, Mattermost allows users to sign in using their username and password. This setting is typically only used when email verification is disabled.'
+ defaultMessage='When true, users with email login can sign in using their username and password. This setting does not affect AD/LDAP login.'
/>
}
value={this.state.enableSignInWithUsername}