From fdbfb9a4ed722bfe138ecaf7c5b308191c13925f Mon Sep 17 00:00:00 2001 From: Chris Duarte Date: Fri, 24 Nov 2017 09:57:02 -0800 Subject: Replace Channel Name for Team in Email Notifications (#7839) * allow option to set channel name in email notification subject * Added TeamName to title when UseChannelInEmailNotifications=true --- app/notification.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/notification.go') diff --git a/app/notification.go b/app/notification.go index e647595bc..3b21e86c5 100644 --- a/app/notification.go +++ b/app/notification.go @@ -351,6 +351,8 @@ func (a *App) sendNotificationEmail(post *model.Post, user *model.User, channel var subjectText string if channel.Type == model.CHANNEL_DIRECT { subjectText = getDirectMessageNotificationEmailSubject(post, translateFunc, a.Config().TeamSettings.SiteName, senderName) + } else if *a.Config().EmailSettings.UseChannelInEmailNotifications { + subjectText = getNotificationEmailSubject(post, translateFunc, a.Config().TeamSettings.SiteName, team.DisplayName+" ("+channel.DisplayName+")") } else { subjectText = getNotificationEmailSubject(post, translateFunc, a.Config().TeamSettings.SiteName, team.DisplayName) } -- cgit v1.2.3-1-g7c22