PLT-3415 Fix Sending Test email fails with error (#3396)
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
5f176e4974
Коммит
944966f7d1
@@ -184,7 +184,7 @@ func testEmail(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
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"}))
|
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
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -144,6 +144,7 @@
|
|||||||
"admin.email.allowSignupTitle": "Allow Sign Up With Email: ",
|
"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.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.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.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.emailFail": "Connection unsuccessful: {error}",
|
||||||
"admin.email.emailSuccess": "No errors were reported while sending an email. Please check your inbox to make sure.",
|
"admin.email.emailSuccess": "No errors were reported while sending an email. Please check your inbox to make sure.",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user