diff options
| author | Jesús Espino <jespinog@gmail.com> | 2018-06-16 09:35:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-16 09:35:24 +0200 |
| commit | f48d31c7a4c0332bfd10b986eee50611ab987e7c (patch) | |
| tree | 9dc73867d374320ce8d00f5629ee11c5c10765f2 | |
| parent | e38b18565ecd9dbe46b0ba8a263c7a39caa0bfda (diff) | |
| download | chat-f48d31c7a4c0332bfd10b986eee50611ab987e7c.tar.gz chat-f48d31c7a4c0332bfd10b986eee50611ab987e7c.tar.bz2 chat-f48d31c7a4c0332bfd10b986eee50611ab987e7c.zip | |
Small translation fixes (#8940)
| -rw-r--r-- | app/email.go | 7 | ||||
| -rw-r--r-- | app/email_batching.go | 2 | ||||
| -rw-r--r-- | i18n/en.json | 6 |
3 files changed, 6 insertions, 9 deletions
diff --git a/app/email.go b/app/email.go index 206c48aaa..b4e0a8983 100644 --- a/app/email.go +++ b/app/email.go @@ -232,17 +232,14 @@ func (a *App) SendMfaChangeEmail(email string, activated bool, locale, siteURL s bodyPage := a.NewEmailTemplate("mfa_change_body", locale) bodyPage.Props["SiteURL"] = siteURL - bodyText := "" if activated { - bodyText = "api.templates.mfa_activated_body.info" + bodyPage.Html["Info"] = utils.TranslateAsHtml(T, "api.templates.mfa_activated_body.info", map[string]interface{}{"SiteURL": siteURL}) bodyPage.Props["Title"] = T("api.templates.mfa_activated_body.title") } else { - bodyText = "api.templates.mfa_deactivated_body.info" + bodyPage.Html["Info"] = utils.TranslateAsHtml(T, "api.templates.mfa_deactivated_body.info", map[string]interface{}{"SiteURL": siteURL}) bodyPage.Props["Title"] = T("api.templates.mfa_deactivated_body.title") } - bodyPage.Html["Info"] = utils.TranslateAsHtml(T, bodyText, map[string]interface{}{"SiteURL": siteURL}) - if err := a.SendMail(email, subject, bodyPage.Render()); err != nil { return model.NewAppError("SendMfaChangeEmail", "api.user.send_mfa_change_email.error", nil, err.Error(), http.StatusInternalServerError) } diff --git a/app/email_batching.go b/app/email_batching.go index e75979bca..aad1eb8cb 100644 --- a/app/email_batching.go +++ b/app/email_batching.go @@ -198,7 +198,7 @@ func (a *App) sendBatchedEmailNotification(userId string, notifications []*batch var user *model.User if result := <-uchan; result.Err != nil { - mlog.Warn("api.email_batching.send_batched_email_notification.user.app_error") + mlog.Warn("Unable to find recipient for batched email notification") return } else { user = result.Data.(*model.User) diff --git a/i18n/en.json b/i18n/en.json index 843f9b807..6828740fc 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -4411,11 +4411,11 @@ "translation": "Invalid MFA token" }, { - "id": "ent.mfa.activate.save_active.app_erro", + "id": "ent.mfa.activate.save_active.app_error", "translation": "Unable to update MFA active status for the user" }, { - "id": "ent.mfa.deactivate.save_active.app_erro", + "id": "ent.mfa.deactivate.save_active.app_error", "translation": "Unable to update MFA active status for the user" }, { @@ -6423,7 +6423,7 @@ "translation": "We couldn't get the jobs" }, { - "id": "store.sql_job.get_count_by_status_and_type.app_erro", + "id": "store.sql_job.get_count_by_status_and_type.app_error", "translation": "We couldn't get the job count by status and type" }, { |