diff options
| author | lfbrock <lfbrock@users.noreply.github.com> | 2016-07-28 13:37:32 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-28 13:37:32 -0400 |
| commit | 5a1ce3695dfcd2146271c9bad83d18a2abb5106b (patch) | |
| tree | 91ff5208574475ee794e07f962c1d387b4dc833b /webapp | |
| parent | a88ff1b64d4238e2a94b885cd0a6feed35a5c9b5 (diff) | |
| download | chat-5a1ce3695dfcd2146271c9bad83d18a2abb5106b.tar.gz chat-5a1ce3695dfcd2146271c9bad83d18a2abb5106b.tar.bz2 chat-5a1ce3695dfcd2146271c9bad83d18a2abb5106b.zip | |
Update LDAP help text (#3695)
* Update ldap-settings.jsx
* Update en.json
* Update ldap_settings.jsx
* Update en.json
Diffstat (limited to 'webapp')
| -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 ccb33a493..b2283f337 100644 --- a/webapp/components/admin_console/ldap_settings.jsx +++ b/webapp/components/admin_console/ldap_settings.jsx @@ -349,7 +349,7 @@ export default class LdapSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.ldap.syncIntervalHelpText' - defaultMessage='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.' + defaultMessage='LDAP Synchronization updates Mattermost user information to reflect updates on the LDAP server. For example, when a user’s name changes on the LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the LDAP server have their Mattermost accounts set to “Inactive” and have their account sessions revoked. Mattermost performs synchronization on the interval entered. For example, if 60 is entered, Mattermost synchronizes every 60 minutes.' /> } value={this.state.syncIntervalMinutes} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 1b13a1c59..5a53cefcd 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -363,7 +363,7 @@ "admin.ldap.skipCertificateVerification": "Skip Certificate Verification", "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.", "admin.ldap.syncFailure": "Sync Failure: {error}", - "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.syncIntervalHelpText": "LDAP Synchronization updates Mattermost user information to reflect updates on the LDAP server. For example, when a user’s name changes on the LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the LDAP server have their Mattermost accounts set to “Inactive” and have their account sessions revoked. Mattermost performs synchronization on the interval entered. For example, if 60 is entered, Mattermost synchronizes every 60 minutes.", "admin.ldap.syncIntervalTitle": "Synchronization Interval (minutes)", "admin.ldap.syncNowHelpText": "Initiates an LDAP synchronization immediately.", "admin.ldap.sync_button": "LDAP Synchronize Now", |