Add localized timestamp support for email notification (#8674)
* Add localized timestamp support for email notification * Move localTime logic over to getFormattedPostTime
Этот коммит содержится в:
Chris Duarte
коммит произвёл
Jesse Hallam
Jesse Hallam
родитель
17f211c393
Коммит
62c64594cc
@@ -431,7 +431,13 @@ func (a *App) sendNotificationEmail(post *model.Post, user *model.User, channel
|
||||
// fall back to sending a single email if we can't batch it for some reason
|
||||
}
|
||||
|
||||
var useMilitaryTime bool
|
||||
translateFunc := utils.GetUserTranslations(user.Locale)
|
||||
if result := <-a.Srv.Store.Preference().Get(user.Id, model.PREFERENCE_CATEGORY_DISPLAY_SETTINGS, "use_military_time"); result.Err != nil {
|
||||
useMilitaryTime = true
|
||||
} else {
|
||||
useMilitaryTime = result.Data.(model.Preference).Value == "true"
|
||||
}
|
||||
|
||||
emailNotificationContentsType := model.EMAIL_NOTIFICATION_CONTENTS_FULL
|
||||
if license := a.License(); license != nil && *license.Features.EmailNotificationContents {
|
||||
@@ -440,17 +446,17 @@ 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)
|
||||
subjectText = getDirectMessageNotificationEmailSubject(user, post, translateFunc, a.Config().TeamSettings.SiteName, senderName, useMilitaryTime)
|
||||
} else if channel.Type == model.CHANNEL_GROUP {
|
||||
subjectText = getGroupMessageNotificationEmailSubject(post, translateFunc, a.Config().TeamSettings.SiteName, channelName, emailNotificationContentsType)
|
||||
subjectText = getGroupMessageNotificationEmailSubject(user, post, translateFunc, a.Config().TeamSettings.SiteName, channelName, emailNotificationContentsType, useMilitaryTime)
|
||||
} else if *a.Config().EmailSettings.UseChannelInEmailNotifications {
|
||||
subjectText = getNotificationEmailSubject(post, translateFunc, a.Config().TeamSettings.SiteName, team.DisplayName+" ("+channel.DisplayName+")")
|
||||
subjectText = getNotificationEmailSubject(user, post, translateFunc, a.Config().TeamSettings.SiteName, team.DisplayName+" ("+channel.DisplayName+")", useMilitaryTime)
|
||||
} else {
|
||||
subjectText = getNotificationEmailSubject(post, translateFunc, a.Config().TeamSettings.SiteName, team.DisplayName)
|
||||
subjectText = getNotificationEmailSubject(user, post, translateFunc, a.Config().TeamSettings.SiteName, team.DisplayName, useMilitaryTime)
|
||||
}
|
||||
|
||||
teamURL := a.GetSiteURL() + "/" + team.Name
|
||||
var bodyText = a.getNotificationEmailBody(user, post, channel, channelName, senderName, team.Name, teamURL, emailNotificationContentsType, translateFunc)
|
||||
var bodyText = a.getNotificationEmailBody(user, post, channel, channelName, senderName, team.Name, teamURL, emailNotificationContentsType, useMilitaryTime, translateFunc)
|
||||
|
||||
a.Go(func() {
|
||||
if err := a.SendMail(user.Email, html.UnescapeString(subjectText), bodyText); err != nil {
|
||||
@@ -468,8 +474,8 @@ func (a *App) sendNotificationEmail(post *model.Post, user *model.User, channel
|
||||
/**
|
||||
* Computes the subject line for direct notification email messages
|
||||
*/
|
||||
func getDirectMessageNotificationEmailSubject(post *model.Post, translateFunc i18n.TranslateFunc, siteName string, senderName string) string {
|
||||
t := getFormattedPostTime(post, translateFunc)
|
||||
func getDirectMessageNotificationEmailSubject(user *model.User, post *model.Post, translateFunc i18n.TranslateFunc, siteName string, senderName string, useMilitaryTime bool) string {
|
||||
t := getFormattedPostTime(user, post, useMilitaryTime, translateFunc)
|
||||
var subjectParameters = map[string]interface{}{
|
||||
"SiteName": siteName,
|
||||
"SenderDisplayName": senderName,
|
||||
@@ -483,8 +489,8 @@ func getDirectMessageNotificationEmailSubject(post *model.Post, translateFunc i1
|
||||
/**
|
||||
* Computes the subject line for group, public, and private email messages
|
||||
*/
|
||||
func getNotificationEmailSubject(post *model.Post, translateFunc i18n.TranslateFunc, siteName string, teamName string) string {
|
||||
t := getFormattedPostTime(post, translateFunc)
|
||||
func getNotificationEmailSubject(user *model.User, post *model.Post, translateFunc i18n.TranslateFunc, siteName string, teamName string, useMilitaryTime bool) string {
|
||||
t := getFormattedPostTime(user, post, useMilitaryTime, translateFunc)
|
||||
var subjectParameters = map[string]interface{}{
|
||||
"SiteName": siteName,
|
||||
"TeamName": teamName,
|
||||
@@ -498,8 +504,8 @@ func getNotificationEmailSubject(post *model.Post, translateFunc i18n.TranslateF
|
||||
/**
|
||||
* Computes the subject line for group email messages
|
||||
*/
|
||||
func getGroupMessageNotificationEmailSubject(post *model.Post, translateFunc i18n.TranslateFunc, siteName string, channelName string, emailNotificationContentsType string) string {
|
||||
t := getFormattedPostTime(post, translateFunc)
|
||||
func getGroupMessageNotificationEmailSubject(user *model.User, post *model.Post, translateFunc i18n.TranslateFunc, siteName string, channelName string, emailNotificationContentsType string, useMilitaryTime bool) string {
|
||||
t := getFormattedPostTime(user, post, useMilitaryTime, translateFunc)
|
||||
var subjectText string
|
||||
if emailNotificationContentsType == model.EMAIL_NOTIFICATION_CONTENTS_FULL {
|
||||
var subjectParameters = map[string]interface{}{
|
||||
@@ -525,7 +531,7 @@ func getGroupMessageNotificationEmailSubject(post *model.Post, translateFunc i18
|
||||
/**
|
||||
* Computes the email body for notification messages
|
||||
*/
|
||||
func (a *App) getNotificationEmailBody(recipient *model.User, post *model.Post, channel *model.Channel, channelName string, senderName string, teamName string, teamURL string, emailNotificationContentsType string, translateFunc i18n.TranslateFunc) string {
|
||||
func (a *App) getNotificationEmailBody(recipient *model.User, post *model.Post, channel *model.Channel, channelName string, senderName string, teamName string, teamURL string, emailNotificationContentsType string, useMilitaryTime bool, translateFunc i18n.TranslateFunc) string {
|
||||
// only include message contents in notification email if email notification contents type is set to full
|
||||
var bodyPage *utils.HTMLTemplate
|
||||
if emailNotificationContentsType == model.EMAIL_NOTIFICATION_CONTENTS_FULL {
|
||||
@@ -542,7 +548,7 @@ func (a *App) getNotificationEmailBody(recipient *model.User, post *model.Post,
|
||||
bodyPage.Props["TeamLink"] = teamURL
|
||||
}
|
||||
|
||||
t := getFormattedPostTime(post, translateFunc)
|
||||
t := getFormattedPostTime(recipient, post, useMilitaryTime, translateFunc)
|
||||
|
||||
var bodyText string
|
||||
var info template.HTML
|
||||
@@ -642,17 +648,34 @@ type formattedPostTime struct {
|
||||
TimeZone string
|
||||
}
|
||||
|
||||
func getFormattedPostTime(post *model.Post, translateFunc i18n.TranslateFunc) formattedPostTime {
|
||||
tm := time.Unix(post.CreateAt/1000, 0)
|
||||
zone, _ := tm.Zone()
|
||||
func getFormattedPostTime(user *model.User, post *model.Post, useMilitaryTime bool, translateFunc i18n.TranslateFunc) formattedPostTime {
|
||||
preferredTimezone := user.GetPreferredTimezone()
|
||||
postTime := time.Unix(post.CreateAt/1000, 0)
|
||||
zone, _ := postTime.Zone()
|
||||
|
||||
localTime := postTime
|
||||
if preferredTimezone != "" {
|
||||
loc, _ := time.LoadLocation(preferredTimezone)
|
||||
if loc != nil {
|
||||
localTime = postTime.In(loc)
|
||||
zone, _ = localTime.Zone()
|
||||
}
|
||||
}
|
||||
|
||||
hour := localTime.Format("15")
|
||||
period := ""
|
||||
if !useMilitaryTime {
|
||||
hour = localTime.Format("3")
|
||||
period = " " + localTime.Format("PM")
|
||||
}
|
||||
|
||||
return formattedPostTime{
|
||||
Time: tm,
|
||||
Year: fmt.Sprintf("%d", tm.Year()),
|
||||
Month: translateFunc(tm.Month().String()),
|
||||
Day: fmt.Sprintf("%d", tm.Day()),
|
||||
Hour: fmt.Sprintf("%02d", tm.Hour()),
|
||||
Minute: fmt.Sprintf("%02d", tm.Minute()),
|
||||
Time: localTime,
|
||||
Year: fmt.Sprintf("%d", localTime.Year()),
|
||||
Month: translateFunc(localTime.Month().String()),
|
||||
Day: fmt.Sprintf("%d", localTime.Day()),
|
||||
Hour: fmt.Sprintf("%s", hour),
|
||||
Minute: fmt.Sprintf("%02d"+period, localTime.Minute()),
|
||||
TimeZone: zone,
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user