Adding LDAP test connection button. Reordering LDAP settings. (#3912)

1 files changed, 7 insertions, 4 deletions

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 4211ff13b..f8d2c580e 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -143,6 +143,7 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
+  "admin.authentication.ldap": "AD/LDAP",
   "admin.banner.heading": "Note:",
   "admin.cluster.enableDescription": "When true, Mattermost will run in High Availability mode. Please see <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> to learn more about configuring High Availability for Mattermost.",
   "admin.cluster.enableTitle": "Enable High Availability Mode:",
@@ -415,7 +416,7 @@
   "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.maxPageSizeTitle": "Maximum Page Size",
+  "admin.ldap.maxPageSizeTitle": "Maximum Page Size:",
   "admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the LDAP server that will be used to populate the nickname of users in Mattermost.",
   "admin.ldap.nicknameAttrEx": "Ex \"nickname\"",
   "admin.ldap.nicknameAttrTitle": "Nickname Attribute:",
@@ -429,11 +430,13 @@
   "admin.ldap.serverDesc": "The domain or IP address of LDAP server.",
   "admin.ldap.serverEx": "Ex \"10.0.0.23\"",
   "admin.ldap.serverTitle": "LDAP Server:",
-  "admin.ldap.skipCertificateVerification": "Skip Certificate Verification",
+  "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.testFailure": "LDAP Test Failure: {error}",
+  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the LDAP server specified. See log file for more detailed error messages.",
   "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.syncIntervalTitle": "Synchronization Interval (minutes):",
   "admin.ldap.syncNowHelpText": "Initiates an LDAP synchronization immediately.",
   "admin.ldap.sync_button": "LDAP Synchronize Now",
   "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.",
@@ -684,7 +687,7 @@
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.images": "Images",
   "admin.sidebar.integrations": "Integrations",
-  "admin.sidebar.ldap": "LDAP",
+  "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Legal and Support",
   "admin.sidebar.license": "Edition and License",
   "admin.sidebar.localization": "Localization",