diff options
| author | enahum <nahumhbl@gmail.com> | 2016-06-22 10:32:39 -0300 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-22 09:32:39 -0400 |
| commit | 944966f7d1182a055466d874b94470ae840f1f57 (patch) | |
| tree | e295295c08c4c031987d1f1a45fbb623e33ad720 | |
| parent | 5f176e497406c1084cae3469edc4003e3bf9f513 (diff) | |
| download | chat-944966f7d1182a055466d874b94470ae840f1f57.tar.gz chat-944966f7d1182a055466d874b94470ae840f1f57.tar.bz2 chat-944966f7d1182a055466d874b94470ae840f1f57.zip | |
PLT-3415 Fix Sending Test email fails with error (#3396)
| -rw-r--r-- | api/admin.go | 2 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/api/admin.go b/api/admin.go index 096235a65..8d9d92aa5 100644 --- a/api/admin.go +++ b/api/admin.go @@ -184,7 +184,7 @@ func testEmail(c *Context, w http.ResponseWriter, r *http.Request) { return } - if len(utils.Cfg.EmailSettings.SMTPServer) == 0 { + if len(cfg.EmailSettings.SMTPServer) == 0 { c.Err = model.NewLocAppError("testEmail", "api.admin.test_email.missing_server", nil, utils.T("api.context.invalid_param.app_error", map[string]interface{}{"Name": "SMTPServer"})) return } diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index c0c8c74be..4bf470799 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -144,6 +144,7 @@ "admin.email.allowSignupTitle": "Allow Sign Up With Email: ", "admin.email.allowUsernameSignInDescription": "When true, Mattermost allows users to sign in using their username and password. This setting is typically only used when email verification is disabled.", "admin.email.allowUsernameSignInTitle": "Allow Sign In With Username: ", + "admin.email.connectionSecurityTest": "Test Connection", "admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.", "admin.email.emailFail": "Connection unsuccessful: {error}", "admin.email.emailSuccess": "No errors were reported while sending an email. Please check your inbox to make sure.", |