diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-01-21 14:15:44 -0600 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-01-21 14:15:44 -0600 |
| commit | 221985435966dbf583d3e367c243822e338b6bc4 (patch) | |
| tree | 140d0b1318df0d5b11ef21eacf7cfa7545498585 /api | |
| parent | 8cc45a2e08c3eaaa66619cc7ee9dfc7ff49b388f (diff) | |
| download | chat-221985435966dbf583d3e367c243822e338b6bc4.tar.gz chat-221985435966dbf583d3e367c243822e338b6bc4.tar.bz2 chat-221985435966dbf583d3e367c243822e338b6bc4.zip | |
PLT-7 client side infra
Diffstat (limited to 'api')
| -rw-r--r-- | api/context.go | 3 | ||||
| -rw-r--r-- | api/post.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/api/context.go b/api/context.go index 5880842b6..f47ed1c30 100644 --- a/api/context.go +++ b/api/context.go @@ -31,6 +31,7 @@ type Context struct { siteURL string SessionTokenIndex int64 T goi18n.TranslateFunc + Locale string } type Page struct { @@ -87,7 +88,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { l4g.Debug("%v", r.URL.Path) c := &Context{} - c.T = utils.GetTranslations(w, r) + c.T, c.Locale = utils.GetTranslationsAndLocale(w, r) c.RequestId = model.NewId() c.IpAddress = GetIpAddress(r) diff --git a/api/post.go b/api/post.go index 42c3c304d..ecdb0925a 100644 --- a/api/post.go +++ b/api/post.go @@ -392,7 +392,7 @@ func handleWebhookEventsAndForget(c *Context, post *model.Post, team *model.Team // copy the context and create a mock session for posting the message mockSession := model.Session{UserId: hook.CreatorId, TeamId: hook.TeamId, IsOAuth: false} - newContext := &Context{mockSession, model.NewId(), "", c.Path, nil, c.teamURLValid, c.teamURL, c.siteURL, 0, c.T} + newContext := &Context{mockSession, model.NewId(), "", c.Path, nil, c.teamURLValid, c.teamURL, c.siteURL, 0, c.T, c.Locale} if text, ok := respProps["text"]; ok { if _, err := CreateWebhookPost(newContext, post.ChannelId, text, respProps["username"], respProps["icon_url"], post.Props, post.Type); err != nil { |