summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r--webapp/components/user_settings/user_settings_general.jsx4
-rw-r--r--webapp/components/user_settings/user_settings_security.jsx8
2 files changed, 6 insertions, 6 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index abf94fa6b..e794c4d4b 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -466,7 +466,7 @@ class UserSettingsGeneralTab extends React.Component {
<div className='setting-list__hint'>
<FormattedMessage
id='user.settings.general.emailLdapCantUpdate'
- defaultMessage='Login occurs through LDAP. Email cannot be updated. Email address used for notifications is {email}.'
+ defaultMessage='Login occurs through AD/LDAP. Email cannot be updated. Email address used for notifications is {email}.'
values={{
email: this.state.email
}}
@@ -573,7 +573,7 @@ class UserSettingsGeneralTab extends React.Component {
describe = (
<FormattedMessage
id='user.settings.general.loginLdap'
- defaultMessage='Login done through LDAP ({email})'
+ defaultMessage='Login done through AD/LDAP ({email})'
values={{
email: this.state.email
}}
diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx
index 040c2bad3..5bc29e0df 100644
--- a/webapp/components/user_settings/user_settings_security.jsx
+++ b/webapp/components/user_settings/user_settings_security.jsx
@@ -450,7 +450,7 @@ export default class SecurityTab extends React.Component {
<div className='setting-list__hint'>
<FormattedMessage
id='user.settings.security.passwordLdapCantUpdate'
- defaultMessage='Login occurs through LDAP. Password cannot be updated.'
+ defaultMessage='Login occurs through AD/LDAP. Password cannot be updated.'
/>
</div>
</div>
@@ -522,7 +522,7 @@ export default class SecurityTab extends React.Component {
describe = (
<FormattedMessage
id='user.settings.security.loginLdap'
- defaultMessage='Login done through LDAP'
+ defaultMessage='Login done through AD/LDAP'
/>
);
}
@@ -618,7 +618,7 @@ export default class SecurityTab extends React.Component {
>
<FormattedMessage
id='user.settings.security.switchLdap'
- defaultMessage='Switch to using LDAP'
+ defaultMessage='Switch to using AD/LDAP'
/>
</Link>
<br/>
@@ -739,7 +739,7 @@ export default class SecurityTab extends React.Component {
describe = (
<FormattedMessage
id='user.settings.security.ldap'
- defaultMessage='LDAP'
+ defaultMessage='AD/LDAP'
/>
);
} else if (this.props.user.auth_service === Constants.SAML_SERVICE) {