From 470349d105642d7a293983a8a1f8a369dc789621 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Sun, 24 Jan 2016 17:10:54 -0300 Subject: PLT-7: Refactoring api to use translations (chunk 4) - Translation for api templates english and spanish --- api/templates/email_change_body.html | 4 ++-- api/templates/email_change_subject.html | 2 +- api/templates/email_change_verify_body.html | 6 +++--- api/templates/email_change_verify_subject.html | 2 +- api/templates/email_footer.html | 2 +- api/templates/email_info.html | 4 +--- api/templates/error.html | 4 ++-- api/templates/find_teams_body.html | 10 +++++----- api/templates/find_teams_subject.html | 2 +- api/templates/invite_body.html | 8 ++++---- api/templates/invite_subject.html | 2 +- api/templates/password_change_body.html | 4 ++-- api/templates/password_change_subject.html | 2 +- api/templates/post_body.html | 6 +++--- api/templates/post_subject.html | 2 +- api/templates/reset_body.html | 6 +++--- api/templates/reset_subject.html | 2 +- api/templates/signin_change_body.html | 4 ++-- api/templates/signin_change_subject.html | 2 +- api/templates/signup_team_body.html | 6 +++--- api/templates/signup_team_subject.html | 2 +- api/templates/verify_body.html | 6 +++--- api/templates/verify_subject.html | 2 +- api/templates/welcome_body.html | 10 +++++----- api/templates/welcome_subject.html | 2 +- 25 files changed, 50 insertions(+), 52 deletions(-) (limited to 'api/templates') diff --git a/api/templates/email_change_body.html b/api/templates/email_change_body.html index 7349aee6f..4f28584c4 100644 --- a/api/templates/email_change_body.html +++ b/api/templates/email_change_body.html @@ -17,8 +17,8 @@ diff --git a/api/templates/email_change_subject.html b/api/templates/email_change_subject.html index 4ff8026f1..afabc2191 100644 --- a/api/templates/email_change_subject.html +++ b/api/templates/email_change_subject.html @@ -1 +1 @@ -{{define "email_change_subject"}}[{{.ClientCfg.SiteName}}] Your email address has changed for {{.Props.TeamDisplayName}}{{end}} +{{define "email_change_subject"}}[{{.ClientCfg.SiteName}}] {{.Props.Subject}}{{end}} diff --git a/api/templates/email_change_verify_body.html b/api/templates/email_change_verify_body.html index 9d2c559b3..0d0c0aaba 100644 --- a/api/templates/email_change_verify_body.html +++ b/api/templates/email_change_verify_body.html @@ -17,10 +17,10 @@
-

You updated your email

-

You email address for {{.Props.TeamDisplayName}} has been changed to {{.Props.NewEmail}}.
If you did not make this change, please contact the system administrator.

+

{{.Props.Title}}

+

{{.Props.Info}}
diff --git a/api/templates/email_change_verify_subject.html b/api/templates/email_change_verify_subject.html index 744aaccfc..4fc4f4846 100644 --- a/api/templates/email_change_verify_subject.html +++ b/api/templates/email_change_verify_subject.html @@ -1 +1 @@ -{{define "email_change_verify_subject"}}[{{.ClientCfg.SiteName}}] Verify new email address for {{.Props.TeamDisplayName}}{{end}} +{{define "email_change_verify_subject"}}[{{.ClientCfg.SiteName}}] {{.Props.Subject}}{{end}} diff --git a/api/templates/email_footer.html b/api/templates/email_footer.html index e3ff9c584..6dc7fa483 100644 --- a/api/templates/email_footer.html +++ b/api/templates/email_footer.html @@ -6,7 +6,7 @@

(c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.
- To change your notification preferences, log in to your team site and go to Account Settings > Notifications. + {{.Props.Footer}}

diff --git a/api/templates/email_info.html b/api/templates/email_info.html index 48725d144..0a34f18a0 100644 --- a/api/templates/email_info.html +++ b/api/templates/email_info.html @@ -1,9 +1,7 @@ {{define "email_info"}} {{end}} diff --git a/api/templates/error.html b/api/templates/error.html index 9fb2da1ba..2b6211be2 100644 --- a/api/templates/error.html +++ b/api/templates/error.html @@ -22,9 +22,9 @@
-

{{ .ClientCfg.SiteName }} needs your help:

+

{{.Props.Title}}

{{ .Props.Message }}

- Go back to team site + {{.Props.Link}}
diff --git a/api/templates/find_teams_body.html b/api/templates/find_teams_body.html index 0b52af033..1324091aa 100644 --- a/api/templates/find_teams_body.html +++ b/api/templates/find_teams_body.html @@ -17,14 +17,14 @@
-

You updated your email

-

To finish updating your email address for {{.Props.TeamDisplayName}}, please click the link below to confirm this is the right address.

+

{{.Props.Title}}

+

{{.Props.Info}}

- Verify Email + {{.Props.VerifyButton}}

- Any questions at all, mail us any time: {{.ClientCfg.FeedbackEmail}}.
- Best wishes,
- The {{.ClientCfg.SiteName}} Team
+ {{.Html.EmailInfo}}
diff --git a/api/templates/find_teams_subject.html b/api/templates/find_teams_subject.html index f3a1437b3..ebc339562 100644 --- a/api/templates/find_teams_subject.html +++ b/api/templates/find_teams_subject.html @@ -1 +1 @@ -{{define "find_teams_subject"}}Your {{ .ClientCfg.SiteName }} Teams{{end}} +{{define "find_teams_subject"}}{{.Props.Subject}}{{end}} diff --git a/api/templates/invite_body.html b/api/templates/invite_body.html index a81d0c3d5..2b6bde6d3 100644 --- a/api/templates/invite_body.html +++ b/api/templates/invite_body.html @@ -17,13 +17,13 @@
-

Finding teams

-

{{ if .Props }} - Your request to find teams associated with your email found the following:
- {{range $index, $element := .Props}} +

{{.Props.Title}}

+

{{ if .Extra }} + {{.Props.Found}}
+ {{range $index, $element := .Extra}} {{ $index }}
{{ end }} {{ else }} - We could not find any teams for the given email. + {{.Props.NotFound}} {{ end }}

diff --git a/api/templates/invite_subject.html b/api/templates/invite_subject.html index 10f68969f..504915d50 100644 --- a/api/templates/invite_subject.html +++ b/api/templates/invite_subject.html @@ -1 +1 @@ -{{define "invite_subject"}}{{ .Props.SenderName }} invited you to join {{ .Props.TeamDisplayName }} Team on {{.ClientCfg.SiteName}}{{end}} +{{define "invite_subject"}}{{.Props.Subject}}{{end}} diff --git a/api/templates/password_change_body.html b/api/templates/password_change_body.html index 6199a3423..2c4ba10ca 100644 --- a/api/templates/password_change_body.html +++ b/api/templates/password_change_body.html @@ -17,8 +17,8 @@
-

You've been invited

-

The team {{.Props.SenderStatus}} {{.Props.SenderName}}, has invited you to join {{.Props.TeamDisplayName}}.

+

{{.Props.Title}}

+

{{.Html.Info}}

- Join Team + {{.Props.Button}}


-

Mattermost lets you share messages and files from your PC or phone, with instant search and archiving. After you’ve joined {{.Props.TeamDisplayName}}, you can sign-in to your new team and access these features anytime from the web address:

{{.Props.TeamURL}}

+

{{.Html.ExtraInfo}}
diff --git a/api/templates/password_change_subject.html b/api/templates/password_change_subject.html index 0cbf052c1..897f1210d 100644 --- a/api/templates/password_change_subject.html +++ b/api/templates/password_change_subject.html @@ -1 +1 @@ -{{define "password_change_subject"}}Your password has been updated for {{.Props.TeamDisplayName}} on {{ .ClientCfg.SiteName }}{{end}} +{{define "password_change_subject"}}{{.Props.Subject}}{{end}} diff --git a/api/templates/post_body.html b/api/templates/post_body.html index 468d5e205..54f34d1dd 100644 --- a/api/templates/post_body.html +++ b/api/templates/post_body.html @@ -17,10 +17,10 @@
-

You updated your password

-

Your password has been updated for {{.Props.TeamDisplayName}} on {{ .Props.TeamURL }} by {{.Props.Method}}.
If this change wasn't initiated by you, please contact your system administrator.

+

{{.Props.Title}}

+

{{.Html.Info}}
diff --git a/api/templates/post_subject.html b/api/templates/post_subject.html index f53353d85..60daaa432 100644 --- a/api/templates/post_subject.html +++ b/api/templates/post_subject.html @@ -1 +1 @@ -{{define "post_subject"}}[{{.ClientCfg.SiteName}}] {{.Props.TeamDisplayName}} Team Notifications for {{.Props.Month}} {{.Props.Day}}, {{.Props.Year}}{{end}} +{{define "post_subject"}}[{{.ClientCfg.SiteName}}] {{.Props.Subject}}{{end}} diff --git a/api/templates/reset_body.html b/api/templates/reset_body.html index a608c804a..69cd44957 100644 --- a/api/templates/reset_body.html +++ b/api/templates/reset_body.html @@ -17,10 +17,10 @@
-

You were mentioned

-

CHANNEL: {{.Props.ChannelName}}
{{.Props.SenderName}} - {{.Props.Hour}}:{{.Props.Minute}} {{.Props.TimeZone}}, {{.Props.Month}} {{.Props.Day}}

{{.Props.PostMessage}}

+

{{.Props.BodyText}}

+

{{.Html.Info}}

{{.Props.PostMessage}}

- Go To Channel + {{.Props.Button}}

diff --git a/api/templates/reset_subject.html b/api/templates/reset_subject.html index 87ad7bc38..a2852d332 100644 --- a/api/templates/reset_subject.html +++ b/api/templates/reset_subject.html @@ -1 +1 @@ -{{define "reset_subject"}}Reset your password{{end}} +{{define "reset_subject"}}{{.Props.Subject}}{{end}} diff --git a/api/templates/signin_change_body.html b/api/templates/signin_change_body.html index 5b96df944..af8577f0f 100644 --- a/api/templates/signin_change_body.html +++ b/api/templates/signin_change_body.html @@ -17,8 +17,8 @@
-

You requested a password reset

-

To change your password, click "Reset Password" below.
If you did not mean to reset your password, please ignore this email and your password will remain the same.

+

{{.Props.Title}}

+

{{.Html.Info}}

- Reset Password + {{.Props.Button}}

diff --git a/api/templates/signin_change_subject.html b/api/templates/signin_change_subject.html index b1d644a28..606dc4df3 100644 --- a/api/templates/signin_change_subject.html +++ b/api/templates/signin_change_subject.html @@ -1 +1 @@ -{{define "signin_change_subject"}}You updated your sign-in method for {{.Props.TeamDisplayName}} on {{ .ClientCfg.SiteName }}{{end}} +{{define "signin_change_subject"}}{{.Props.Subject}}{{end}} diff --git a/api/templates/signup_team_body.html b/api/templates/signup_team_body.html index 2f384ac43..683a9891e 100644 --- a/api/templates/signup_team_body.html +++ b/api/templates/signup_team_body.html @@ -17,11 +17,11 @@
-

You updated your sign-in method

-

You updated your sign-in method for {{.Props.TeamDisplayName}} on {{ .Props.TeamURL }} to {{.Props.Method}}.
If this change wasn't initiated by you, please contact your system administrator.

+

{{.Props.Title}}

+

{{.Html.Info}}
diff --git a/api/templates/signup_team_subject.html b/api/templates/signup_team_subject.html index 4fc5b3d72..413a5c8c1 100644 --- a/api/templates/signup_team_subject.html +++ b/api/templates/signup_team_subject.html @@ -1 +1 @@ -{{define "signup_team_subject"}}{{ .ClientCfg.SiteName }} Team Setup{{end}} \ No newline at end of file +{{define "signup_team_subject"}}{{.Props.Subject}}{{end}} \ No newline at end of file diff --git a/api/templates/verify_body.html b/api/templates/verify_body.html index c42b2a372..2b0d25f94 100644 --- a/api/templates/verify_body.html +++ b/api/templates/verify_body.html @@ -17,10 +17,10 @@
-

Thanks for creating a team!

+

{{.Props.Title}}

- Set up your team + {{.Props.Button}}

- {{ .ClientCfg.SiteName }} is one place for all your team communication, searchable and available anywhere.
You'll get more out of {{ .ClientCfg.SiteName }} when your team is in constant communication--let's get them on board.

+ {{.Html.Info}}
diff --git a/api/templates/verify_subject.html b/api/templates/verify_subject.html index 9a3a11282..ad7fc2aaa 100644 --- a/api/templates/verify_subject.html +++ b/api/templates/verify_subject.html @@ -1 +1 @@ -{{define "verify_subject"}}[{{ .Props.TeamDisplayName }} {{ .ClientCfg.SiteName }}] Email Verification{{end}} +{{define "verify_subject"}}{{.Props.Subject}}{{end}} diff --git a/api/templates/welcome_body.html b/api/templates/welcome_body.html index 71d838b08..b5ca9beb3 100644 --- a/api/templates/welcome_body.html +++ b/api/templates/welcome_body.html @@ -18,19 +18,19 @@ {{if .Props.VerifyUrl }} {{end}}
-

You've joined the {{ .Props.TeamDisplayName }} team

-

Please verify your email address by clicking below.

+

{{.Props.Title}}

+

{{.Props.Info}}

- Verify Email + {{.Props.Button}}

-

You've joined the {{ .Props.TeamDisplayName }} team

-

Please verify your email address by clicking below.

+

{{.Props.Title}}

+

{{.Props.Info}}

- Verify Email + {{.Props.Button}}

-

You can sign-in to your new team from the web address:

+

{{.Props.Info2}}

{{.Props.TeamURL}} -

Mattermost lets you share messages and files from your PC or phone, with instant search and archiving.

+

{{.Props.Info3}}
diff --git a/api/templates/welcome_subject.html b/api/templates/welcome_subject.html index c3b70ef20..95189b900 100644 --- a/api/templates/welcome_subject.html +++ b/api/templates/welcome_subject.html @@ -1 +1 @@ -{{define "welcome_subject"}}You joined {{ .Props.TeamDisplayName }}{{end}} +{{define "welcome_subject"}}{{.Props.Subject}}{{end}} -- cgit v1.2.3-1-g7c22