summaryrefslogtreecommitdiffstats
path: root/webapp/actions/notification_actions.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-04-17 15:08:56 -0400
committerChristopher Speller <crspeller@gmail.com>2017-04-17 15:08:56 -0400
commit92d8fa4aa8af170d0018baed94a8787d06297e44 (patch)
treedc5000a3584952c797c03bf4331282a5e1536848 /webapp/actions/notification_actions.jsx
parent742bab6429aeb1b581275da3c06af99fe293baab (diff)
parent30974533941e73f102505d07badf538cfdbbf3fc (diff)
downloadchat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.gz
chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.bz2
chat-92d8fa4aa8af170d0018baed94a8787d06297e44.zip
Merge branch 'release-3.8'
Diffstat (limited to 'webapp/actions/notification_actions.jsx')
-rw-r--r--webapp/actions/notification_actions.jsx6
1 files changed, 5 insertions, 1 deletions
diff --git a/webapp/actions/notification_actions.jsx b/webapp/actions/notification_actions.jsx
index ecf301ed8..82a68c452 100644
--- a/webapp/actions/notification_actions.jsx
+++ b/webapp/actions/notification_actions.jsx
@@ -66,7 +66,11 @@ export function sendDesktopNotification(post, msgProps) {
}
if (title === '') {
- title = msgProps.channel_display_name;
+ if (msgProps.channel_type === Constants.DM_CHANNEL) {
+ title = Utils.localizeMessage('notification.dm', 'Direct Message');
+ } else {
+ title = msgProps.channel_display_name;
+ }
}
let notifyText = post.message.replace(/\n+/g, ' ');