diff options
author | =Corey Hulen <corey@hulen.com> | 2016-01-21 13:54:47 -0600 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-01-21 13:54:47 -0600 |
commit | 8cc45a2e08c3eaaa66619cc7ee9dfc7ff49b388f (patch) | |
tree | b5e95131caef98e33ecd4cce9c573dd4c8e0e4bf /api/admin.go | |
parent | dea84b1892be42e8d42db8b67862b56b38c0da75 (diff) | |
parent | a2fa683c1b5fc0c62506e3ac40784b053eda6e3e (diff) | |
download | chat-8cc45a2e08c3eaaa66619cc7ee9dfc7ff49b388f.tar.gz chat-8cc45a2e08c3eaaa66619cc7ee9dfc7ff49b388f.tar.bz2 chat-8cc45a2e08c3eaaa66619cc7ee9dfc7ff49b388f.zip |
Merge branch 'master' into PLT-7-client-infra
Diffstat (limited to 'api/admin.go')
-rw-r--r-- | api/admin.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/admin.go b/api/admin.go index 72a95ba6a..bdacb3afb 100644 --- a/api/admin.go +++ b/api/admin.go @@ -17,7 +17,7 @@ import ( ) func InitAdmin(r *mux.Router) { - l4g.Debug("Initializing admin api routes") + l4g.Debug(utils.T("api.admin.init.debug")) sr := r.PathPrefix("/admin").Subrouter() sr.Handle("/logs", ApiUserRequired(getLogs)).Methods("GET") @@ -132,7 +132,7 @@ func testEmail(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = result.Err return } else { - if err := utils.SendMailUsingConfig(result.Data.(*model.User).Email, "Mattermost - Testing Email Settings", "<br/><br/><br/>It appears your Mattermost email is setup correctly!", cfg); err != nil { + if err := utils.SendMailUsingConfig(result.Data.(*model.User).Email, c.T("api.admin.test_email.subject"), c.T("api.admin.test_email.body"), cfg); err != nil { c.Err = err return } |