summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorJason Blais <jason@spinpunch.com>2016-09-08 08:48:12 -0400
committerenahum <nahumhbl@gmail.com>2016-09-08 09:48:12 -0300
commitb6ed10a31ecf16f7a0cf594db6b5a10e983e2db9 (patch)
tree08b289a5241827df4c6eebf7c23d1e2f2de4d218 /webapp/components
parentba2e131804cb28c9ae133aaafe24187243f6e2f3 (diff)
downloadchat-b6ed10a31ecf16f7a0cf594db6b5a10e983e2db9.tar.gz
chat-b6ed10a31ecf16f7a0cf594db6b5a10e983e2db9.tar.bz2
chat-b6ed10a31ecf16f7a0cf594db6b5a10e983e2db9.zip
PLT-3766 Change remaining LDAP references to AD/LDAP (#3985)
* Update user.go * Update en.json * Update ldap_test_button.jsx * Update en.json
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/admin_console/ldap_test_button.jsx8
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/admin_console/ldap_test_button.jsx b/webapp/components/admin_console/ldap_test_button.jsx
index 082c13b1b..16a433c23 100644
--- a/webapp/components/admin_console/ldap_test_button.jsx
+++ b/webapp/components/admin_console/ldap_test_button.jsx
@@ -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'
/>
);
}