summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorElias Nahum <nahumhbl@gmail.com>2016-03-06 01:02:27 -0300
committerElias Nahum <nahumhbl@gmail.com>2016-03-06 01:02:27 -0300
commit93b8fdc9e4c1c8e074a46a7f96674e812adf36ec (patch)
tree12d98b2d7b8fc7e6251c4ee43a978ade37afeaab /api
parent81ccfca2bfc91779d7bf00dbccb6f932d285a87c (diff)
downloadchat-93b8fdc9e4c1c8e074a46a7f96674e812adf36ec.tar.gz
chat-93b8fdc9e4c1c8e074a46a7f96674e812adf36ec.tar.bz2
chat-93b8fdc9e4c1c8e074a46a7f96674e812adf36ec.zip
Fix for PLT-2218 & PLT-2222
- Also includes missing loc strings for frontend es.json - Sort web [locale].json by id
Diffstat (limited to 'api')
-rw-r--r--api/post.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/post.go b/api/post.go
index 9d3ba5ab1..e6560a8e8 100644
--- a/api/post.go
+++ b/api/post.go
@@ -604,12 +604,12 @@ func sendNotifications(c *Context, post *model.Post, team *model.Team, channel *
year := fmt.Sprintf("%d", tm.Year())
zone, _ := tm.Zone()
- subjectPage := NewServerTemplatePage("post_subject", c.Locale)
+ subjectPage := NewServerTemplatePage("post_subject", profileMap[id].Locale)
subjectPage.Props["Subject"] = userLocale("api.templates.post_subject",
map[string]interface{}{"SubjectText": subjectText, "TeamDisplayName": team.DisplayName,
"Month": month[:3], "Day": day, "Year": year})
- bodyPage := NewServerTemplatePage("post_body", c.Locale)
+ bodyPage := NewServerTemplatePage("post_body", profileMap[id].Locale)
bodyPage.Props["SiteURL"] = c.GetSiteURL()
bodyPage.Props["PostMessage"] = model.ClearMentionTags(post.Message)
bodyPage.Props["TeamLink"] = teamURL + "/channels/" + channel.Name