From 78ab52da2b8872e9ac0e9515b827ceea1746503b Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sun, 30 May 2021 23:36:47 +0300 Subject: [PATCH 1/4] Fixed hebrew translation --- .../locale/translations/templates/he.email.auth.confirm.tpl | 2 +- .../locale/translations/templates/he.email.auth.invitation.tpl | 2 +- .../locale/translations/templates/he.email.auth.recovery.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/locale/translations/templates/he.email.auth.confirm.tpl b/app/config/locale/translations/templates/he.email.auth.confirm.tpl index 0c1f2a36d3..585636c1c9 100644 --- a/app/config/locale/translations/templates/he.email.auth.confirm.tpl +++ b/app/config/locale/translations/templates/he.email.auth.confirm.tpl @@ -2,7 +2,7 @@ שלום {{name}},

- נא ללחוץ על הקישור שלהלן כדי לאמת את החשבון שלך. + אנא לחץ\י על הקישור שלהלן כדי לאמת את החשבון שלך.

{{cta}}

diff --git a/app/config/locale/translations/templates/he.email.auth.invitation.tpl b/app/config/locale/translations/templates/he.email.auth.invitation.tpl index 9a9226a5ba..b11cf388a4 100644 --- a/app/config/locale/translations/templates/he.email.auth.invitation.tpl +++ b/app/config/locale/translations/templates/he.email.auth.invitation.tpl @@ -5,7 +5,7 @@ הודעת דוא״ל זו נשלחה אליך כי {{owner}} ביקש להזמינך להצטרף לצוות {{team}} ב־{{project}}.

- כדי להצטרף לצוות {{team}}, נא ללחוץ על הקישור: + כדי להצטרף לצוות {{team}}, אנא לחץ\י על הקישור:

{{cta}}

diff --git a/app/config/locale/translations/templates/he.email.auth.recovery.tpl b/app/config/locale/translations/templates/he.email.auth.recovery.tpl index e46bf1990e..ec249408a7 100644 --- a/app/config/locale/translations/templates/he.email.auth.recovery.tpl +++ b/app/config/locale/translations/templates/he.email.auth.recovery.tpl @@ -2,7 +2,7 @@ שלום {{name}},

- נא ללחוץ על הקישור שלהלן כדי לאפס את הסיסמה שלך ב־{{project}}. + אנא לחץ\י על הקישור שלהלן כדי לאפס את הסיסמה שלך ב־{{project}}.

{{cta}}

From 46b8031782ffa58c8d2965b81ec1205d9efb1f45 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sun, 30 May 2021 23:37:16 +0300 Subject: [PATCH 2/4] Fixed button alignment on RTL langs --- app/config/locale/templates/email-cta.tpl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/config/locale/templates/email-cta.tpl b/app/config/locale/templates/email-cta.tpl index 634609a09e..97103f610e 100644 --- a/app/config/locale/templates/email-cta.tpl +++ b/app/config/locale/templates/email-cta.tpl @@ -1,7 +1,7 @@ - + +   diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index c3088c5b5d..eff7c81c21 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -1462,17 +1462,16 @@ App::post('/v1/account/recovery') $cta = new Template(__DIR__.'/../../config/locale/templates/email-cta.tpl'); $body - ->setParam('{{content}}', $content->render()) + ->setParam('{{content}}', $content->render(false)) ->setParam('{{cta}}', $cta->render()) ->setParam('{{title}}', $locale->getText('account.emails.recovery.title')) ->setParam('{{direction}}', $locale->getText('settings.direction')) ->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]'])) ->setParam('{{name}}', $profile->getAttribute('name')) ->setParam('{{redirect}}', $url) - ->setParam('{{bg-body}}', '#f6f6f6') + ->setParam('{{bg-body}}', '#f7f7f7') ->setParam('{{bg-content}}', '#ffffff') - ->setParam('{{bg-cta}}', '#3498db') - ->setParam('{{bg-cta-hover}}', '#34495e') + ->setParam('{{bg-cta}}', '#073b4c') ->setParam('{{text-content}}', '#000000') ->setParam('{{text-cta}}', '#ffffff') ; @@ -1665,17 +1664,16 @@ App::post('/v1/account/verification') $cta = new Template(__DIR__.'/../../config/locale/templates/email-cta.tpl'); $body - ->setParam('{{content}}', $content->render()) + ->setParam('{{content}}', $content->render(false)) ->setParam('{{cta}}', $cta->render()) ->setParam('{{title}}', $locale->getText('account.emails.verification.title')) ->setParam('{{direction}}', $locale->getText('settings.direction')) ->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]'])) ->setParam('{{name}}', $user->getAttribute('name')) ->setParam('{{redirect}}', $url) - ->setParam('{{bg-body}}', '#f6f6f6') + ->setParam('{{bg-body}}', '#f7f7f7') ->setParam('{{bg-content}}', '#ffffff') - ->setParam('{{bg-cta}}', '#3498db') - ->setParam('{{bg-cta-hover}}', '#34495e') + ->setParam('{{bg-cta}}', '#073b4c') ->setParam('{{text-content}}', '#000000') ->setParam('{{text-cta}}', '#ffffff') ; diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php index 238e6248a1..1194b720c5 100644 --- a/app/controllers/api/teams.php +++ b/app/controllers/api/teams.php @@ -433,7 +433,7 @@ App::post('/v1/teams/:teamId/memberships') $title = \sprintf($locale->getText('account.emails.invitation.title'), $team->getAttribute('name', '[TEAM-NAME]'), $project->getAttribute('name', ['[APP-NAME]'])); $body - ->setParam('{{content}}', $content->render()) + ->setParam('{{content}}', $content->render(false)) ->setParam('{{cta}}', $cta->render()) ->setParam('{{title}}', $title) ->setParam('{{direction}}', $locale->getText('settings.direction')) @@ -441,10 +441,9 @@ App::post('/v1/teams/:teamId/memberships') ->setParam('{{team}}', $team->getAttribute('name', '[TEAM-NAME]')) ->setParam('{{owner}}', $user->getAttribute('name', '')) ->setParam('{{redirect}}', $url) - ->setParam('{{bg-body}}', '#f6f6f6') + ->setParam('{{bg-body}}', '#f7f7f7') ->setParam('{{bg-content}}', '#ffffff') - ->setParam('{{bg-cta}}', '#3498db') - ->setParam('{{bg-cta-hover}}', '#34495e') + ->setParam('{{bg-cta}}', '#073b4c') ->setParam('{{text-content}}', '#000000') ->setParam('{{text-cta}}', '#ffffff') ;