diff options
| author | enahum <nahumhbl@gmail.com> | 2016-04-17 21:32:20 -0300 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-04-17 17:32:20 -0700 |
| commit | 74e5161a4cb581c770fa03bc2538dc7f2319bc2e (patch) | |
| tree | d0d7b65f5001526bd1bb7f42f38c99f7735f4f00 | |
| parent | c6c3f1e47829bba9b332da3d4c61193532e87032 (diff) | |
| download | chat-74e5161a4cb581c770fa03bc2538dc7f2319bc2e.tar.gz chat-74e5161a4cb581c770fa03bc2538dc7f2319bc2e.tar.bz2 chat-74e5161a4cb581c770fa03bc2538dc7f2319bc2e.zip | |
PLT-2593: Fix logs being stored with user locale (#2722)
| -rw-r--r-- | api/context.go | 2 | ||||
| -rw-r--r-- | model/utils.go | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/api/context.go b/api/context.go index ddc8f79b1..56c8c86d2 100644 --- a/api/context.go +++ b/api/context.go @@ -267,7 +267,7 @@ func (c *Context) LogAuditWithUserId(userId, extraInfo string) { func (c *Context) LogError(err *model.AppError) { l4g.Error(utils.T("api.context.log.error"), c.Path, err.Where, err.StatusCode, - c.RequestId, c.Session.UserId, c.IpAddress, err.Message, err.DetailedError) + c.RequestId, c.Session.UserId, c.IpAddress, err.SystemMessage(utils.T), err.DetailedError) } func (c *Context) UserRequired() { diff --git a/model/utils.go b/model/utils.go index 1ce41bb30..bb02f345d 100644 --- a/model/utils.go +++ b/model/utils.go @@ -50,6 +50,14 @@ func (er *AppError) Translate(T goi18n.TranslateFunc) { } } +func (er *AppError) SystemMessage(T goi18n.TranslateFunc) string { + if er.params == nil { + return T(er.Id) + } else { + return T(er.Id, er.params) + } +} + func (er *AppError) ToJson() string { b, err := json.Marshal(er) if err != nil { |