IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-6958: Update Email Auth System Console settings texts (#6948)

Browse Source 
* Update email_authentication_settings.jsx

* Update en.json
This commit is contained in:
Jason Blais
2017-07-19 16:54:50 -04:00
committed by Christopher Speller
parent 673f3a1144
commit ecb82dbd12
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webapp/components/admin_console/email_authentication_settings.jsx
View File

@@ -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}