From 511e9272daa5bca863ac4db2712dea436419a6ba Mon Sep 17 00:00:00 2001 From: enahum Date: Sat, 4 Mar 2017 14:55:47 -0300 Subject: PLT-5701 Fix DM email subject text (#5630) --- app/notification.go | 2 +- i18n/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/notification.go b/app/notification.go index 0afe25882..3daaf64ce 100644 --- a/app/notification.go +++ b/app/notification.go @@ -393,7 +393,7 @@ func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Ch senderDisplayName := senderName mailTemplate = "api.templates.post_subject_in_direct_message" - mailParameters = map[string]interface{}{"SubjectText": subjectText, "TeamDisplayName": team.DisplayName, + mailParameters = map[string]interface{}{"SubjectText": subjectText, "SenderDisplayName": senderDisplayName, "Month": month, "Day": day, "Year": year} } else if channel.Type == model.CHANNEL_GROUP { bodyText = userLocale("api.post.send_notifications_and_forget.mention_body") diff --git a/i18n/en.json b/i18n/en.json index 677a5c289..156d6d8b2 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2161,7 +2161,7 @@ }, { "id": "api.templates.post_subject_in_direct_message", - "translation": "{{.SubjectText}} in {{.TeamDisplayName}} from {{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}" + "translation": "{{.SubjectText}} from {{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}" }, { "id": "api.templates.channel_name.group", -- cgit v1.2.3-1-g7c22