From 9e600fcdccabfc55b85c026eda5eedab5bc91152 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Wed, 28 Jun 2017 20:05:34 -0700 Subject: PLT-3901 fixing push notificaiton with images message (#6783) --- app/notification.go | 6 +++++- i18n/en.json | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/notification.go b/app/notification.go index 2b9c9bcff..d2eb44b3a 100644 --- a/app/notification.go +++ b/app/notification.go @@ -515,7 +515,11 @@ func sendPushNotification(post *model.Post, user *model.User, channel *model.Cha // If the post only has images then push an appropriate message if len(post.Message) == 0 && post.FileIds != nil && len(post.FileIds) > 0 { - msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_image_only") + channelName + if channel.Type == model.CHANNEL_DIRECT { + msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_image_only_dm") + } else { + msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_image_only") + channelName + } } l4g.Debug("Sending push notification for user %v with msg of '%v'", user.Id, msg.Message) diff --git a/i18n/en.json b/i18n/en.json index 9db609422..38273bfe4 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1645,7 +1645,11 @@ }, { "id": "api.post.send_notifications_and_forget.push_image_only", - "translation": " Uploaded one or more files " + "translation": " Uploaded one or more files in " + }, + { + "id": "api.post.send_notifications_and_forget.push_image_only_dm", + "translation": " Uploaded one or more files in a direct message" }, { "id": "api.post.send_notifications_and_forget.push_in", -- cgit v1.2.3-1-g7c22