Commit 1ef042c5 authored by Jason Blais's avatar Jason Blais Committed by enahum
Browse files

PLT-3766 Change LDAP references to AD/LDAP in the UI (#3925)

parent 30c037f0
......@@ -58,7 +58,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.email.allowSignupDescription'
defaultMessage='When true, Mattermost allows team creation and account signup using email and password. This value should be false only when you want to limit signup to a single-sign-on service like OAuth or LDAP.'
defaultMessage='When true, Mattermost allows team creation and account signup using email and password. This value should be false only when you want to limit signup to a single-sign-on service like OAuth or AD/LDAP.'
/>
}
value={this.state.enableSignUpWithEmail}
......
......@@ -96,13 +96,13 @@ export default class LdapSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.ldap.enableTitle'
defaultMessage='Enable sign-in with LDAP:'
defaultMessage='Enable sign-in with AD/LDAP:'
/>
}
helpText={
<FormattedMessage
id='admin.ldap.enableDesc'
defaultMessage='When true, Mattermost allows login using LDAP'
defaultMessage='When true, Mattermost allows login using AD/LDAP'
/>
}
value={this.state.enable}
......@@ -113,14 +113,14 @@ export default class LdapSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.ldap.serverTitle'
defaultMessage='LDAP Server:'
defaultMessage='AD/LDAP Server:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.serverEx', 'Ex "10.0.0.23"')}
helpText={
<FormattedMessage
id='admin.ldap.serverDesc'
defaultMessage='The domain or IP address of LDAP server.'
defaultMessage='The domain or IP address of AD/LDAP server.'
/>
}
value={this.state.ldapServer}
......@@ -132,14 +132,14 @@ export default class LdapSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.ldap.portTitle'
defaultMessage='LDAP Port:'
defaultMessage='AD/LDAP Port:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.portEx', 'Ex "389"')}
helpText={
<FormattedMessage
id='admin.ldap.portDesc'
defaultMessage='The port Mattermost will use to connect to the LDAP server. Default is 389.'
defaultMessage='The port Mattermost will use to connect to the AD/LDAP server. Default is 389.'
/>
}
value={this.state.ldapPort}
......@@ -180,7 +180,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.baseDesc'
defaultMessage='The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the LDAP tree.'
defaultMessage='The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the AD/LDAP tree.'
/>
}
value={this.state.baseDN}
......@@ -198,7 +198,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.bindUserDesc'
defaultMessage='The username used to perform the LDAP search. This should typically be an account created specifically for use with Mattermost. It should have access limited to read the portion of the LDAP tree specified in the BaseDN field.'
defaultMessage='The username used to perform the AD/LDAP search. This should typically be an account created specifically for use with Mattermost. It should have access limited to read the portion of the AD/LDAP tree specified in the BaseDN field.'
/>
}
value={this.state.bindUsername}
......@@ -235,7 +235,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.userFilterDisc'
defaultMessage='(Optional) Enter an LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).'
defaultMessage='(Optional) Enter an AD/LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).'
/>
}
value={this.state.userFilter}
......@@ -254,7 +254,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.firstnameAttrDesc'
defaultMessage='(Optional) The attribute in the LDAP server that will be used to populate the first name of users in Mattermost.'
defaultMessage='(Optional) The attribute in the AD/LDAP server that will be used to populate the first name of users in Mattermost.'
/>
}
value={this.state.firstNameAttribute}
......@@ -273,7 +273,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.lastnameAttrDesc'
defaultMessage='(Optional) The attribute in the LDAP server that will be used to populate the last name of users in Mattermost.'
defaultMessage='(Optional) The attribute in the AD/LDAP server that will be used to populate the last name of users in Mattermost.'
/>
}
value={this.state.lastNameAttribute}
......@@ -292,7 +292,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.nicknameAttrDesc'
defaultMessage='(Optional) The attribute in the LDAP server that will be used to populate the nickname of users in Mattermost.'
defaultMessage='(Optional) The attribute in the AD/LDAP server that will be used to populate the nickname of users in Mattermost.'
/>
}
value={this.state.nicknameAttribute}
......@@ -311,7 +311,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.emailAttrDesc'
defaultMessage='The attribute in the LDAP server that will be used to populate the email addresses of users in Mattermost.'
defaultMessage='The attribute in the AD/LDAP server that will be used to populate the email addresses of users in Mattermost.'
/>
}
value={this.state.emailAttribute}
......@@ -330,7 +330,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.uernameAttrDesc'
defaultMessage='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.'
defaultMessage='The attribute in the AD/LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.'
/>
}
value={this.state.usernameAttribute}
......@@ -349,7 +349,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.idAttrDesc'
defaultMessage='The attribute in the LDAP server that will be used as a unique identifier in Mattermost. It should be an LDAP attribute with a value that does not change, such as username or uid. If a user’s ID Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the "LDAP Username" field on the sign in page. Normally this attribute is the same as the “Username Attribute” field above. If your team typically uses domain\\username to sign in to other services with LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.'
defaultMessage='The attribute in the AD/LDAP server that will be used as a unique identifier in Mattermost. It should be an AD/LDAP attribute with a value that does not change, such as username or uid. If a user’s ID Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the "AD/LDAP Username" field on the sign in page. Normally this attribute is the same as the “Username Attribute” field above. If your team typically uses domain\\username to sign in to other services with AD/LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.'
/>
}
value={this.state.idAttribute}
......@@ -364,11 +364,11 @@ export default class LdapSettings extends AdminSettings {
defaultMessage='Sign-in Field Default Text:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.loginNameEx', 'Ex "LDAP Username"')}
placeholder={Utils.localizeMessage('admin.ldap.loginNameEx', 'Ex "AD/LDAP Username"')}
helpText={
<FormattedMessage
id='admin.ldap.loginNameDesc'
defaultMessage='The placeholder text that appears in the login field on the login page. Defaults to "LDAP Username".'
defaultMessage='The placeholder text that appears in the login field on the login page. Defaults to "AD/LDAP Username".'
/>
}
value={this.state.loginFieldName}
......@@ -386,7 +386,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.syncIntervalHelpText'
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.'
defaultMessage='AD/LDAP Synchronization updates Mattermost user information to reflect updates on the AD/LDAP server. For example, when a user’s name changes on the AD/LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the AD/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}
......@@ -405,7 +405,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.maxPageSizeHelpText'
defaultMessage='The maximum number of users the Mattermost server will request from the LDAP server at one time. 0 is unlimited.'
defaultMessage='The maximum number of users the Mattermost server will request from the AD/LDAP server at one time. 0 is unlimited.'
/>
}
value={this.state.maxPageSize}
......@@ -424,7 +424,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.queryDesc'
defaultMessage='The timeout value for queries to the LDAP server. Increase if you are getting timeout errors caused by a slow LDAP server.'
defaultMessage='The timeout value for queries to the AD/LDAP server. Increase if you are getting timeout errors caused by a slow AD/LDAP server.'
/>
}
value={this.state.queryTimeout}
......
......@@ -56,7 +56,7 @@ export default class SessionSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.service.webSessionDays'
defaultMessage='Session length LDAP and email (days):'
defaultMessage='Session length AD/LDAP and email (days):'
/>
}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
......
......@@ -68,7 +68,7 @@ export default class SyncNowButton extends React.Component {
let helpText = (
<FormattedHTMLMessage
id='admin.ldap.syncNowHelpText'
defaultMessage='Initiates an LDAP synchronization immediately.'
defaultMessage='Initiates an AD/LDAP synchronization immediately.'
/>
);
......@@ -84,7 +84,7 @@ export default class SyncNowButton extends React.Component {
contents = (
<FormattedMessage
id='admin.ldap.sync_button'
defaultMessage='LDAP Synchronize Now'
defaultMessage='AD/LDAP Synchronize Now'
/>
);
}
......
......@@ -39,14 +39,14 @@ export default class EmailToLDAP extends React.Component {
const ldapId = ReactDOM.findDOMNode(this.refs.ldapid).value.trim();
if (!ldapId) {
state.ldapError = Utils.localizeMessage('claim.email_to_ldap.ldapIdError', 'Please enter your LDAP ID.');
state.ldapError = Utils.localizeMessage('claim.email_to_ldap.ldapIdError', 'Please enter your AD/LDAP ID.');
this.setState(state);
return;
}
const ldapPassword = ReactDOM.findDOMNode(this.refs.ldappassword).value;
if (!ldapPassword) {
state.ldapPasswordError = Utils.localizeMessage('claim.email_to_ldap.ldapPasswordError', 'Please enter your LDAP password.');
state.ldapPasswordError = Utils.localizeMessage('claim.email_to_ldap.ldapPasswordError', 'Please enter your AD/LDAP password.');
this.setState(state);
return;
}
......@@ -101,14 +101,14 @@ export default class EmailToLDAP extends React.Component {
if (global.window.mm_config.LdapLoginFieldName) {
loginPlaceholder = global.window.mm_config.LdapLoginFieldName;
} else {
loginPlaceholder = Utils.localizeMessage('claim.email_to_ldap.ldapId', 'LDAP ID');
loginPlaceholder = Utils.localizeMessage('claim.email_to_ldap.ldapId', 'AD/LDAP ID');
}
let passwordPlaceholder;
if (global.window.mm_config.LdapPasswordFieldName) {
passwordPlaceholder = global.window.mm_config.LdapPasswordFieldName;
} else {
passwordPlaceholder = Utils.localizeMessage('claim.email_to_ldap.ldapPwd', 'LDAP Password');
passwordPlaceholder = Utils.localizeMessage('claim.email_to_ldap.ldapPwd', 'AD/LDAP Password');
}
return (
......@@ -116,7 +116,7 @@ export default class EmailToLDAP extends React.Component {
<h3>
<FormattedMessage
id='claim.email_to_ldap.title'
defaultMessage='Switch Email/Password Account to LDAP'
defaultMessage='Switch Email/Password Account to AD/LDAP'
/>
</h3>
<form
......@@ -126,13 +126,13 @@ export default class EmailToLDAP extends React.Component {
<p>
<FormattedMessage
id='claim.email_to_ldap.ssoType'
defaultMessage='Upon claiming your account, you will only be able to login with LDAP'
defaultMessage='Upon claiming your account, you will only be able to login with AD/LDAP'
/>
</p>
<p>
<FormattedMessage
id='claim.email_to_ldap.ssoNote'
defaultMessage='You must already have a valid LDAP account'
defaultMessage='You must already have a valid AD/LDAP account'
/>
</p>
<p>
......@@ -164,7 +164,7 @@ export default class EmailToLDAP extends React.Component {
<p>
<FormattedMessage
id='claim.email_to_ldap.enterLdapPwd'
defaultMessage='Enter the ID and password for your LDAP account'
defaultMessage='Enter the ID and password for your AD/LDAP account'
/>
</p>
<div className={ldapClass}>
......@@ -197,7 +197,7 @@ export default class EmailToLDAP extends React.Component {
>
<FormattedMessage
id='claim.email_to_ldap.switchTo'
defaultMessage='Switch account to LDAP'
defaultMessage='Switch account to AD/LDAP'
/>
</button>
{serverError}
......
......@@ -34,7 +34,7 @@ export default class LDAPToEmail extends React.Component {
const ldapPassword = ReactDOM.findDOMNode(this.refs.ldappassword).value;
if (!ldapPassword) {
state.ldapPasswordError = Utils.localizeMessage('claim.ldap_to_email.ldapPasswordError', 'Please enter your LDAP password.');
state.ldapPasswordError = Utils.localizeMessage('claim.ldap_to_email.ldapPasswordError', 'Please enter your AD/LDAP password.');
this.setState(state);
return;
}
......@@ -105,7 +105,7 @@ export default class LDAPToEmail extends React.Component {
if (global.window.mm_config.LdapPasswordFieldName) {
passwordPlaceholder = global.window.mm_config.LdapPasswordFieldName;
} else {
passwordPlaceholder = Utils.localizeMessage('claim.ldap_to_email.ldapPwd', 'LDAP Password');
passwordPlaceholder = Utils.localizeMessage('claim.ldap_to_email.ldapPwd', 'AD/LDAP Password');
}
return (
......@@ -113,7 +113,7 @@ export default class LDAPToEmail extends React.Component {
<h3>
<FormattedMessage
id='claim.ldap_to_email.title'
defaultMessage='Switch LDAP Account to Email/Password'
defaultMessage='Switch AD/LDAP Account to Email/Password'
/>
</h3>
<form
......
......@@ -98,7 +98,7 @@ export default class LoginController extends React.Component {
<FormattedMessage
id={msgId}
values={{
ldapUsername: global.window.mm_config.LdapLoginFieldName || Utils.localizeMessage('login.ldapUsernameLower', 'LDAP username')
ldapUsername: global.window.mm_config.LdapLoginFieldName || Utils.localizeMessage('login.ldapUsernameLower', 'AD/LDAP username')
}}
/>
)
......@@ -261,7 +261,7 @@ export default class LoginController extends React.Component {
if (global.window.mm_config.LdapLoginFieldName) {
loginPlaceholders.push(global.window.mm_config.LdapLoginFieldName);
} else {
loginPlaceholders.push(Utils.localizeMessage('login.ldapUsername', 'LDAP Username'));
loginPlaceholders.push(Utils.localizeMessage('login.ldapUsername', 'AD/LDAP Username'));
}
}
......
......@@ -107,7 +107,7 @@ export default class SignupLdap extends React.Component {
if (global.window.mm_config.LdapLoginFieldName) {
ldapIdPlaceholder = global.window.mm_config.LdapLoginFieldName;
} else {
ldapIdPlaceholder = Utils.localizeMessage('login.ldap_username', 'LDAP Username');
ldapIdPlaceholder = Utils.localizeMessage('login.ldap_username', 'AD/LDAP Username');
}
let errorClass = '';
......@@ -123,7 +123,7 @@ export default class SignupLdap extends React.Component {
<strong>
<FormattedMessage
id='signup.ldap'
defaultMessage='LDAP Credentials'
defaultMessage='AD/LDAP Credentials'
/>
</strong>
</h5>
......
......@@ -212,7 +212,7 @@ export default class SignupController extends React.Component {
<span>
<FormattedMessage
id='signup.ldap'
defaultMessage='LDAP Credentials'
defaultMessage='AD/LDAP Credentials'
/>
</span>
</Link>
......
......@@ -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
}}
......
......@@ -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) {
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment