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

* Update email_authentication_settings.jsx

* Update en.json
Этот коммит содержится в:
Jason Blais
2017-07-19 16:54:50 -04:00
коммит произвёл Christopher Speller
родитель 673f3a1144
Коммит ecb82dbd12
2 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@@ -37,7 +37,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
return ( return (
<FormattedMessage <FormattedMessage
id='admin.authentication.email' id='admin.authentication.email'
defaultMessage='Email' defaultMessage='Email Authentication'
/> />
); );
} }
@@ -56,7 +56,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
helpText={ helpText={
<FormattedMessage <FormattedMessage
id='admin.email.allowSignupDescription' 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} value={this.state.enableSignUpWithEmail}
@@ -90,7 +90,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
helpText={ helpText={
<FormattedMessage <FormattedMessage
id='admin.email.allowUsernameSignInDescription' 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} value={this.state.enableSignInWithUsername}

Просмотреть файл

@@ -142,7 +142,7 @@
"admin.advance.metrics": "Performance Monitoring", "admin.advance.metrics": "Performance Monitoring",
"admin.audits.reload": "Reload User Activity Logs", "admin.audits.reload": "Reload User Activity Logs",
"admin.audits.title": "User Activity Logs", "admin.audits.title": "User Activity Logs",
"admin.authentication.email": "Email Auth", "admin.authentication.email": "Email Authentication",
"admin.authentication.gitlab": "GitLab", "admin.authentication.gitlab": "GitLab",
"admin.authentication.ldap": "AD/LDAP", "admin.authentication.ldap": "AD/LDAP",
"admin.authentication.oauth": "OAuth 2.0", "admin.authentication.oauth": "OAuth 2.0",
@@ -259,9 +259,9 @@
"admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>Terms of Service</a> and <a href=\"https://about.mattermost.com/hpns-privacy/\" target='_blank'>Privacy Policy</a>.", "admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>Terms of Service</a> and <a href=\"https://about.mattermost.com/hpns-privacy/\" target='_blank'>Privacy Policy</a>.",
"admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.", "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.",
"admin.email.allowEmailSignInTitle": "Enable sign-in with email: ", "admin.email.allowEmailSignInTitle": "Enable sign-in with email: ",
"admin.email.allowSignupDescription": "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.", "admin.email.allowSignupDescription": "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.",
"admin.email.allowSignupTitle": "Enable account creation with email: ", "admin.email.allowSignupTitle": "Enable account creation with email: ",
"admin.email.allowUsernameSignInDescription": "When true, Mattermost allows users to sign in using their username and password. This setting is typically only used when email verification is disabled.", "admin.email.allowUsernameSignInDescription": "When true, users with email login can sign in using their username and password. This setting does not affect AD/LDAP login.",
"admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ", "admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ",
"admin.email.connectionSecurityTest": "Test Connection", "admin.email.connectionSecurityTest": "Test Connection",
"admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target='_blank'>Enterprise App Store</a>.", "admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target='_blank'>Enterprise App Store</a>.",