diff options
author | Elias Nahum <nahumhbl@gmail.com> | 2016-09-08 10:27:49 -0300 |
---|---|---|
committer | Elias Nahum <nahumhbl@gmail.com> | 2016-09-08 10:27:49 -0300 |
commit | eb8373aa80905fc57173da03ed5b2bd972c83d53 (patch) | |
tree | d543342c710b633fe75313ece472314202e7bc44 /webapp/components/admin_console/ldap_test_button.jsx | |
parent | a5ebbcfdb4f151de204b6be276c5f07175ceb82a (diff) | |
parent | b2b2d141a9c4b423e6920930b726becd1e46436c (diff) | |
download | chat-eb8373aa80905fc57173da03ed5b2bd972c83d53.tar.gz chat-eb8373aa80905fc57173da03ed5b2bd972c83d53.tar.bz2 chat-eb8373aa80905fc57173da03ed5b2bd972c83d53.zip |
Merge branch 'release-3.4' RC4
Diffstat (limited to 'webapp/components/admin_console/ldap_test_button.jsx')
-rw-r--r-- | webapp/components/admin_console/ldap_test_button.jsx | 8 |
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' /> ); } |