From 223c9c74266af20f44bb75b17ed96d6ca6e3b612 Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Fri, 26 Jan 2024 12:08:25 +0100 Subject: [PATCH] [MM-56631] Clarify that LDAP profile picture setting is optional (#26014) --- .../channels/src/components/admin_console/admin_definition.tsx | 2 +- webapp/channels/src/i18n/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/channels/src/components/admin_console/admin_definition.tsx b/webapp/channels/src/components/admin_console/admin_definition.tsx index 81a46e67b2..8fe106e8a5 100644 --- a/webapp/channels/src/components/admin_console/admin_definition.tsx +++ b/webapp/channels/src/components/admin_console/admin_definition.tsx @@ -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( diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json index 6b4ea3d6c9..56b5a84b58 100644 --- a/webapp/channels/src/i18n/en.json +++ b/webapp/channels/src/i18n/en.json @@ -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 Profile > Profile Settings.", "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.",