IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-5701 Fix DM email subject text (#5630)

Browse Source
This commit is contained in:
enahum
2017-03-04 14:55:47 -03:00
committed by George Goldberg
parent 4fd6b909af
commit 511e9272da
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/notification.go
View File

@@ -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")

2
i18n/en.json
View File

@@ -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",