summaryrefslogtreecommitdiffstats
path: root/model/utils.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-01-25 09:07:35 -0500
committerCorey Hulen <corey@hulen.com>2016-01-25 09:07:35 -0500
commit93a4e85c2d183a48f84a269c38ad4b91e9c31c14 (patch)
tree9f7cf34b9c70e76524642cf20a3b6ad3c6f3c753 /model/utils.go
parent2a32bf20045a563c3656d89c9e70ab6d3c4505f0 (diff)
parentf33cff21cf41ed060783e1eaad6c1c4838216ed2 (diff)
downloadchat-93a4e85c2d183a48f84a269c38ad4b91e9c31c14.tar.gz
chat-93a4e85c2d183a48f84a269c38ad4b91e9c31c14.tar.bz2
chat-93a4e85c2d183a48f84a269c38ad4b91e9c31c14.zip
Merge pull request #1974 from ZBoxApp/PLT-7-models
PLT-7: Refactoring models to use translations (chunk 6)
Diffstat (limited to 'model/utils.go')
-rw-r--r--model/utils.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/model/utils.go b/model/utils.go
index a18ca760e..70b7e3bbd 100644
--- a/model/utils.go
+++ b/model/utils.go
@@ -67,7 +67,7 @@ func AppErrorFromJson(data io.Reader) *AppError {
if err == nil {
return &er
} else {
- return NewAppError("AppErrorFromJson", "could not decode", err.Error())
+ return NewLocAppError("AppErrorFromJson", "model.utils.decode_json.app_error", nil, err.Error())
}
}