Skip to content

Commit

Permalink
MM-16232 Admin settings for id_loaded push notifications (mattermost#…
Browse files Browse the repository at this point in the history 
…4210)

* MM-16232 Admin settings for id_loaded push notifications

* Remove changes in package-lock.json

* Update help text
  • Loading branch information
@enahum
enahum authored Nov 19, 2019
1 parent 4144ddf commit e62bfd3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
13 changes: 9 additions & 4 deletions components/admin_console/admin_definition.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1851,23 +1851,28 @@ const AdminDefinition = {
label: t('admin.environment.notifications.pushContents.label'),
label_default: 'Push Notification Contents:',
help_text: t('admin.environment.notifications.pushContents.help'),
help_text_default: '**Send generic description with only sender name** - Includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.\n **Send generic description with sender and channel names** - Includes the name of the person who sent the message and the channel it was sent in, but not the message text.\n **Send full message snippet** - Includes a message excerpt in push notifications, which may contain confidential information sent in messages. If your Push Notification Service is outside your firewall, it is *highly recommended* this option only be used with an "https" protocol to encrypt the connection.',
help_text_default: '**Generic description with only sender name** - Includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.\n **Generic description with sender and channel names** - Includes the name of the person who sent the message and the channel it was sent in, but not the message contents.\n **Full message content sent in the notification payload** - Includes the message contents in the push notification payload that is relayed through Apple\'s Push Notification Service (APNS) or Google\'s Firebase Cloud Messaging (FCM). It is **highly recommended** this option only be used with an "https" protocol to encrypt the connection and protect confidential information sent in messages.\n**Full message content fetched from the server on receipt** - The notification payload relayed through APNS or FCM contains no message content, instead it contains a unique message ID used to fetch message content from the server when a push notification is received by a device. If the server cannot be reached, a generic notification will be displayed.',
help_text_markdown: true,
options: [
{
value: 'generic_no_channel',
display_name: t('admin.environment.notifications.pushContents.genericNoChannel'),
display_name_default: 'Send generic description with only sender name',
display_name_default: 'Generic description with only sender name',
},
{
value: 'generic',
display_name: t('admin.environment.notifications.pushContents.generic'),
display_name_default: 'Send generic description with sender and channel names',
display_name_default: 'Generic description with sender and channel names',
},
{
value: 'full',
display_name: t('admin.environment.notifications.pushContents.full'),
display_name_default: 'Send full message snippet',
display_name_default: 'Full message content sent in the notification payload',
},
{
value: 'id_loaded',
display_name: t('admin.environment.notifications.pushContents.id_loaded'),
display_name_default: 'Full message content fetched from the server on receipt',
},
],
},
Expand Down
9 changes: 5 additions & 4 deletions i18n/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,10 +455,11 @@
"admin.environment.notifications.notificationDisplay.help": "Display name on email account used when sending notification emails from Mattermost.",
"admin.environment.notifications.notificationDisplay.label": "Notification Display Name:",
"admin.environment.notifications.notificationDisplay.placeholder": "Ex: \"Mattermost Notification\", \"System\", \"No-Reply\"",
"admin.environment.notifications.pushContents.full": "Send full message snippet",
"admin.environment.notifications.pushContents.generic": "Send generic description with sender and channel names",
"admin.environment.notifications.pushContents.genericNoChannel": "Send generic description with only sender name",
"admin.environment.notifications.pushContents.help": "**Send generic description with only sender name** - Includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.\n **Send generic description with sender and channel names** - Includes the name of the person who sent the message and the channel it was sent in, but not the message text.\n **Send full message snippet** - Includes a message excerpt in push notifications, which may contain confidential information sent in messages. If your Push Notification Service is outside your firewall, it is *highly recommended* this option only be used with an \"https\" protocol to encrypt the connection.",
"admin.environment.notifications.pushContents.full": "Full message content sent in the notification payload",
"admin.environment.notifications.pushContents.generic": "Generic description with sender and channel names",
"admin.environment.notifications.pushContents.genericNoChannel": "Generic description with only sender name",
"admin.environment.notifications.pushContents.help": "**Generic description with only sender name** - Includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.\n **Generic description with sender and channel names** - Includes the name of the person who sent the message and the channel it was sent in, but not the message contents.\n **Full message content sent in the notification payload** - Includes the message contents in the push notification payload that is relayed through Apple's Push Notification Service (APNS) or Google's Firebase Cloud Messaging (FCM). It is **highly recommended** this option only be used with an \"https\" protocol to encrypt the connection and protect confidential information sent in messages.\n**Full message content fetched from the server on receipt** - The notification payload relayed through APNS or FCM contains no message content, instead it contains a unique message ID used to fetch message content from the server when a push notification is received by a device. If the server cannot be reached, a generic notification will be displayed.",
"admin.environment.notifications.pushContents.id_loaded": "Full message content fetched from the server on receipt",
"admin.environment.notifications.pushContents.label": "Push Notification Contents:",
"admin.environment.notifications.replyToAddress.help": "Email address used in the Reply-To header when sending notification emails from Mattermost.",
"admin.environment.notifications.replyToAddress.label": "Notification Reply-To Address:",
Expand Down

0 comments on commit e62bfd3

Please sign in to comment.