From 6104c37761deb8f06ea4af8838db12b8158318be Mon Sep 17 00:00:00 2001 From: Yusuke Nemoto Date: Sat, 21 Jul 2018 01:52:20 +0900 Subject: Break HTML blocks to individual strings (#8903) * Modifying message and templates about mfa_change * Modifying message and templates about password_change * Modify message and template about password_reset * Modify message and template about singin_change * Modify message and template about email_info * Modify message and template about change_username * Modify message about change_email * Add missing props * Add argument * Modify message and template about token_added * Modify messages and template about notification_email * Modify message and template about deactivate_email * Fix style * Remove unused message * Remove br tags * Modify message and code about invite_mail * Add missing message --- templates/deactivate_body.html | 2 +- templates/email_change_body.html | 2 +- templates/email_info.html | 2 +- templates/invite_body.html | 2 +- templates/mfa_change_body.html | 2 +- templates/password_change_body.html | 2 +- templates/post_body_full.html | 2 +- templates/reset_body.html | 2 +- templates/signin_change_body.html | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'templates') diff --git a/templates/deactivate_body.html b/templates/deactivate_body.html index 45a2f42af..018fe2561 100644 --- a/templates/deactivate_body.html +++ b/templates/deactivate_body.html @@ -18,7 +18,7 @@

{{.Props.Title}}

-

{{.Html.Info}}

+

{{.Props.Info}}
{{.Props.Warning}}

diff --git a/templates/email_change_body.html b/templates/email_change_body.html index 41b1bcd7d..e9becde3e 100644 --- a/templates/email_change_body.html +++ b/templates/email_change_body.html @@ -18,7 +18,7 @@

{{.Props.Title}}

-

{{.Html.Info}}

+

{{.Props.Info}}
{{.Props.Warning}}

diff --git a/templates/email_info.html b/templates/email_info.html index 0a34f18a0..6b83db76e 100644 --- a/templates/email_info.html +++ b/templates/email_info.html @@ -1,7 +1,7 @@ {{define "email_info"}} - {{.Html.EmailInfo}} + {{.Props.EmailInfo1}}{{.Props.SupportEmail}}
{{.Props.EmailInfo2}}
{{.Props.EmailInfo3}}
{{end}} diff --git a/templates/invite_body.html b/templates/invite_body.html index 2b6bde6d3..2352d3245 100644 --- a/templates/invite_body.html +++ b/templates/invite_body.html @@ -23,7 +23,7 @@ {{.Props.Button}}


-

{{.Html.ExtraInfo}}

+

{{.Html.ExtraInfo}}

{{.Props.TeamURL}}

diff --git a/templates/mfa_change_body.html b/templates/mfa_change_body.html index b7cc0630c..c2c6383d4 100644 --- a/templates/mfa_change_body.html +++ b/templates/mfa_change_body.html @@ -18,7 +18,7 @@

{{.Props.Title}}

-

{{.Html.Info}}

+

{{.Props.Info}}
{{.Props.Warning}}

diff --git a/templates/password_change_body.html b/templates/password_change_body.html index 2c4ba10ca..36a302bf1 100644 --- a/templates/password_change_body.html +++ b/templates/password_change_body.html @@ -18,7 +18,7 @@

{{.Props.Title}}

-

{{.Html.Info}}

+

{{.Props.Info}}
{{.Props.Warning}}

diff --git a/templates/post_body_full.html b/templates/post_body_full.html index fa27aba55..db51074f5 100644 --- a/templates/post_body_full.html +++ b/templates/post_body_full.html @@ -18,7 +18,7 @@

{{.Props.BodyText}}

-

{{.Html.Info}}

{{.Props.PostMessage}}

+

{{.Props.Info1}}
{{.Props.Info2}}

{{.Props.PostMessage}}

{{.Props.Button}}

diff --git a/templates/reset_body.html b/templates/reset_body.html index 69cd44957..bbfbb35e0 100644 --- a/templates/reset_body.html +++ b/templates/reset_body.html @@ -18,7 +18,7 @@

{{.Props.Title}}

-

{{.Html.Info}}

+

{{.Props.Info1}}
{{.Props.Info2}}

{{.Props.Button}}

diff --git a/templates/signin_change_body.html b/templates/signin_change_body.html index af8577f0f..047761469 100644 --- a/templates/signin_change_body.html +++ b/templates/signin_change_body.html @@ -18,7 +18,7 @@

{{.Props.Title}}

-

{{.Html.Info}}

+

{{.Props.Info}}
{{.Props.Warning}}

-- cgit v1.2.3-1-g7c22