summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorlfbrock <lfbrock@users.noreply.github.com>2016-09-30 06:15:07 -0700
committerJoram Wilander <jwawilander@gmail.com>2016-09-30 09:15:07 -0400
commita2516743f3f3be6be73b612ff4b0374011a80e87 (patch)
tree1a0ea939b3f791ad77917c0f9401755e7c70a228 /webapp
parent13bd14d626f7bb2a347d3acdf456f945f1a6258e (diff)
downloadchat-a2516743f3f3be6be73b612ff4b0374011a80e87.tar.gz
chat-a2516743f3f3be6be73b612ff4b0374011a80e87.tar.bz2
chat-a2516743f3f3be6be73b612ff4b0374011a80e87.zip
Update LDAP help text (#4124)
* Update ldap_settings.jsx * Update en.json
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/ldap_settings.jsx6
-rw-r--r--webapp/i18n/en.json6
2 files changed, 6 insertions, 6 deletions
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx
index ce0088bb7..2664a6df0 100644
--- a/webapp/components/admin_console/ldap_settings.jsx
+++ b/webapp/components/admin_console/ldap_settings.jsx
@@ -254,7 +254,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.firstnameAttrDesc'
- defaultMessage='(Optional) The attribute in the AD/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. When set, users will not be able to edit their first name, since it is synchronized with the LDAP server. When left blank, users can set their own first name in Account Settings.'
/>
}
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 AD/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. When set, users will not be able to edit their last name, since it is synchronized with the LDAP server. When left blank, users can set their own last name in Account Settings.'
/>
}
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 AD/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. When set, users will not be able to edit their nickname, since it is synchronized with the LDAP server. When left blank, users can set their own nickname in Account Settings.'
/>
}
value={this.state.nicknameAttribute}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 6607677fe..73580b67c 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -405,13 +405,13 @@
"admin.ldap.emailAttrTitle": "Email Attribute:",
"admin.ldap.enableDesc": "When true, Mattermost allows login using AD/LDAP",
"admin.ldap.enableTitle": "Enable sign-in with AD/LDAP:",
- "admin.ldap.firstnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the first name of users in Mattermost.",
+ "admin.ldap.firstnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the first name of users in Mattermost. When set, users will not be able to edit their first name, since it is synchronized with the LDAP server. When left blank, users can set their own first name in Account Settings.",
"admin.ldap.firstnameAttrEx": "Ex \"givenName\"",
"admin.ldap.firstnameAttrTitle": "First Name Attribute",
"admin.ldap.idAttrDesc": "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.",
"admin.ldap.idAttrEx": "Ex \"sAMAccountName\"",
"admin.ldap.idAttrTitle": "ID Attribute: ",
- "admin.ldap.lastnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the last name of users in Mattermost.",
+ "admin.ldap.lastnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the last name of users in Mattermost. When set, users will not be able to edit their last name, since it is synchronized with the LDAP server. When left blank, users can set their own last name in Account Settings.",
"admin.ldap.lastnameAttrEx": "Ex \"sn\"",
"admin.ldap.lastnameAttrTitle": "Last Name Attribute:",
"admin.ldap.ldap_test_button": "AD/LDAP Test",
@@ -421,7 +421,7 @@
"admin.ldap.maxPageSizeEx": "Ex \"2000\"",
"admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the AD/LDAP server at one time. 0 is unlimited.",
"admin.ldap.maxPageSizeTitle": "Maximum Page Size:",
- "admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the nickname of users in Mattermost.",
+ "admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the nickname of users in Mattermost. When set, users will not be able to edit their nickname, since it is synchronized with the LDAP server. When left blank, users can set their own nickname in Account Settings.",
"admin.ldap.nicknameAttrEx": "Ex \"nickname\"",
"admin.ldap.nicknameAttrTitle": "Nickname Attribute:",
"admin.ldap.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>AD/LDAP is an enterprise feature. Your current license does not support AD/LDAP. Click <a href=\"http://mattermost.com\" target=\"_blank\">here</a> for information and pricing on enterprise licenses.</p>",