Skip to content

Commit

Permalink
[MM-56631] Clarify that LDAP profile picture setting is optional (mat…
Browse files Browse the repository at this point in the history
  • Loading branch information
hanzei authored Jan 26, 2024
1 parent a88978b commit 223c9c7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3434,7 +3434,7 @@ const AdminDefinition: AdminDefinitionType = {
key: 'LdapSettings.PictureAttribute',
label: defineMessage({id: 'admin.ldap.pictureAttrTitle', defaultMessage: 'Profile Picture Attribute:'}),
placeholder: defineMessage({id: 'admin.ldap.pictureAttrEx', defaultMessage: 'E.g.: "thumbnailPhoto" or "jpegPhoto"'}),
help_text: defineMessage({id: 'admin.ldap.pictureAttrDesc', defaultMessage: 'The attribute in the AD/LDAP server used to populate the profile picture in Mattermost.'}),
help_text: defineMessage({id: 'admin.ldap.pictureAttrDesc', defaultMessage: '(Optional) The attribute in the AD/LDAP server used to populate the profile picture in Mattermost.'}),
isDisabled: it.any(
it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.AUTHENTICATION.LDAP)),
it.all(
Expand Down
2 changes: 1 addition & 1 deletion webapp/channels/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1312,7 +1312,7 @@
"admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the AD/LDAP server used to populate the nickname of users in Mattermost. When set, users cannot edit their nickname, since it is synchronized with the LDAP server. When left blank, users can set their nickname in <strong>Profile > Profile Settings</strong>.",
"admin.ldap.nicknameAttrEx": "E.g.: \"nickname\"",
"admin.ldap.nicknameAttrTitle": "Nickname Attribute:",
"admin.ldap.pictureAttrDesc": "The attribute in the AD/LDAP server used to populate the profile picture in Mattermost.",
"admin.ldap.pictureAttrDesc": "(Optional) The attribute in the AD/LDAP server used to populate the profile picture in Mattermost.",
"admin.ldap.pictureAttrEx": "E.g.: \"thumbnailPhoto\" or \"jpegPhoto\"",
"admin.ldap.pictureAttrTitle": "Profile Picture Attribute:",
"admin.ldap.portDesc": "The port Mattermost will use to connect to the AD/LDAP server. Default is 389.",
Expand Down

0 comments on commit 223c9c7

Please sign in to comment.