IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-56631] Clarify that LDAP profile picture setting is optional (#26014)

Browse Source
This commit is contained in:
Ben Schumacher 2024-01-26 12:08:25 +01:00 committed by GitHub
parent a88978bbc1
commit 223c9c7426
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/channels/src/components/admin_console/admin_definition.tsx
View File

@ -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(

2
webapp/channels/src/i18n/en.json
View File

@ -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.",