Commit d119b816 authored by Jason Blais's avatar Jason Blais Committed by enahum
Browse files

PLT-3766 Change remaining LDAP references to AD/LDAP (#3985)

* Update user.go

* Update en.json

* Update ldap_test_button.jsx

* Update en.json
parent d1daced5
......@@ -71,7 +71,7 @@ export default class LdapTestButton extends React.Component {
<i className='fa fa-warning'/>
<FormattedMessage
id='admin.ldap.testFailure'
defaultMessage='LDAP Test Failure: {error}'
defaultMessage='AD/LDAP Test Failure: {error}'
values={{
error: this.state.fail
}}
......@@ -86,7 +86,7 @@ export default class LdapTestButton extends React.Component {
<i className='fa fa-success'/>
<FormattedMessage
id='admin.ldap.testSuccess'
defaultMessage='LDAP Test Successful'
defaultMessage='AD/LDAP Test Successful'
values={{
error: this.state.fail
}}
......@@ -99,7 +99,7 @@ export default class LdapTestButton extends React.Component {
let helpText = (
<FormattedHTMLMessage
id='admin.ldap.testHelpText'
defaultMessage='Tests if the Mattermost server can connect to the LDAP server specified. See log file for more detailed error messages.'
defaultMessage='Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.'
/>
);
......@@ -115,7 +115,7 @@ export default class LdapTestButton extends React.Component {
contents = (
<FormattedMessage
id='admin.ldap.ldap_test_button'
defaultMessage='LDAP Test'
defaultMessage='AD/LDAP Test'
/>
);
}
......
......@@ -417,7 +417,7 @@
"admin.ldap.loginNameEx": "Ex \"AD/LDAP Username\"",
"admin.ldap.loginNameTitle": "Login Field Name:",
"admin.ldap.maxPageSizeEx": "Ex \"2000\"",
"admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the LDAP server at one time. 0 is unlimited.",
"admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the AD/LDAP server at one time. 0 is unlimited.",
"admin.ldap.maxPageSizeTitle": "Maximum Page Size:",
"admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the nickname of users in Mattermost.",
"admin.ldap.nicknameAttrEx": "Ex \"nickname\"",
......@@ -440,7 +440,9 @@
"admin.ldap.syncNowHelpText": "Initiates an AD/LDAP synchronization immediately.",
"admin.ldap.sync_button": "AD/LDAP Synchronize Now",
"admin.ldap.testFailure": "AD/LDAP Test Failure: {error}",
"admin.ldap.testSuccess": "AD/LDAP Test Successful",
"admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.",
"admin.ldap.ldap_test_button": "AD/LDAP Test",
"admin.ldap.uernameAttrDesc": "The attribute in the AD/LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
"admin.ldap.userFilterDisc": "(Optional) Enter an AD/LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
"admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment