From 2447ce9bcaf3f9d9af6e1c15cc8db0eeed3bf747 Mon Sep 17 00:00:00 2001 From: Nick Misasi Date: Wed, 16 Dec 2020 13:51:40 -0500 Subject: [PATCH] [MM-30984] Change default footer for copyright in 2 emails (#16508) * Change default footer for copyright in 2 emails * Change copyright date to 2020 * Add something back * Put back to 2020 Co-authored-by: Mattermod --- app/email.go | 4 ++++ i18n/en.json | 2 +- i18n/ja.json | 2 +- i18n/nl.json | 2 +- i18n/pt-BR.json | 2 +- i18n/ro.json | 2 +- i18n/tr.json | 2 +- i18n/zh-CN.json | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/email.go b/app/email.go index fe4a44c7e5..273e97e281 100644 --- a/app/email.go +++ b/app/email.go @@ -781,6 +781,8 @@ func (es *EmailService) SendPaymentFailedEmail(email string, locale string, fail bodyPage.Props["Button"] = T("api.templates.over_limit_fix_now") bodyPage.Props["EmailUs"] = T("api.templates.email_us_anytime_at") + bodyPage.Props["Footer"] = T("api.templates.copyright") + bodyPage.Props["FailedReason"] = failedPayment.FailureMessage if err := es.sendMail(email, subject, bodyPage.Render()); err != nil { @@ -803,6 +805,8 @@ func (es *EmailService) SendNoCardPaymentFailedEmail(email string, locale string bodyPage.Props["Button"] = T("api.templates.payment_failed_no_card.button") bodyPage.Props["EmailUs"] = T("api.templates.email_us_anytime_at") + bodyPage.Props["Footer"] = T("api.templates.copyright") + if err := es.sendMail(email, subject, bodyPage.Render()); err != nil { return model.NewAppError("SendPaymentFailedEmail", "api.user.send_password_reset.send.app_error", nil, "err="+err.Message, http.StatusInternalServerError) } diff --git a/i18n/en.json b/i18n/en.json index d9ec041e60..a450c795e8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2608,7 +2608,7 @@ }, { "id": "api.templates.copyright", - "translation": "© 2017 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" + "translation": "© 2020 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" }, { "id": "api.templates.deactivate_body.info", diff --git a/i18n/ja.json b/i18n/ja.json index c6ff7565be..6a41105da6 100644 --- a/i18n/ja.json +++ b/i18n/ja.json @@ -7987,7 +7987,7 @@ }, { "id": "api.templates.copyright", - "translation": "© 2017 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" + "translation": "© 2020 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" }, { "id": "api.templates.at_limit_title", diff --git a/i18n/nl.json b/i18n/nl.json index 659e79b5e0..d838eeff60 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -8000,7 +8000,7 @@ }, { "id": "api.templates.copyright", - "translation": "© 2017 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" + "translation": "© 2020 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" }, { "id": "api.templates.at_limit_title", diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json index 147035e6be..10934ee0d2 100644 --- a/i18n/pt-BR.json +++ b/i18n/pt-BR.json @@ -8132,7 +8132,7 @@ }, { "id": "api.templates.copyright", - "translation": "© 2017 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" + "translation": "© 2020 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" }, { "id": "api.templates.at_limit_title", diff --git a/i18n/ro.json b/i18n/ro.json index d329311f13..b10633729f 100644 --- a/i18n/ro.json +++ b/i18n/ro.json @@ -7893,7 +7893,7 @@ }, { "id": "api.templates.copyright", - "translation": "© 2017 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" + "translation": "© 2020 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" }, { "id": "api.templates.at_limit_title", diff --git a/i18n/tr.json b/i18n/tr.json index 62d3a04cb9..84addd7c4c 100644 --- a/i18n/tr.json +++ b/i18n/tr.json @@ -8068,7 +8068,7 @@ }, { "id": "api.templates.copyright", - "translation": "© 2017 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" + "translation": "© 2020 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" }, { "id": "api.templates.at_limit_title", diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json index 92d6b18580..78c4617bef 100644 --- a/i18n/zh-CN.json +++ b/i18n/zh-CN.json @@ -8019,7 +8019,7 @@ }, { "id": "api.templates.copyright", - "translation": "© 2017 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" + "translation": "© 2020 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301" }, { "id": "api.templates.at_limit_title",