[PLT-1015] Make all Mattermost system emails Multi-Part, with both a HTML and Plain Text version. (#5698)

* Implementation to Make all Mattermost system emails Multi-Part, with both a HTML and Plain Text version

* update lib

* update code per review

* update to use the mattermost repo
Этот коммит содержится в:
Carlos Tadeu Panato Junior
2017-08-21 15:31:13 -03:00
коммит произвёл Christopher Speller
родитель 65ccd4afb2
Коммит 12a9180807
5 изменённых файлов: 30 добавлений и 26 удалений

Просмотреть файл

@@ -212,7 +212,6 @@ func TestEmail(userId string, cfg *model.Config) *model.AppError {
return model.NewLocAppError("testEmail", "api.admin.test_email.reenter_password", nil, "")
}
}
if user, err := GetUser(userId); err != nil {
return err
} else {

Просмотреть файл

@@ -218,7 +218,7 @@ func sendBatchedEmailNotification(userId string, notifications []*batchedNotific
body.Props["BodyText"] = translateFunc("api.email_batching.send_batched_email_notification.body_text", len(notifications))
if err := utils.SendMail(user.Email, subject, body.Render()); err != nil {
l4g.Warn(utils.T("api.email_batching.send_batched_email_notification.send.app_error"), user.Email, err)
l4g.Warn(utils.T("api.email_batchings.send_batched_email_notification.send.app_error"), user.Email, err)
}
}

Просмотреть файл

@@ -70,7 +70,7 @@ func TestSendEmailChangeVerifyEmail(t *testing.T) {
var newUserEmail string = "newtest@example.com"
var locale string = "en"
var siteURL string = ""
var siteURL string = "http://localhost:8065"
var expectedPartialMessage string = "You updated your email"
var expectedSubject string = "[" + utils.Cfg.TeamSettings.SiteName + "] Verify new email address"
var token string = "TEST_TOKEN"
@@ -174,7 +174,7 @@ func TestSendVerifyEmail(t *testing.T) {
var userEmail string = "test@example.com"
var locale string = "en"
var siteURL string = ""
var siteURL string = "http://localhost:8605"
var expectedPartialMessage string = "Please verify your email address by clicking below"
var expectedSubject string = "[" + utils.Cfg.TeamSettings.SiteName + "] Email Verification"
var token string = "TEST_TOKEN"