IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

tweaking

Browse Source
This commit is contained in:
=Corey Hulen
2016-01-20 14:53:12 -06:00
parent e70428c1bd
commit d74e2f3e11
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
model/utils.go
View File

@@ -25,9 +25,8 @@ type StringMap map[string]string
type StringArray []string
type EncryptStringMap map[string]string
// AppError is returned for any http response that's not in the 200 range.
type AppError struct {
LocId string `json:"loc_id"` // Message to be display to the end user without debugging information
Id string `json:"id"`
Message string `json:"message"` // Message to be display to the end user without debugging information
DetailedError string `json:"detailed_error"` // Internal error string to help the developer
RequestId string `json:"request_id"` // The RequestId that's also set in the header
@@ -44,9 +43,9 @@ func (er *AppError) Error() string {
func (er *AppError) Translate(T goi18n.TranslateFunc) {
if len(er.Message) == 0 {
if er.params == nil {
er.Message = T(er.LocId)
er.Message = T(er.Id)
} else {
er.Message = T(er.LocId, er.params)
er.Message = T(er.Id, er.params)
}
}
}
@@ -82,9 +81,9 @@ func NewAppError(where string, message string, details string) *AppError {
return ap
}
func NewLocAppError(where string, locId string, params map[string]interface{}, details string) *AppError {
func NewLocAppError(where string, id string, params map[string]interface{}, details string) *AppError {
ap := &AppError{}
ap.LocId = locId
ap.Id = id
ap.params = params
ap.Where = where
ap.DetailedError = details