diff options
author | Corey Hulen <corey@hulen.com> | 2016-01-25 09:07:35 -0500 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-01-25 09:07:35 -0500 |
commit | 93a4e85c2d183a48f84a269c38ad4b91e9c31c14 (patch) | |
tree | 9f7cf34b9c70e76524642cf20a3b6ad3c6f3c753 /model/client.go | |
parent | 2a32bf20045a563c3656d89c9e70ab6d3c4505f0 (diff) | |
parent | f33cff21cf41ed060783e1eaad6c1c4838216ed2 (diff) | |
download | chat-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/client.go')
-rw-r--r-- | model/client.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/model/client.go b/model/client.go index b8e7c4894..8021c7039 100644 --- a/model/client.go +++ b/model/client.go @@ -56,7 +56,7 @@ func (c *Client) DoPost(url, data, contentType string) (*http.Response, *AppErro rq.Header.Set("Content-Type", contentType) if rp, err := c.HttpClient.Do(rq); err != nil { - return nil, NewAppError(url, "We encountered an error while connecting to the server", err.Error()) + return nil, NewLocAppError(url, "model.client.connecting.app_error", nil, err.Error()) } else if rp.StatusCode >= 300 { return nil, AppErrorFromJson(rp.Body) } else { @@ -72,7 +72,7 @@ func (c *Client) DoApiPost(url string, data string) (*http.Response, *AppError) } if rp, err := c.HttpClient.Do(rq); err != nil { - return nil, NewAppError(url, "We encountered an error while connecting to the server", err.Error()) + return nil, NewLocAppError(url, "model.client.connecting.app_error", nil, err.Error()) } else if rp.StatusCode >= 300 { return nil, AppErrorFromJson(rp.Body) } else { @@ -92,7 +92,7 @@ func (c *Client) DoApiGet(url string, data string, etag string) (*http.Response, } if rp, err := c.HttpClient.Do(rq); err != nil { - return nil, NewAppError(url, "We encountered an error while connecting to the server", err.Error()) + return nil, NewLocAppError(url, "model.client.connecting.app_error", nil, err.Error()) } else if rp.StatusCode == 304 { return rp, nil } else if rp.StatusCode >= 300 { @@ -298,7 +298,7 @@ func (c *Client) login(m map[string]string) (*Result, *AppError) { sessionToken := getCookie(SESSION_COOKIE_TOKEN, r) if c.AuthToken != sessionToken.Value { - NewAppError("/users/login", "Authentication tokens didn't match", "") + NewLocAppError("/users/login", "model.client.login.app_error", nil, "") } return &Result{r.Header.Get(HEADER_REQUEST_ID), @@ -699,7 +699,7 @@ func (c *Client) UploadFile(url string, data []byte, contentType string) (*Resul } if rp, err := c.HttpClient.Do(rq); err != nil { - return nil, NewAppError(url, "We encountered an error while connecting to the server", err.Error()) + return nil, NewLocAppError(url, "model.client.connecting.app_error", nil, err.Error()) } else if rp.StatusCode >= 300 { return nil, AppErrorFromJson(rp.Body) } else { @@ -721,7 +721,7 @@ func (c *Client) GetFile(url string, isFullUrl bool) (*Result, *AppError) { } if rp, err := c.HttpClient.Do(rq); err != nil { - return nil, NewAppError(url, "We encountered an error while connecting to the server", err.Error()) + return nil, NewLocAppError(url, "model.client.connecting.app_error", nil, err.Error()) } else if rp.StatusCode >= 300 { return nil, AppErrorFromJson(rp.Body) } else { @@ -739,7 +739,7 @@ func (c *Client) GetFileInfo(url string) (*Result, *AppError) { } if rp, err := c.HttpClient.Do(rq); err != nil { - return nil, NewAppError(url, "We encountered an error while connecting to the server", err.Error()) + return nil, NewLocAppError(url, "model.client.connecting.app_error", nil, err.Error()) } else if rp.StatusCode >= 300 { return nil, AppErrorFromJson(rp.Body) } else { |