diff options
| author | lfbrock <lfbrock@users.noreply.github.com> | 2016-07-06 13:35:35 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-07-06 13:35:35 -0400 |
| commit | fd880ad047d7bb199115c2000a85c0e0ec3aedfa (patch) | |
| tree | d0d5f37f66f8a1471be25141a1b7f76b8d42b390 | |
| parent | 292705acdf6a86df4b2089e7f9dafb2e05c5f836 (diff) | |
| download | chat-fd880ad047d7bb199115c2000a85c0e0ec3aedfa.tar.gz chat-fd880ad047d7bb199115c2000a85c0e0ec3aedfa.tar.bz2 chat-fd880ad047d7bb199115c2000a85c0e0ec3aedfa.zip | |
Update ldap_settings.jsx (#3508)
* Update ldap_settings.jsx
Changed help text for consistency
* Update en.json
| -rw-r--r-- | webapp/components/admin_console/ldap_settings.jsx | 2 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx index 5bb6bb20a..dd7ceb07e 100644 --- a/webapp/components/admin_console/ldap_settings.jsx +++ b/webapp/components/admin_console/ldap_settings.jsx @@ -213,7 +213,7 @@ export default class LdapSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.ldap.userFilterDisc' - defaultMessage='Optionally enter an 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))).' + defaultMessage='(Optional) Enter an 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))).' /> } value={this.state.userFilter} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 464b321c7..b305e25bc 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -355,7 +355,7 @@ "admin.ldap.syncIntervalHelpText": "LDAP Synchronization is the process by which Mattermost updates its users to reflect any updated data on the LDAP server. For example if a name for a user is updated on the LDAP server, the change will be reflected in Mattermost when the synchronization is performed. Accounts that have been removed from the LDAP server will have their active sessions cleared and no longer be able to login to Mattermost. Mattermost will perform this synchronization regularly according to the interval supplied here. For example, if 60 is supplied, Mattermost will update the users every hour.", "admin.ldap.syncIntervalTitle": "Synchronization Interval (minutes)", "admin.ldap.uernameAttrDesc": "The attribute in the 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": "Optionally enter an 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.userFilterDisc": "(Optional) Enter an 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)\"", "admin.ldap.userFilterTitle": "User Filter:", "admin.ldap.usernameAttrEx": "Ex \"sAMAccountName\"", |