From 8a4227bcb73a189afda4b7841e8be41a74048940 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann
Date: Fri, 12 Jun 2020 01:20:32 +0200
Subject: [PATCH 01/14] add responsive email templates
---
app/config/locales/templates/_base.tpl | 234 ++++++++++++++++++
app/config/locales/templates/_cta.tpl | 19 ++
.../templates/en.email.auth.confirm.tpl | 39 ++-
.../templates/en.email.auth.invitation.tpl | 41 ++-
.../templates/en.email.auth.recovery.tpl | 39 ++-
app/controllers/api/account.php | 16 +-
app/controllers/api/teams.php | 9 +-
7 files changed, 319 insertions(+), 78 deletions(-)
create mode 100644 app/config/locales/templates/_base.tpl
create mode 100644 app/config/locales/templates/_cta.tpl
diff --git a/app/config/locales/templates/_base.tpl b/app/config/locales/templates/_base.tpl
new file mode 100644
index 0000000000..57051e67a3
--- /dev/null
+++ b/app/config/locales/templates/_base.tpl
@@ -0,0 +1,234 @@
+
+
+
+
+
+
+ {{title}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/config/locales/templates/_cta.tpl b/app/config/locales/templates/_cta.tpl
new file mode 100644
index 0000000000..6cb2380e8d
--- /dev/null
+++ b/app/config/locales/templates/_cta.tpl
@@ -0,0 +1,19 @@
+
\ No newline at end of file
diff --git a/app/config/locales/templates/en.email.auth.confirm.tpl b/app/config/locales/templates/en.email.auth.confirm.tpl
index 92078114e3..a9afe29503 100644
--- a/app/config/locales/templates/en.email.auth.confirm.tpl
+++ b/app/config/locales/templates/en.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
- Hello {{name}},
-
-
- Follow this link to verify your email address.
-
-
{{redirect}}
-
-
- If you didn’t ask to verify this address, you can ignore this message.
-
-
- Thanks,
-
- {{project}} team
-
\ No newline at end of file
+
+ Hello {{name}},
+
+
+ Follow this link to verify your email address.
+
+{{cta}}
+
+ If you didn’t ask to verify this address, you can ignore this message.
+
+
+ Thanks,
+
+ {{project}} team
+
\ No newline at end of file
diff --git a/app/config/locales/templates/en.email.auth.invitation.tpl b/app/config/locales/templates/en.email.auth.invitation.tpl
index fda2bbcce0..5ea1f11891 100644
--- a/app/config/locales/templates/en.email.auth.invitation.tpl
+++ b/app/config/locales/templates/en.email.auth.invitation.tpl
@@ -1,27 +1,14 @@
-
-
-
- Hello,
-
-
- This mail was sent to you because
{{owner}} wanted to invite you to become a team member at the
{{team}} team over at {{project}}.
-
-
- Follow this link to join the
{{team}} team:
-
-
{{redirect}}
-
-
- If you are not interested, you can ignore this message.
-
-
- Thanks,
-
- {{project}} team
-
+
+ Hello {{name}},
+
+
+ This mail was sent to you because {{owner}} wanted to invite you to become a team member at the {{team}} team over at {{project}}.
+
+{{cta}}
+
+ If you are not interested, you can ignore this message.
+
+ Thanks,
+
+ {{project}} team
+
\ No newline at end of file
diff --git a/app/config/locales/templates/en.email.auth.recovery.tpl b/app/config/locales/templates/en.email.auth.recovery.tpl
index 82b365546a..fb7ad67eb0 100644
--- a/app/config/locales/templates/en.email.auth.recovery.tpl
+++ b/app/config/locales/templates/en.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
- Hello {{name}},
-
-
- Follow this link to reset your {{project}} password.
-
-
{{redirect}}
-
-
- If you didn't ask to reset your password, you can ignore this message.
-
-
- Thanks,
-
- {{project}} team
-
+
+ Hello {{name}},
+
+
+ Follow this link to reset your {{project}} password.
+
+{{cta}}
+
+ If you didn’t ask to verify this address, you can ignore this message.
+
+
+ Thanks,
+
+ {{project}} team
+
\ No newline at end of file
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index ce19865264..ee7896f096 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1074,8 +1074,14 @@ $utopia->post('/v1/account/recovery')
$url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['userId' => $profile->getId(), 'secret' => $secret]);
$url = Template::unParseURL($url);
- $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('account.emails.recovery.body'));
+ $body = new Template(__DIR__.'/../../config/locales/templates/_base.tpl');
+ $content = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('account.emails.recovery.body'));
+ $cta = new Template(__DIR__.'/../../config/locales/templates/_cta.tpl');
+
$body
+ ->setParam('{{content}}', $content->render())
+ ->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'))
@@ -1223,8 +1229,14 @@ $utopia->post('/v1/account/verification')
$url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['userId' => $user->getId(), 'secret' => $verificationSecret]);
$url = Template::unParseURL($url);
- $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('account.emails.verification.body'));
+ $body = new Template(__DIR__.'/../../config/locales/templates/_base.tpl');
+ $content = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('account.emails.verification.body'));
+ $cta = new Template(__DIR__.'/../../config/locales/templates/_cta.tpl');
+
$body
+ ->setParam('{{content}}', $content->render())
+ ->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'))
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index ccea694833..4fb67a0022 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -316,12 +316,19 @@ $utopia->post('/v1/teams/:teamId/memberships')
$url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['inviteId' => $membership->getId(), 'teamId' => $team->getId(), 'userId' => $invitee->getId(), 'secret' => $secret, 'teamId' => $teamId]);
$url = Template::unParseURL($url);
- $body = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('account.emails.invitation.body'));
+ $body = new Template(__DIR__.'/../../config/locales/templates/_base.tpl');
+ $content = new Template(__DIR__.'/../../config/locales/templates/'.Locale::getText('account.emails.invitation.body'));
+ $cta = new Template(__DIR__.'/../../config/locales/templates/_cta.tpl');
+
$body
+ ->setParam('{{content}}', $content->render())
+ ->setParam('{{cta}}', $cta->render())
+ ->setParam('{{title}}', Locale::getText('account.emails.invitation.title'))
->setParam('{{direction}}', Locale::getText('settings.direction'))
->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]']))
->setParam('{{team}}', $team->getAttribute('name', '[TEAM-NAME]'))
->setParam('{{owner}}', $user->getAttribute('name', ''))
+ ->setParam('{{name}}', $name)
->setParam('{{redirect}}', $url)
;
From 9426fca12a8fd75b99ebf4547ded3aaa5cfe22a1 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann
Date: Fri, 12 Jun 2020 01:30:27 +0200
Subject: [PATCH 02/14] remove whitespace and comment
---
app/config/locales/templates/_base.tpl | 2 --
1 file changed, 2 deletions(-)
diff --git a/app/config/locales/templates/_base.tpl b/app/config/locales/templates/_base.tpl
index 57051e67a3..aa79b7400c 100644
--- a/app/config/locales/templates/_base.tpl
+++ b/app/config/locales/templates/_base.tpl
@@ -39,7 +39,6 @@
.container {
display: block;
margin: 0 auto !important;
- /* makes it centered */
max-width: 580px;
padding: 10px;
width: 580px;
@@ -69,7 +68,6 @@
padding-top: 10px;
}
-
p {
font-family: sans-serif;
font-size: 14px;
From bab6ae3b791a0015216707246bd58327b47926ff Mon Sep 17 00:00:00 2001
From: Torsten Dittmann
Date: Fri, 12 Jun 2020 04:27:11 +0200
Subject: [PATCH 03/14] remove name from team invitation template
---
app/config/locales/templates/en.email.auth.invitation.tpl | 2 +-
app/controllers/api/teams.php | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/app/config/locales/templates/en.email.auth.invitation.tpl b/app/config/locales/templates/en.email.auth.invitation.tpl
index 5ea1f11891..a1bb1267c5 100644
--- a/app/config/locales/templates/en.email.auth.invitation.tpl
+++ b/app/config/locales/templates/en.email.auth.invitation.tpl
@@ -1,5 +1,5 @@
- Hello {{name}},
+ Hello,
This mail was sent to you because {{owner}} wanted to invite you to become a team member at the {{team}} team over at {{project}}.
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 4fb67a0022..d41a713b86 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -328,7 +328,6 @@ $utopia->post('/v1/teams/:teamId/memberships')
->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]']))
->setParam('{{team}}', $team->getAttribute('name', '[TEAM-NAME]'))
->setParam('{{owner}}', $user->getAttribute('name', ''))
- ->setParam('{{name}}', $name)
->setParam('{{redirect}}', $url)
;
From b426a63984f0492d1744b07c657128758d75d0df Mon Sep 17 00:00:00 2001
From: Torsten Dittmann
Date: Fri, 12 Jun 2020 18:49:56 +0200
Subject: [PATCH 04/14] fix mail subject encoding
---
app/init.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/init.php b/app/init.php
index f07ab83338..48771e4f81 100644
--- a/app/init.php
+++ b/app/init.php
@@ -146,6 +146,7 @@ $register->set('smtp', function () use ($request) {
$mail->Password = $password;
$mail->SMTPSecure = $request->getServer('_APP_SMTP_SECURE', false);
$mail->SMTPAutoTLS = false;
+ $mail->CharSet = 'UTF-8';
$from = urldecode($request->getServer('_APP_SYSTEM_EMAIL_NAME', APP_NAME.' Server'));
$email = $request->getServer('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
From 65eeb4c6067e824d898404d57445a2114440e789 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann
Date: Fri, 12 Jun 2020 19:07:22 +0200
Subject: [PATCH 05/14] update all templates to new structure
---
.../templates/af.email.auth.confirm.tpl | 27 +++++----------
.../templates/af.email.auth.invitation.tpl | 31 +++++++----------
.../templates/af.email.auth.recovery.tpl | 27 +++++----------
.../templates/alb.email.auth.confirm.tpl | 27 +++++----------
.../templates/alb.email.auth.invitation.tpl | 31 +++++++----------
.../templates/alb.email.auth.recovery.tpl | 27 +++++----------
.../templates/ar.email.auth.confirm.tpl | 27 +++++----------
.../templates/ar.email.auth.invitation.tpl | 31 +++++++----------
.../templates/ar.email.auth.recovery.tpl | 27 +++++----------
.../templates/bn.email.auth.confirm.tpl | 27 +++++----------
.../templates/bn.email.auth.invitation.tpl | 31 +++++++----------
.../templates/bn.email.auth.recovery.tpl | 27 +++++----------
.../templates/cat.email.auth.confirm.tpl | 27 +++++----------
.../templates/cat.email.auth.invitation.tpl | 31 +++++++----------
.../templates/cat.email.auth.recovery.tpl | 27 +++++----------
.../templates/cz.email.auth.confirm.tpl | 27 +++++----------
.../templates/cz.email.auth.invitation.tpl | 31 +++++++----------
.../templates/cz.email.auth.recovery.tpl | 27 +++++----------
.../templates/de.email.auth.confirm.tpl | 27 +++++----------
.../templates/de.email.auth.invitation.tpl | 31 +++++++----------
.../templates/de.email.auth.recovery.tpl | 27 +++++----------
.../templates/en.email.auth.confirm.tpl | 12 +++----
.../templates/en.email.auth.invitation.tpl | 12 +++----
.../templates/en.email.auth.recovery.tpl | 12 +++----
.../templates/es.email.auth.confirm.tpl | 27 +++++----------
.../templates/es.email.auth.invitation.tpl | 33 +++++++------------
.../templates/es.email.auth.recovery.tpl | 27 +++++----------
.../templates/fi.email.auth.confirm.tpl | 27 +++++----------
.../templates/fi.email.auth.invitation.tpl | 31 +++++++----------
.../templates/fi.email.auth.recovery.tpl | 27 +++++----------
.../templates/fo.email.auth.confirm.tpl | 27 +++++----------
.../templates/fo.email.auth.invitation.tpl | 31 +++++++----------
.../templates/fo.email.auth.recovery.tpl | 27 +++++----------
.../templates/fr.email.auth.confirm.tpl | 27 +++++----------
.../templates/fr.email.auth.invitation.tpl | 31 +++++++----------
.../templates/fr.email.auth.recovery.tpl | 27 +++++----------
.../templates/gr.email.auth.confirm.tpl | 27 +++++----------
.../templates/gr.email.auth.invitation.tpl | 31 +++++++----------
.../templates/gr.email.auth.recovery.tpl | 27 +++++----------
.../templates/he.email.auth.confirm.tpl | 27 +++++----------
.../templates/he.email.auth.invitation.tpl | 31 +++++++----------
.../templates/he.email.auth.recovery.tpl | 27 +++++----------
.../templates/hi.email.auth.confirm.tpl | 27 +++++----------
.../templates/hi.email.auth.invitation.tpl | 31 +++++++----------
.../templates/hi.email.auth.recovery.tpl | 27 +++++----------
.../templates/hu.email.auth.confirm.tpl | 27 +++++----------
.../templates/hu.email.auth.invitation.tpl | 31 +++++++----------
.../templates/hu.email.auth.recovery.tpl | 27 +++++----------
.../templates/hy.email.auth.confirm.tpl | 27 +++++----------
.../templates/hy.email.auth.invitation.tpl | 31 +++++++----------
.../templates/hy.email.auth.recovery.tpl | 27 +++++----------
.../templates/id.email.auth.confirm.tpl | 27 +++++----------
.../templates/id.email.auth.invitation.tpl | 31 +++++++----------
.../templates/id.email.auth.recovery.tpl | 27 +++++----------
.../templates/is.email.auth.confirm.tpl | 27 +++++----------
.../templates/is.email.auth.invitation.tpl | 31 +++++++----------
.../templates/is.email.auth.recovery.tpl | 27 +++++----------
.../templates/it.email.auth.confirm.tpl | 27 +++++----------
.../templates/it.email.auth.invitation.tpl | 31 +++++++----------
.../templates/it.email.auth.recovery.tpl | 27 +++++----------
.../templates/ja.email.auth.confirm.tpl | 27 +++++----------
.../templates/ja.email.auth.invitation.tpl | 31 +++++++----------
.../templates/ja.email.auth.recovery.tpl | 27 +++++----------
.../templates/jv.email.auth.confirm.tpl | 27 +++++----------
.../templates/jv.email.auth.invitation.tpl | 31 +++++++----------
.../templates/jv.email.auth.recovery.tpl | 27 +++++----------
.../templates/km.email.auth.confirm.tpl | 27 +++++----------
.../templates/km.email.auth.invitation.tpl | 31 +++++++----------
.../templates/km.email.auth.recovery.tpl | 27 +++++----------
.../templates/ko.email.auth.confirm.tpl | 27 +++++----------
.../templates/ko.email.auth.invitation.tpl | 31 +++++++----------
.../templates/ko.email.auth.recovery.tpl | 27 +++++----------
.../templates/lt.email.auth.confirm.tpl | 27 +++++----------
.../templates/lt.email.auth.invitation.tpl | 31 +++++++----------
.../templates/lt.email.auth.recovery.tpl | 27 +++++----------
.../templates/ml.email.auth.confirm.tpl | 27 +++++----------
.../templates/ml.email.auth.invitation.tpl | 31 +++++++----------
.../templates/ml.email.auth.recovery.tpl | 27 +++++----------
.../templates/my.email.auth.confirm.tpl | 27 +++++----------
.../templates/my.email.auth.invitation.tpl | 31 +++++++----------
.../templates/my.email.auth.recovery.tpl | 27 +++++----------
.../templates/nl.email.auth.confirm.tpl | 27 +++++----------
.../templates/nl.email.auth.invitation.tpl | 31 +++++++----------
.../templates/nl.email.auth.recovery.tpl | 27 +++++----------
.../templates/no.email.auth.confirm.tpl | 27 +++++----------
.../templates/no.email.auth.invitation.tpl | 31 +++++++----------
.../templates/no.email.auth.recovery.tpl | 27 +++++----------
.../templates/ph.email.auth.confirm.tpl | 27 +++++----------
.../templates/ph.email.auth.invitation.tpl | 31 +++++++----------
.../templates/ph.email.auth.recovery.tpl | 27 +++++----------
.../templates/pl.email.auth.confirm.tpl | 27 +++++----------
.../templates/pl.email.auth.invitation.tpl | 31 +++++++----------
.../templates/pl.email.auth.recovery.tpl | 27 +++++----------
.../templates/pn.email.auth.confirm.tpl | 27 +++++----------
.../templates/pn.email.auth.invitation.tpl | 31 +++++++----------
.../templates/pn.email.auth.recovery.tpl | 27 +++++----------
.../templates/pt-br.email.auth.confirm.tpl | 27 +++++----------
.../templates/pt-br.email.auth.invitation.tpl | 31 +++++++----------
.../templates/pt-br.email.auth.recovery.tpl | 27 +++++----------
.../templates/pt-pt.email.auth.confirm.tpl | 27 +++++----------
.../templates/pt-pt.email.auth.invitation.tpl | 31 +++++++----------
.../templates/pt-pt.email.auth.recovery.tpl | 27 +++++----------
.../templates/ro.email.auth.confirm.tpl | 27 +++++----------
.../templates/ro.email.auth.invitation.tpl | 31 +++++++----------
.../templates/ro.email.auth.recovery.tpl | 27 +++++----------
.../templates/ru.email.auth.confirm.tpl | 27 +++++----------
.../templates/ru.email.auth.invitation.tpl | 31 +++++++----------
.../templates/ru.email.auth.recovery.tpl | 27 +++++----------
.../templates/si.email.auth.confirm.tpl | 27 +++++----------
.../templates/si.email.auth.invitation.tpl | 31 +++++++----------
.../templates/si.email.auth.recovery.tpl | 27 +++++----------
.../templates/sl.email.auth.confirm.tpl | 27 +++++----------
.../templates/sl.email.auth.invitation.tpl | 31 +++++++----------
.../templates/sl.email.auth.recovery.tpl | 27 +++++----------
.../templates/sv.email.auth.confirm.tpl | 27 +++++----------
.../templates/sv.email.auth.invitation.tpl | 31 +++++++----------
.../templates/sv.email.auth.recovery.tpl | 27 +++++----------
.../templates/ta.email.auth.confirm.tpl | 27 +++++----------
.../templates/ta.email.auth.invitation.tpl | 31 +++++++----------
.../templates/ta.email.auth.recovery.tpl | 27 +++++----------
.../templates/th.email.auth.confirm.tpl | 27 +++++----------
.../templates/th.email.auth.invitation.tpl | 31 +++++++----------
.../templates/th.email.auth.recovery.tpl | 27 +++++----------
.../templates/tr.email.auth.confirm.tpl | 27 +++++----------
.../templates/tr.email.auth.invitation.tpl | 31 +++++++----------
.../templates/tr.email.auth.recovery.tpl | 27 +++++----------
.../templates/ua.email.auth.confirm.tpl | 27 +++++----------
.../templates/ua.email.auth.invitation.tpl | 31 +++++++----------
.../templates/ua.email.auth.recovery.tpl | 27 +++++----------
.../templates/vi.email.auth.confirm.tpl | 27 +++++----------
.../templates/vi.email.auth.invitation.tpl | 31 +++++++----------
.../templates/vi.email.auth.recovery.tpl | 27 +++++----------
.../templates/zh-cn.email.auth.confirm.tpl | 27 +++++----------
.../templates/zh-cn.email.auth.invitation.tpl | 31 +++++++----------
.../templates/zh-cn.email.auth.recovery.tpl | 27 +++++----------
.../templates/zh-tw.email.auth.confirm.tpl | 27 +++++----------
.../templates/zh-tw.email.auth.invitation.tpl | 31 +++++++----------
.../templates/zh-tw.email.auth.recovery.tpl | 27 +++++----------
138 files changed, 1324 insertions(+), 2539 deletions(-)
diff --git a/app/config/locales/templates/af.email.auth.confirm.tpl b/app/config/locales/templates/af.email.auth.confirm.tpl
index e0a6c40356..a9dbb2af46 100644
--- a/app/config/locales/templates/af.email.auth.confirm.tpl
+++ b/app/config/locales/templates/af.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hallo {{name}},
-
-
+
+
Om jou epos adres te verifieer, kliek op die web adres hier:
-
- {{redirect}}
-
-
+
+{{cta}}
+
As jy nie aangevra het om jou epos adres te verifieer nie, kan jy die boodskap ignoreer.
-
-
+
+
Baie dankie,
{{project}} span
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/af.email.auth.invitation.tpl b/app/config/locales/templates/af.email.auth.invitation.tpl
index eed6cf69d1..0c1c72c13a 100644
--- a/app/config/locales/templates/af.email.auth.invitation.tpl
+++ b/app/config/locales/templates/af.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Hallo,
-
-
+
+
Hierdie epos is vir jou gestuur omdat {{owner}} jou graag wou nooi om 'n spanlid te word van {{team}} by {{project}}.
-
-
+
+
Om by die {{team}} span aan te sluit:
-
- {{redirect}}
-
-
+
+{{cta}}
+
As jy nie belangstel nie, kan jy die boodskap ignoreer.
-
-
+
+
Baie dankie,
{{project}} span
-
+
diff --git a/app/config/locales/templates/af.email.auth.recovery.tpl b/app/config/locales/templates/af.email.auth.recovery.tpl
index 598c4c1d96..925baaf290 100644
--- a/app/config/locales/templates/af.email.auth.recovery.tpl
+++ b/app/config/locales/templates/af.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hallo {{name}},
-
-
+
+
Volg hierdie web adres om jou wagwoord te verander vir {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
As jy nie gevra het om you wagwoord te verander nie, kan jy hierdie boodskap ignoreer.
-
-
+
+
Baie dankie,
{{project}} span
-
+
diff --git a/app/config/locales/templates/alb.email.auth.confirm.tpl b/app/config/locales/templates/alb.email.auth.confirm.tpl
index 549340eca9..f350c13fa9 100644
--- a/app/config/locales/templates/alb.email.auth.confirm.tpl
+++ b/app/config/locales/templates/alb.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hej {{name}},
-
-
+
+
Ndiqni këtë lidhje për të konfirmuar adresën tuaj të emailit.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Nëse nuk keni kërkuar të konfirmoni këtë adresë, mund ta injoroni këtë mesazh.
-
-
+
+
Faleminderit,
Ekipi i tij {{project}}
-
+
diff --git a/app/config/locales/templates/alb.email.auth.invitation.tpl b/app/config/locales/templates/alb.email.auth.invitation.tpl
index fc75e51825..b734162067 100644
--- a/app/config/locales/templates/alb.email.auth.invitation.tpl
+++ b/app/config/locales/templates/alb.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Ηej,
-
-
+
+
Ju e morët këtë email sepse {{owner}} ju ftoi të bashkoheni në ekip {{team}} në {{project}}.
-
-
+
+
Ndiqni këtë lidhje për t'u bashkuar me grupin {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Nëse nuk jeni të interesuar, mund ta injoroni këtë mesazh.
-
-
+
+
Faleminderit,
Ekipi i tij {{project}}
-
+
diff --git a/app/config/locales/templates/alb.email.auth.recovery.tpl b/app/config/locales/templates/alb.email.auth.recovery.tpl
index d8e0bf867c..044cb963ae 100644
--- a/app/config/locales/templates/alb.email.auth.recovery.tpl
+++ b/app/config/locales/templates/alb.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hej {{name}},
-
-
+
+
Ndiqni këtë lidhje për të rivendosur fjalëkalimin tuaj ajo {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Nëse nuk keni kërkuar një ndryshim të fjalëkalimit, mund ta injoroni këtë mesazh.
-
-
+
+
Faleminderit,
Ekipi i tij {{project}}
-
+
diff --git a/app/config/locales/templates/ar.email.auth.confirm.tpl b/app/config/locales/templates/ar.email.auth.confirm.tpl
index 8cd1929dd9..a924e75be8 100644
--- a/app/config/locales/templates/ar.email.auth.confirm.tpl
+++ b/app/config/locales/templates/ar.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
مرحبا {{name}},
-
-
+
+
اتبع هذا الرابط للتحقق من عنوان بريدك الإلكتروني.
-
- {{redirect}}
-
-
+
+{{cta}}
+
إذا لم تطلب التحقق من هذا العنوان، فيمكنك تجاهل هذه الرسالة.
-
-
+
+
Thanks,
فريق {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/ar.email.auth.invitation.tpl b/app/config/locales/templates/ar.email.auth.invitation.tpl
index fba4a731e3..78a1321dab 100644
--- a/app/config/locales/templates/ar.email.auth.invitation.tpl
+++ b/app/config/locales/templates/ar.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
مرحبا،
-
-
+
+
تم إرسال هذه الرسالة إليك لأن {{owner}} أراد دعوتك لتصبح عضوًا في فريق {{team}} في {{project}}.
-
-
+
+
اتبع هذا الرابط للانضمام إلى فريق {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
إذا لم تكن مهتمًا، يمكنك تجاهل هذه الرسالة.
-
-
+
+
شكرا،
فريق {{project}}
-
+
diff --git a/app/config/locales/templates/ar.email.auth.recovery.tpl b/app/config/locales/templates/ar.email.auth.recovery.tpl
index 06ca47f35e..53c4537e3c 100644
--- a/app/config/locales/templates/ar.email.auth.recovery.tpl
+++ b/app/config/locales/templates/ar.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
مرحبا {{name}}،
-
-
+
+
اتبع هذا الرابط لإعادة تعيين كلمة مرور {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
إذا لم تطلب إعادة تعيين كلمة المرور الخاصة بك، فيمكنك تجاهل هذه الرسالة.
-
-
+
+
شكرا،
فريق {{project}}
-
+
diff --git a/app/config/locales/templates/bn.email.auth.confirm.tpl b/app/config/locales/templates/bn.email.auth.confirm.tpl
index dabf4f1222..12be7cecdb 100644
--- a/app/config/locales/templates/bn.email.auth.confirm.tpl
+++ b/app/config/locales/templates/bn.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
হ্যালো {{name}},
-
-
+
+
এই লিংকটি অনুসরণ করুন আপনার ইমেইল এড্রেস যাচাই করতে |
-
- {{redirect}}
-
-
+
+{{cta}}
+
আপনি যদি আপনার ইমেইল এড্রেস যাচাই করতে অনুরোধ করেননি, আপনি এই মেসেজটি অগ্রাহ্য করতে পারেন |
-
-
+
+
ধন্যবাদান্তে,
{{project}} টীম
-
+
diff --git a/app/config/locales/templates/bn.email.auth.invitation.tpl b/app/config/locales/templates/bn.email.auth.invitation.tpl
index f09c23adf9..b0e1395a5f 100644
--- a/app/config/locales/templates/bn.email.auth.invitation.tpl
+++ b/app/config/locales/templates/bn.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Hello,
-
-
+
+
এই মেইলটি আপনাকে পাঠানো হয়েছে কারণ {{owner}} আমন্ত্রণ করেছেন আপনাকে {{team}} এই টীমর মেম্বার হতে যেটি {{project}} এই প্রজেক্টর অন্তর্গত |
-
-
+
+
এই লিংকটি অনুসরণ করুন {{team}} এই টীম-এ যোগ দিতে:
-
- {{redirect}}
-
-
+
+{{cta}}
+
আপনি যদি অনাগ্রহী হন, এই মেসেজটি অগ্রাহ্য করতে পারেন |
-
-
+
+
ধন্যবাদান্তে,
{{project}} টীম
-
+
diff --git a/app/config/locales/templates/bn.email.auth.recovery.tpl b/app/config/locales/templates/bn.email.auth.recovery.tpl
index 4a356d9889..0dbe9bc643 100644
--- a/app/config/locales/templates/bn.email.auth.recovery.tpl
+++ b/app/config/locales/templates/bn.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
হ্যালো {{name}},
-
-
+
+
এই লিংকটি অনুসরণ করুন আপনার {{project}} পাসওয়ার্ড রিসেট করতে |
-
- {{redirect}}
-
-
+
+{{cta}}
+
আপনি যদি পাসওয়ার্ড রিসেট করতে অনুরোধ করেননি, আপনি এই মেসেজটি অগ্রাহ্য করতে পারেন |
-
-
+
+
ধন্যবাদান্তে,
{{project}} টীম
-
+
diff --git a/app/config/locales/templates/cat.email.auth.confirm.tpl b/app/config/locales/templates/cat.email.auth.confirm.tpl
index 3761912010..c6987289eb 100644
--- a/app/config/locales/templates/cat.email.auth.confirm.tpl
+++ b/app/config/locales/templates/cat.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hola {{name}},
-
-
+
+
Segueix aquest enllaç per verificar la teva direcció de correu:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Si no has solicitat verificar aquesta direcció, pots ignorar aquest missatge.
-
-
+
+
Gràcies,
Equip {{project}}
-
+
diff --git a/app/config/locales/templates/cat.email.auth.invitation.tpl b/app/config/locales/templates/cat.email.auth.invitation.tpl
index 69687693a2..1affb6506d 100644
--- a/app/config/locales/templates/cat.email.auth.invitation.tpl
+++ b/app/config/locales/templates/cat.email.auth.invitation.tpl
@@ -1,28 +1,19 @@
-
-
-
+
Hola,
-
-
+
+
T'hem enviat aquest correu perquè {{owner}} et vol convidar a formar part
de l'equip {{team}} a {{project}}.
-
-
+
+
Segueix aquest enllaç per unir-te a l'equip {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Si no estàs interessat, pots ignorar aquest missatge.
-
-
+
+
Gràcies,
Equip {{project}}
-
+
diff --git a/app/config/locales/templates/cat.email.auth.recovery.tpl b/app/config/locales/templates/cat.email.auth.recovery.tpl
index 2c17989674..856b92c457 100644
--- a/app/config/locales/templates/cat.email.auth.recovery.tpl
+++ b/app/config/locales/templates/cat.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hola {{name}},
-
-
+
+
Segueix aquest enllaç per restablir la teva contrasenya de {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Si no has demanat restablir la teva contrasenya, pots ignorar aquest missatge.
-
-
+
+
Gràcies,
Equip {{project}}
-
+
diff --git a/app/config/locales/templates/cz.email.auth.confirm.tpl b/app/config/locales/templates/cz.email.auth.confirm.tpl
index 481b440ab9..e72b357a48 100644
--- a/app/config/locales/templates/cz.email.auth.confirm.tpl
+++ b/app/config/locales/templates/cz.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Ahoj {{name}},
-
-
+
+
Kliknutím na tento odkaz ověřte svou e-mailovou adresu.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Pokud jste nepožádali o ověření této adresy, můžete tuto zprávu ignorovat.
-
-
+
+
dík,
{{project}} tým
-
+
diff --git a/app/config/locales/templates/cz.email.auth.invitation.tpl b/app/config/locales/templates/cz.email.auth.invitation.tpl
index 8e8a8dc5ce..d5353e71cf 100644
--- a/app/config/locales/templates/cz.email.auth.invitation.tpl
+++ b/app/config/locales/templates/cz.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Ahoj,
-
-
+
+
Tento e-mail vám byl zaslán, protože vás {{owner}} chtěl pozvat, abyste se stali členem týmu v týmu {{team}} v {{project}}.
-
-
+
+
Klepnutím na tento odkaz se připojíte k týmu {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Pokud vás nezajímá, můžete tuto zprávu ignorovat.
-
-
+
+
Dík,
{{project}} tým
-
+
diff --git a/app/config/locales/templates/cz.email.auth.recovery.tpl b/app/config/locales/templates/cz.email.auth.recovery.tpl
index d8a3e6a2b1..04b947d7ad 100644
--- a/app/config/locales/templates/cz.email.auth.recovery.tpl
+++ b/app/config/locales/templates/cz.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Ahoj {{name}},
-
-
+
+
Pomocí tohoto odkazu obnovte své heslo {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Pokud jste nepožádali o resetování hesla, můžete tuto zprávu ignorovat.
-
-
+
+
Dík,
{{project}} tým
-
+
diff --git a/app/config/locales/templates/de.email.auth.confirm.tpl b/app/config/locales/templates/de.email.auth.confirm.tpl
index 2a3211bbab..2780869778 100644
--- a/app/config/locales/templates/de.email.auth.confirm.tpl
+++ b/app/config/locales/templates/de.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hallo {{name}},
-
-
+
+
bitte folge diesem Link um deine E-Mail Adresse zu verifizieren.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Bitte ignoriere diese Nachricht, wenn du das Verifizieren deiner E-Mail Adresse nicht beantragt hast.
-
-
+
+
Vielen Dank,
{{project}} Team
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/de.email.auth.invitation.tpl b/app/config/locales/templates/de.email.auth.invitation.tpl
index c6d9162730..ae55630797 100644
--- a/app/config/locales/templates/de.email.auth.invitation.tpl
+++ b/app/config/locales/templates/de.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Hallo,
-
-
+
+
diese E-Mail wurde dir geschickt, weil {{owner}} dich eingeladen hat Teammitglied im Team {{team}} bei {{project}} zu werden.
-
-
+
+
Folge diesem Link um dem Team {{team}} beizutreten:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Wenn du daran nicht interessiert bist, kannst du diese Nachricht ignorieren.
-
-
+
+
Vielen Dank,
{{project}} Team
-
+
diff --git a/app/config/locales/templates/de.email.auth.recovery.tpl b/app/config/locales/templates/de.email.auth.recovery.tpl
index 6d2ccd7bae..8ca8140aec 100644
--- a/app/config/locales/templates/de.email.auth.recovery.tpl
+++ b/app/config/locales/templates/de.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hallo {{name}},
-
-
+
+
Folge diesem Link um dein Passwort für {{project}} zurückzusetzen.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Bitte ignoriere diese Nachricht, wenn du das Zurücksetzen deines Passworts nicht beantragt hast.
-
-
+
+
Vielen Dank,
{{project}} Team
-
+
diff --git a/app/config/locales/templates/en.email.auth.confirm.tpl b/app/config/locales/templates/en.email.auth.confirm.tpl
index a9afe29503..799832da56 100644
--- a/app/config/locales/templates/en.email.auth.confirm.tpl
+++ b/app/config/locales/templates/en.email.auth.confirm.tpl
@@ -1,15 +1,15 @@
- Hello {{name}},
+ Hello {{name}},
- Follow this link to verify your email address.
+ Follow this link to verify your email address.
{{cta}}
- If you didn’t ask to verify this address, you can ignore this message.
+ If you didn’t ask to verify this address, you can ignore this message.
- Thanks,
-
- {{project}} team
+ Thanks,
+
+ {{project}} team
\ No newline at end of file
diff --git a/app/config/locales/templates/en.email.auth.invitation.tpl b/app/config/locales/templates/en.email.auth.invitation.tpl
index 5ea1f11891..1856f86e81 100644
--- a/app/config/locales/templates/en.email.auth.invitation.tpl
+++ b/app/config/locales/templates/en.email.auth.invitation.tpl
@@ -1,14 +1,14 @@
- Hello {{name}},
+ Hello {{name}},
- This mail was sent to you because {{owner}} wanted to invite you to become a team member at the {{team}} team over at {{project}}.
+ This mail was sent to you because {{owner}} wanted to invite you to become a team member at the {{team}} team over at {{project}}.
{{cta}}
- If you are not interested, you can ignore this message.
+ If you are not interested, you can ignore this message.
- Thanks,
-
- {{project}} team
+ Thanks,
+
+ {{project}} team
\ No newline at end of file
diff --git a/app/config/locales/templates/en.email.auth.recovery.tpl b/app/config/locales/templates/en.email.auth.recovery.tpl
index fb7ad67eb0..a4a982f46f 100644
--- a/app/config/locales/templates/en.email.auth.recovery.tpl
+++ b/app/config/locales/templates/en.email.auth.recovery.tpl
@@ -1,15 +1,15 @@
- Hello {{name}},
+ Hello {{name}},
- Follow this link to reset your {{project}} password.
+ Follow this link to reset your {{project}} password.
{{cta}}
- If you didn’t ask to verify this address, you can ignore this message.
+ If you didn’t ask to verify this address, you can ignore this message.
- Thanks,
-
- {{project}} team
+ Thanks,
+
+ {{project}} team
\ No newline at end of file
diff --git a/app/config/locales/templates/es.email.auth.confirm.tpl b/app/config/locales/templates/es.email.auth.confirm.tpl
index a5b9235be8..2c728ddce1 100644
--- a/app/config/locales/templates/es.email.auth.confirm.tpl
+++ b/app/config/locales/templates/es.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hola {{name}},
-
-
+
+
Sigue este enlace para verificar tu dirección de correo.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Si no has solicitado verificar esta dirección, puedes ignorar este mensaje.
-
-
+
+
Gracias,
Equipo {{project}}
-
+
diff --git a/app/config/locales/templates/es.email.auth.invitation.tpl b/app/config/locales/templates/es.email.auth.invitation.tpl
index aa0469d9c6..824f35518c 100644
--- a/app/config/locales/templates/es.email.auth.invitation.tpl
+++ b/app/config/locales/templates/es.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Hola,
-
-
+
+
Te hemos enviamos este correo porque {{owner}} quiere invitarte a formar parte del equipo {{team}} en {{project}}.
-
-
+
+
Sigue este enlace para unirte al equipo {{team}}:
-
- {{redirect}}
-
-
- Si no ests interesado, puedes ignorar este mensaje.
-
-
+
+{{cta}}
+
+ Si no est�s interesado, puedes ignorar este mensaje.
+
+
Gracias,
Equipo {{project}}
-
+
diff --git a/app/config/locales/templates/es.email.auth.recovery.tpl b/app/config/locales/templates/es.email.auth.recovery.tpl
index 6f78fffa7c..0f1cfaa434 100644
--- a/app/config/locales/templates/es.email.auth.recovery.tpl
+++ b/app/config/locales/templates/es.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hola {{name}},
-
-
+
+
Sigue este enlace para reestablecer tu contraseña de {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Si no has pedido reestablecer tu contraseña, puedes ignorar este mensaje.
-
-
+
+
Gracias,
Equipo {{project}}
-
+
diff --git a/app/config/locales/templates/fi.email.auth.confirm.tpl b/app/config/locales/templates/fi.email.auth.confirm.tpl
index 1354e7a5d6..d14b0e32b0 100644
--- a/app/config/locales/templates/fi.email.auth.confirm.tpl
+++ b/app/config/locales/templates/fi.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hei {{name}},
-
-
+
+
Varmista sähköpostiosoite tästä linkistä.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jos et kysynyt tämän sähköpostiosoitteen varmistamista, voit sivuuttaa tämän viestin.
-
-
+
+
kiitos,
{{project}} tiimi
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/fi.email.auth.invitation.tpl b/app/config/locales/templates/fi.email.auth.invitation.tpl
index 7e955d0216..6680259aa7 100644
--- a/app/config/locales/templates/fi.email.auth.invitation.tpl
+++ b/app/config/locales/templates/fi.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Hei,
-
-
+
+
Sait tämän sähköpostin koska {{owner}} halusi kutsua sinut jäseneksi {{team}} tiimiin, täällä {{project}}.
-
-
+
+
Käytä tätä linkkiä liittyäksesi {{team}} tiimiin:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jos et ole kiinnostunut, voit sivuuttaa tämän viestin.
-
-
+
+
kiitos,
{{project}} tiimi
-
+
diff --git a/app/config/locales/templates/fi.email.auth.recovery.tpl b/app/config/locales/templates/fi.email.auth.recovery.tpl
index b273c65617..34c3177418 100644
--- a/app/config/locales/templates/fi.email.auth.recovery.tpl
+++ b/app/config/locales/templates/fi.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hei {{name}},
-
-
+
+
Resetoi {{project}} salasana tästä linkistä.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jos et pyytänyt salasanan nollaamista, voit sivuuttaa tämän viestin-
-
-
+
+
Kiitos,
{{project}} tiimi
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/fo.email.auth.confirm.tpl b/app/config/locales/templates/fo.email.auth.confirm.tpl
index 9af52651b8..5400c2ab01 100644
--- a/app/config/locales/templates/fo.email.auth.confirm.tpl
+++ b/app/config/locales/templates/fo.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Halló {{name}},
-
-
+
+
Fylg hesa lenka fyrið at verifisera teldupostur
-
- {{redirect}}
-
-
+
+{{cta}}
+
Om tú ikke spurdi om at verifisera hesa teldupostur, kannst tú ignorera hesa boð.
-
-
+
+
Takk,
{{project}} lið
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/fo.email.auth.invitation.tpl b/app/config/locales/templates/fo.email.auth.invitation.tpl
index 586daac0e4..c264c7516f 100644
--- a/app/config/locales/templates/fo.email.auth.invitation.tpl
+++ b/app/config/locales/templates/fo.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Halló,
-
-
+
+
Hesa teldupost var send til tín tí {{owner}} vildi bjóða tær at vera eitt lið limur hjá {{team}} á {{project}}
-
-
+
+
Fylg hettar lenka fyrið at bliva vi {{team}} lið:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Om tú ikke er áhugaður, kannst tú ignorera hesa boð
-
-
+
+
Takk,
{{project}} lið
-
+
diff --git a/app/config/locales/templates/fo.email.auth.recovery.tpl b/app/config/locales/templates/fo.email.auth.recovery.tpl
index 8c916a723f..e2f17313ee 100644
--- a/app/config/locales/templates/fo.email.auth.recovery.tpl
+++ b/app/config/locales/templates/fo.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Halló {{name}},
-
-
+
+
Fylg hettar lenka fyrið at resette títt {{project}} passord.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Om tú ikke spurdi om at verifisera hesa telduposturin, kannst du ignorera hesa boð.
-
-
+
+
Takk,
{{project}} lið
-
+
diff --git a/app/config/locales/templates/fr.email.auth.confirm.tpl b/app/config/locales/templates/fr.email.auth.confirm.tpl
index 21621e237a..ad0d242740 100644
--- a/app/config/locales/templates/fr.email.auth.confirm.tpl
+++ b/app/config/locales/templates/fr.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Bonjour {{name}},
-
-
+
+
Cliquez sur le lien suivant pour vérifier votre adresse mail.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Si vous n'avez pas demandé une vérification de cette adresse mail, vous pouvez ignorer ce message.
-
-
+
+
Merci,
L'équipe {{project}}
-
+
diff --git a/app/config/locales/templates/fr.email.auth.invitation.tpl b/app/config/locales/templates/fr.email.auth.invitation.tpl
index 3b793bb25c..c2d8f8cd1b 100644
--- a/app/config/locales/templates/fr.email.auth.invitation.tpl
+++ b/app/config/locales/templates/fr.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Bonjour,
-
-
+
+
Ce mail vous a été envoyé car {{owner}} vous invite à devenir membre de l'équipe {{team}} sur le projet {{project}}.
-
-
+
+
Cliquez sur le lien suivant pour rejoindre l'équipe {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Si vous n'êtes pas intéressé, vous pouvez ignorer ce message.
-
-
+
+
Merci,
L'équipe {{project}}
-
+
diff --git a/app/config/locales/templates/fr.email.auth.recovery.tpl b/app/config/locales/templates/fr.email.auth.recovery.tpl
index d3ab2a305f..597b421bf3 100644
--- a/app/config/locales/templates/fr.email.auth.recovery.tpl
+++ b/app/config/locales/templates/fr.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Bonjour {{name}},
-
-
+
+
Cliquez sur le lien suivant pour réinitialiser votre mot de passe pour le projet {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Si vous n'êtes pas à l'origine de cette demande de réinitialisation de mot de passe, vous pouvez ignorer ce message.
-
-
+
+
Merci,
L'équipe {{project}}
-
+
diff --git a/app/config/locales/templates/gr.email.auth.confirm.tpl b/app/config/locales/templates/gr.email.auth.confirm.tpl
index a62445476b..e52209c9db 100644
--- a/app/config/locales/templates/gr.email.auth.confirm.tpl
+++ b/app/config/locales/templates/gr.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Γεια σου {{name}},
-
-
+
+
Ακολούθησε αυτό τον σύνδεσμο για να επιβεβαιώσεις τη διεύθυνση email σου.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Αν δεν ζήτησες να επιβεβαιώσεις αυτή τη διεύθυνση, μπορείς να αγνοήσεις αυτό το μήνυμα.
-
-
+
+
Ευχαριστούμε,
Η ομάδα του {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/gr.email.auth.invitation.tpl b/app/config/locales/templates/gr.email.auth.invitation.tpl
index 101a1c673c..a7c0743ff6 100644
--- a/app/config/locales/templates/gr.email.auth.invitation.tpl
+++ b/app/config/locales/templates/gr.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Γεια,
-
-
+
+
Έλαβες αυτό το email επειδή ο {{owner}} σε προσκάλεσε να γίνεις μέλος της ομάδας {{team}} στο {{project}}.
-
-
+
+
Ακολούθησε αυτό τον σύνδεσμο για να γίνεις μέλος της ομάδας {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Άν δεν ενδιαφέρεσαι, μπορείς να αγνοήσεις αυτό το μήνυμα.
-
-
+
+
Ευχαριστούμε,
Η ομάδα του {{project}}
-
+
diff --git a/app/config/locales/templates/gr.email.auth.recovery.tpl b/app/config/locales/templates/gr.email.auth.recovery.tpl
index cae164df22..fb18c16ef3 100644
--- a/app/config/locales/templates/gr.email.auth.recovery.tpl
+++ b/app/config/locales/templates/gr.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Γεια σου {{name}},
-
-
+
+
Ακολούθησε αυτό τον σύνδεσμο για να επαναφέρεις τον κωδικό πρόσβασής σου για το {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Άν δεν ζήτησες αλλαγή κωδικού πρόσβασης, μπορείς να αγνοήσεις αυτο το μήνυμα.
-
-
+
+
Ευχαριστούμε,
Η ομάδα του {{project}}
-
+
diff --git a/app/config/locales/templates/he.email.auth.confirm.tpl b/app/config/locales/templates/he.email.auth.confirm.tpl
index bc9189a16f..0c1f2a36d3 100644
--- a/app/config/locales/templates/he.email.auth.confirm.tpl
+++ b/app/config/locales/templates/he.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
שלום {{name}},
-
-
+
+
נא ללחוץ על הקישור שלהלן כדי לאמת את החשבון שלך.
-
- {{redirect}}
-
-
+
+{{cta}}
+
אם לא ביקשת לאמת את כתובת הדוא״ל, ניתן להתעלם מההודעה זו.
-
-
+
+
בברכה,
צוות {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/he.email.auth.invitation.tpl b/app/config/locales/templates/he.email.auth.invitation.tpl
index a7514affda..9a9226a5ba 100644
--- a/app/config/locales/templates/he.email.auth.invitation.tpl
+++ b/app/config/locales/templates/he.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
שלום,
-
-
+
+
הודעת דוא״ל זו נשלחה אליך כי {{owner}} ביקש להזמינך להצטרף לצוות {{team}} ב־{{project}}.
-
-
+
+
כדי להצטרף לצוות {{team}}, נא ללחוץ על הקישור:
-
- {{redirect}}
-
-
+
+{{cta}}
+
אם איך לך עניין להצטרף לצוות, ניתן להתעלם מהודעת דוא״ל זו.
-
-
+
+
בברכה,
צוות {{project}}
-
+
diff --git a/app/config/locales/templates/he.email.auth.recovery.tpl b/app/config/locales/templates/he.email.auth.recovery.tpl
index e349365f07..e46bf1990e 100644
--- a/app/config/locales/templates/he.email.auth.recovery.tpl
+++ b/app/config/locales/templates/he.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
שלום {{name}},
-
-
+
+
נא ללחוץ על הקישור שלהלן כדי לאפס את הסיסמה שלך ב־{{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
אם לא ביקשת לאפס את סיסמתך, ניתן להתעלם מהודעת דוא״ל זו.
-
-
+
+
בברכה,
צוות {{project}}
-
+
diff --git a/app/config/locales/templates/hi.email.auth.confirm.tpl b/app/config/locales/templates/hi.email.auth.confirm.tpl
index a8b2f10086..ec71210dce 100644
--- a/app/config/locales/templates/hi.email.auth.confirm.tpl
+++ b/app/config/locales/templates/hi.email.auth.confirm.tpl
@@ -1,25 +1,16 @@
-
-
-
+
नमस्ते {{name}},
-
-
+
+
अपना ईमेल पता वेरीफाई करने के लिए इस लिंक पर क्लिक करे।
-
- {{redirect}}
-
-
+
+{{cta}}
+
यदि आपने इस ईमेल को वेरीफाई करने के लिए नहीं कहा है, तो आप इस संदेश को अनदेखा कर सकते हैं।
-
-
+
+
धन्यवाद,
{{project}} टीम
-
+
diff --git a/app/config/locales/templates/hi.email.auth.invitation.tpl b/app/config/locales/templates/hi.email.auth.invitation.tpl
index 53eea9b70a..f4b5255038 100644
--- a/app/config/locales/templates/hi.email.auth.invitation.tpl
+++ b/app/config/locales/templates/hi.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
नमस्ते,
-
-
+
+
यह मेल आपको इसलिए भेजा गया था क्योंकि {{owner}} आपको {{project}} के लिए {{team}} टीम में टीम मेंबर बनने के लिए आमंत्रित करना चाहते थे।
-
-
+
+
टीम {{team}} ज्वाइन करने के लिए इस लिंक पर क्लिक करे :
-
- {{redirect}}
-
-
+
+{{cta}}
+
यदि आप रुचि नहीं रखते हैं, तो आप इस संदेश को अनदेखा कर सकते हैं।
-
-
+
+
धन्यवाद,
{{project}} टीम
-
+
diff --git a/app/config/locales/templates/hi.email.auth.recovery.tpl b/app/config/locales/templates/hi.email.auth.recovery.tpl
index 697c839480..0dbeb3fd9a 100644
--- a/app/config/locales/templates/hi.email.auth.recovery.tpl
+++ b/app/config/locales/templates/hi.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
नमस्ते {{name}},
-
-
+
+
{{project}} का पासवर्ड रिसेट करने के लिए इस लिंक पर क्लिक करे।
-
- {{redirect}}
-
-
+
+{{cta}}
+
यदि आपने अपना पासवर्ड रीसेट करने के लिए नहीं कहा है, तो आप इस संदेश को अनदेखा कर सकते हैं।
-
-
+
+
धन्यवाद,
{{project}} टीम
-
+
diff --git a/app/config/locales/templates/hu.email.auth.confirm.tpl b/app/config/locales/templates/hu.email.auth.confirm.tpl
index 680e0da2ec..259c7ceb9b 100644
--- a/app/config/locales/templates/hu.email.auth.confirm.tpl
+++ b/app/config/locales/templates/hu.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Szia {{name}},
-
-
+
+
Kattints erre a linkre, hogy megerősítsd az e-mail címed.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Ha nem kérelmezted, hogy megerősítsük ezt a címet, ignoráld ezt a levelet.
-
-
+
+
Köszönettel,
{{project}} csapat
-
+
diff --git a/app/config/locales/templates/hu.email.auth.invitation.tpl b/app/config/locales/templates/hu.email.auth.invitation.tpl
index 6dce55a639..5c8d90b86a 100644
--- a/app/config/locales/templates/hu.email.auth.invitation.tpl
+++ b/app/config/locales/templates/hu.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Szia,
-
-
+
+
Azért küldtük ezt az e-mailt {{owner}} mert meg szeretnénk hívni a {{team}} csapatba a következő projektre {{project}}.
-
-
+
+
Kattints erre a linkre, hogy a {{team}} csapat tagja legyél:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Ha nem vegy ebben érdekelt ignoráld ezt az üzenetet.
-
-
+
+
Köszönettel,
{{project}} csapat
-
+
diff --git a/app/config/locales/templates/hu.email.auth.recovery.tpl b/app/config/locales/templates/hu.email.auth.recovery.tpl
index 564d55bd0b..b5e915516a 100644
--- a/app/config/locales/templates/hu.email.auth.recovery.tpl
+++ b/app/config/locales/templates/hu.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Szia {{name}},
-
-
+
+
Kattints erre a linkre, hogy visszaállítsuk a {{project}} jelszavad.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Ha nem kérvényezted, hogy visszaállítsuk a jelszavad ignoráld ezt a levelet.
-
-
+
+
Köszönettel,
{{project}} csapat
-
+
diff --git a/app/config/locales/templates/hy.email.auth.confirm.tpl b/app/config/locales/templates/hy.email.auth.confirm.tpl
index f8c8f99670..dd8666c3a3 100644
--- a/app/config/locales/templates/hy.email.auth.confirm.tpl
+++ b/app/config/locales/templates/hy.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Ողջույն, {{name}},
-
-
+
+
Անցեք հղումով, որպեսզի հաստատեք Ձեր էլեկտրոնային հասցեն։
-
- {{redirect}}
-
-
+
+{{cta}}
+
Եթե չեք պահանջել էլեկտրոնային հասցեի հաստատում, պարզապես արհամարհեք այս նամակը։
-
-
+
+
Շնորհակալություն,
{{project}} թիմ
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/hy.email.auth.invitation.tpl b/app/config/locales/templates/hy.email.auth.invitation.tpl
index e471c81b63..2d0f125403 100644
--- a/app/config/locales/templates/hy.email.auth.invitation.tpl
+++ b/app/config/locales/templates/hy.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Ողջույն,
-
-
+
+
Դուք ստացել եք այս նամակը, քանի որ {{owner}}-ը հրավիրում է Ձեզ {{team}} խումբ, {{project}} պրոեկտում։
-
-
+
+
Անցեք հղումով, որ միանաք {{team}} թիմին՝
-
- {{redirect}}
-
-
+
+{{cta}}
+
Եթե հետաքրքրված չեք դրանով, պարզապես արհամարհեք այս նամակը։
-
-
+
+
Շնորհակալություն,
{{project}} թիմ
-
+
diff --git a/app/config/locales/templates/hy.email.auth.recovery.tpl b/app/config/locales/templates/hy.email.auth.recovery.tpl
index d08068efab..f51dcc96fd 100644
--- a/app/config/locales/templates/hy.email.auth.recovery.tpl
+++ b/app/config/locales/templates/hy.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Ողջույն, {{name}},
-
-
+
+
Անցեք հղումով, որպեսզի փոխեք գաղտնաբառը {{project}} պրոեկտի համար։
-
- {{redirect}}
-
-
+
+{{cta}}
+
Եթե չեք պահանջել գաղտնաբառի փոփոխություն, արհամարհեք այս նամակը։
-
-
+
+
Շնորհակալություն
{{project}} թիմ
-
+
diff --git a/app/config/locales/templates/id.email.auth.confirm.tpl b/app/config/locales/templates/id.email.auth.confirm.tpl
index a6049cb8f6..a5f3427c35 100644
--- a/app/config/locales/templates/id.email.auth.confirm.tpl
+++ b/app/config/locales/templates/id.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Halo {{name}},
-
-
+
+
Ikuti link ini untuk memverifikasi alamat email Anda.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jika Anda tidak meminta untuk memverifikasi alamat ini, Anda dapat mengabaikan pesan ini.
-
-
+
+
Terima kasih,
Tim {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/id.email.auth.invitation.tpl b/app/config/locales/templates/id.email.auth.invitation.tpl
index 7ab49b2002..d81a4a5d83 100644
--- a/app/config/locales/templates/id.email.auth.invitation.tpl
+++ b/app/config/locales/templates/id.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Halo,
-
-
+
+
Email ini dikirimkan kepada Anda karena {{owner}} ingin mengundang Anda untuk menjadi anggota tim {{team}} di {{project}}.
-
-
+
+
Ikuti link ini untuk bergabung dengan tim {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jika Anda tidak tertarik, Anda dapat mengabaikan pesan ini.
-
-
+
+
Terima kasih,
Tim {{project}}
-
+
diff --git a/app/config/locales/templates/id.email.auth.recovery.tpl b/app/config/locales/templates/id.email.auth.recovery.tpl
index e0b953f224..6a7d2596c6 100644
--- a/app/config/locales/templates/id.email.auth.recovery.tpl
+++ b/app/config/locales/templates/id.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Halo {{name}},
-
-
+
+
Ikuti link ini untuk mereset kata sandi {{project}} Anda.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jika Anda tidak meminta untuk mereset kata sandi Anda, Anda dapat mengabaikan pesan ini.
-
-
+
+
Terima kasih,
Tim {{project}}
-
+
diff --git a/app/config/locales/templates/is.email.auth.confirm.tpl b/app/config/locales/templates/is.email.auth.confirm.tpl
index e9733cd47d..c6b9778a45 100644
--- a/app/config/locales/templates/is.email.auth.confirm.tpl
+++ b/app/config/locales/templates/is.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Halló {{name}},
-
-
+
+
Fylgdu þessum tengli til að staðfesta netfangið þitt.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Ef þú baðst ekki um að staðfesta þetta netfang geturðu hunsað þessi skilaboð.
-
-
+
+
Takk,
{{project}} Teymi
-
+
diff --git a/app/config/locales/templates/is.email.auth.invitation.tpl b/app/config/locales/templates/is.email.auth.invitation.tpl
index 2738fc2025..83e1e5696d 100644
--- a/app/config/locales/templates/is.email.auth.invitation.tpl
+++ b/app/config/locales/templates/is.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Halló,
-
-
+
+
Þessi póstur var sendur til þín vegna þess að {{owner}} vildi bjóða þér að gerast liðsmaður í {{team}} teymi í {{project}}.
-
-
+
+
Fylgdu þessum hlekk til að ganga í {{team}} liðið:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Ef þú hefur ekki áhuga geturðu hunsað þessi skilaboð.
-
-
+
+
Takk,
{{project}} Teymi
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/is.email.auth.recovery.tpl b/app/config/locales/templates/is.email.auth.recovery.tpl
index fc3bc57722..edddba1ffb 100644
--- a/app/config/locales/templates/is.email.auth.recovery.tpl
+++ b/app/config/locales/templates/is.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Halló {{name}},
-
-
+
+
Fylgdu þessum tengli til að núllstilla lykilorð {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Ef þú baðst ekki um að endurstilla lykilorðið þitt geturðu hunsað þessi skilaboð.
-
-
+
+
Takk,
{{project}} Teymi
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/it.email.auth.confirm.tpl b/app/config/locales/templates/it.email.auth.confirm.tpl
index 93ee5e006f..ec7837ec3d 100644
--- a/app/config/locales/templates/it.email.auth.confirm.tpl
+++ b/app/config/locales/templates/it.email.auth.confirm.tpl
@@ -1,25 +1,16 @@
-
-
-
+
Ciao {{name}},
-
-
+
+
Segui questo link per verificare il tuo indirizzo email.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Se non hai chiesto di verificare questo indirizzo, puoi ignorare questo messaggio.
-
-
+
+
Grazie,
Il team di {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/it.email.auth.invitation.tpl b/app/config/locales/templates/it.email.auth.invitation.tpl
index e6eddb5d1b..f4b8e4f93b 100644
--- a/app/config/locales/templates/it.email.auth.invitation.tpl
+++ b/app/config/locales/templates/it.email.auth.invitation.tpl
@@ -1,28 +1,19 @@
-
-
-
+
Ciao,
-
-
+
+
Questa mail ti è stata inviata perchè {{owner}} vuole invitarti a diventare un membro del team {{team}} del progetto {{project}}.
-
-
+
+
Segui questo link per unirti al team {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Se non sei interessato, puoi ignorare questo messaggio.
-
-
+
+
Grazie,
Il team di {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/it.email.auth.recovery.tpl b/app/config/locales/templates/it.email.auth.recovery.tpl
index 64e865fe76..870b3ab0f5 100644
--- a/app/config/locales/templates/it.email.auth.recovery.tpl
+++ b/app/config/locales/templates/it.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Ciao {{name}},
-
-
+
+
Segui questo link per reimpostare la tua password per {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Se non hai chiesto di reimpostare la password, puoi ignorare questo messaggio.
-
-
+
+
Grazie,
Il team di {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/ja.email.auth.confirm.tpl b/app/config/locales/templates/ja.email.auth.confirm.tpl
index 6c7a89f355..a06f96cd83 100644
--- a/app/config/locales/templates/ja.email.auth.confirm.tpl
+++ b/app/config/locales/templates/ja.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
{{name}}さん こんにちは。
-
-
+
+
下記のリンクからメールアドレスを認証してください。
-
- {{redirect}}
-
-
+
+{{cta}}
+
お手数ですが、心当たりがない場合このメールを破棄してください。
-
-
+
+
ありがとうございます。
{{project}} チーム
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/ja.email.auth.invitation.tpl b/app/config/locales/templates/ja.email.auth.invitation.tpl
index ed59caff07..26d5de981b 100644
--- a/app/config/locales/templates/ja.email.auth.invitation.tpl
+++ b/app/config/locales/templates/ja.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
こんにちは。
-
-
+
+
{{owner}} さんから {{project}} プロジェクトの {{team}} チームへの参加招待が届きました。
-
-
+
+
下記のリンクから {{team}} へ参加してください。
-
- {{redirect}}
-
-
+
+{{cta}}
+
お手数ですが、心当たりがない場合このメールを破棄してください。
-
-
+
+
ありがとうございます。
{{project}} チーム
-
+
diff --git a/app/config/locales/templates/ja.email.auth.recovery.tpl b/app/config/locales/templates/ja.email.auth.recovery.tpl
index 108c7aebee..0b0260c586 100644
--- a/app/config/locales/templates/ja.email.auth.recovery.tpl
+++ b/app/config/locales/templates/ja.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
{{name}}さん こんにちは。
-
-
+
+
下記のリンクから {{project}} プロジェクトのパスワードを再設定してください。
-
- {{redirect}}
-
-
+
+{{cta}}
+
お手数ですが、心当たりがない場合このメールを破棄してください。
-
-
+
+
ありがとうございます。
{{project}} チーム
-
+
diff --git a/app/config/locales/templates/jv.email.auth.confirm.tpl b/app/config/locales/templates/jv.email.auth.confirm.tpl
index c1afdc69a9..71279a3c89 100644
--- a/app/config/locales/templates/jv.email.auth.confirm.tpl
+++ b/app/config/locales/templates/jv.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Halo, {{name}},
-
-
+
+
Tindakake tautan iki kanggo verifikasi alamat email sampeyan.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Yen sampeyan ora njaluk verifikasi alamat iki, sampeyan bisa nglalekake pesen iki.
-
-
+
+
Matur suwun,
tim {{project}}
-
+
diff --git a/app/config/locales/templates/jv.email.auth.invitation.tpl b/app/config/locales/templates/jv.email.auth.invitation.tpl
index 8c5de0f419..807cc3f478 100644
--- a/app/config/locales/templates/jv.email.auth.invitation.tpl
+++ b/app/config/locales/templates/jv.email.auth.invitation.tpl
@@ -1,28 +1,19 @@
-
-
-
+
Halo,
-
-
+
+
Email iki dikirim menyang sampeyan amarga {{owner}} pengin ngajak sampeyan dadi anggota tim ing {{team}} tim ing {{project}}.
-
-
+
+
Tindakake link iki kanggo gabung ing {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Yen sampeyan ora kasengsem, sampeyan bisa nglirwakake pesen iki.
-
-
+
+
Matur suwun,
tim {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/jv.email.auth.recovery.tpl b/app/config/locales/templates/jv.email.auth.recovery.tpl
index ed6c879aeb..1efd86bc77 100644
--- a/app/config/locales/templates/jv.email.auth.recovery.tpl
+++ b/app/config/locales/templates/jv.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Halo {{name}},
-
-
+
+
Tindakake link iki kanggo ngreset {{project}} sandhi.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Yen sampeyan ora njaluk ngreset sandhi, sampeyan bisa nglalekake pesen iki.
-
-
+
+
Matur suwun,
tim {{project}}
-
+
diff --git a/app/config/locales/templates/km.email.auth.confirm.tpl b/app/config/locales/templates/km.email.auth.confirm.tpl
index c2c94d08c0..193508c9bd 100644
--- a/app/config/locales/templates/km.email.auth.confirm.tpl
+++ b/app/config/locales/templates/km.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
សួស្ដី {{name}},
-
-
+
+
តាមតំណនេះដើម្បីផ្ទៀងផ្ទាត់អាសយដ្ឋានសារអេឡិចត្រូនិចរបស់អ្នក។
-
- {{redirect}}
-
-
+
+{{cta}}
+
ប្រសិនបើអ្នកពុំបានស្នើសុំផ្ទៀងផ្ទាត់អាសយដ្ឋាននេះទេ អ្នកអាចមិនអើពើនឹងសារនេះបាន។
-
-
+
+
អរគុណ,
ក្រុម {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/km.email.auth.invitation.tpl b/app/config/locales/templates/km.email.auth.invitation.tpl
index 910a14451f..a366ed73e9 100644
--- a/app/config/locales/templates/km.email.auth.invitation.tpl
+++ b/app/config/locales/templates/km.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
សួស្ដី,
-
-
+
+
សារអេឡិចត្រូនិចនេះត្រូវបានផ្ញើទៅអ្នកដោយសារ {{owner}} ចង់អញ្ជើញអ្នកឲ្យក្លាយជាសមាជិកនៅក្រុម {{team}} លើ {{project}}។
-
-
+
+
តាមតំណនេះដើម្បីចូលរួមក្នុងក្រុម {{team}}៖
-
- {{redirect}}
-
-
+
+{{cta}}
+
ប្រសិនបើអ្នកមិនចាប់អារម្មណ៍ អ្នកអាចមិនអើពើនឹងសារនេះបាន។
-
-
+
+
អរគុណ,
ក្រុម {{project}}
-
+
diff --git a/app/config/locales/templates/km.email.auth.recovery.tpl b/app/config/locales/templates/km.email.auth.recovery.tpl
index 138997623b..578fe15d14 100644
--- a/app/config/locales/templates/km.email.auth.recovery.tpl
+++ b/app/config/locales/templates/km.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
សួស្ដី {{name}},
-
-
+
+
តាមតំណនេះដើម្បីកំណត់ពាក្យសម្ងាត់នៃ {{project}} របស់អ្នកឡើងវិញ។
-
- {{redirect}}
-
-
+
+{{cta}}
+
ប្រសិនបើអ្នកពុំបានស្នើសុំកំណត់ពាក្យសម្ងាត់របស់អ្នកឡើងវិញទេ អ្នកអាចមិនអើពើនឹងសារនេះបាន។
-
-
+
+
អរគុណ,
ក្រុម {{project}}
-
+
diff --git a/app/config/locales/templates/ko.email.auth.confirm.tpl b/app/config/locales/templates/ko.email.auth.confirm.tpl
index e3c6070d55..bf9bfd1c08 100644
--- a/app/config/locales/templates/ko.email.auth.confirm.tpl
+++ b/app/config/locales/templates/ko.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
안녕하세요 {{name}}님,
-
-
+
+
회원님 이메일을 인증하러 아래 링크를 클릭하세요.
-
- {{redirect}}
-
-
+
+{{cta}}
+
만약 인증 요청하지 않으셨다면 이 이메일을 무시하세요.
-
-
+
+
감사합니다!
{{project}}팀 드림
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/ko.email.auth.invitation.tpl b/app/config/locales/templates/ko.email.auth.invitation.tpl
index 4fc62b8516..21ed74de68 100644
--- a/app/config/locales/templates/ko.email.auth.invitation.tpl
+++ b/app/config/locales/templates/ko.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
안녕하세요,
-
-
+
+
{{owner}}님이 {{project}}프로젝트의 {{team}}팀에 초대했습니다.
-
-
+
+
아래 링크를 통하여 {{team}}팀에 합류해주시면 됩니다.
-
- {{redirect}}
-
-
+
+{{cta}}
+
만약 합류에 관심 없으시면 이 이메일을 무시하세요.
-
-
+
+
감사합니다!
{{project}}팀 드림
-
+
diff --git a/app/config/locales/templates/ko.email.auth.recovery.tpl b/app/config/locales/templates/ko.email.auth.recovery.tpl
index bf73a93058..5445ef6a3e 100644
--- a/app/config/locales/templates/ko.email.auth.recovery.tpl
+++ b/app/config/locales/templates/ko.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
안녕하세요 {{name}}님,
-
-
+
+
{{project}} 비밀번호 재설정하러 아래 링크를 클릭하세요.
-
- {{redirect}}
-
-
+
+{{cta}}
+
만약 회원님이 비밀번호 재설정 요청하지 않으셨다면 이 이메일을 무시하세요.
-
-
+
+
감사합니다!
{{project}}팀 드림
-
+
diff --git a/app/config/locales/templates/lt.email.auth.confirm.tpl b/app/config/locales/templates/lt.email.auth.confirm.tpl
index f1bc439b11..d7514cc25b 100644
--- a/app/config/locales/templates/lt.email.auth.confirm.tpl
+++ b/app/config/locales/templates/lt.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Sveiki, {{name}},
-
-
+
+
Paspauskite nuorodą, kad patvirtinti savo el. paštą.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jei neprašėte el. pašto patvirtinimo, ignoruokite šį laišką
-
-
+
+
Ačiū,
komanda {{project}}
-
+
diff --git a/app/config/locales/templates/lt.email.auth.invitation.tpl b/app/config/locales/templates/lt.email.auth.invitation.tpl
index 0c40a3cbc3..2eb630b5bd 100644
--- a/app/config/locales/templates/lt.email.auth.invitation.tpl
+++ b/app/config/locales/templates/lt.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Sveiki,
-
-
+
+
Šis laiškas buvo išsiųstas dėl to, kad {{owner}} kviečia tapti komandos {{team}} nariu projekte {{project}}.
-
-
+
+
Paspauskite nuorodą, kad prisijungti prie komandos {{team}} :
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jei Jums neįdomu, ignoruokite šį laišką.
-
-
+
+
Ačiū,
komanda {{project}}
-
+
diff --git a/app/config/locales/templates/lt.email.auth.recovery.tpl b/app/config/locales/templates/lt.email.auth.recovery.tpl
index 7aba4cd2ce..0ed8354918 100644
--- a/app/config/locales/templates/lt.email.auth.recovery.tpl
+++ b/app/config/locales/templates/lt.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Sveiki, {{name}},
-
-
+
+
Paspauskite nuorodą, kad pakeisti slaptožodį projektui {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jei neprašėte atkurti slaptažodžio, ignoruokite šį laišką.
-
-
+
+
Ačiū,
komanda {{project}}
-
+
diff --git a/app/config/locales/templates/ml.email.auth.confirm.tpl b/app/config/locales/templates/ml.email.auth.confirm.tpl
index 14746f04a5..b4f0724d70 100644
--- a/app/config/locales/templates/ml.email.auth.confirm.tpl
+++ b/app/config/locales/templates/ml.email.auth.confirm.tpl
@@ -1,28 +1,19 @@
-
-
-
+
നമസ്കാരം {{name}},
-
-
+
+
താങ്കളുടെ ഇമെയിൽ ഐഡി വെരിഫൈ ചെയ്യുന്നതിന് താഴെ കാണുന്ന ലിങ്കിൽ ക്ലിക്ക് ചെയ്യൂ
-
- {{redirect}}
-
-
+
+{{cta}}
+
ഇമെയിൽ ഐഡി വെരിഫൈ ചെയ്യേണ്ടെങ്കിൽ ഈ മെസ്സേജ് ഇഗ്നോർ ചെയ്യാം
-
-
+
+
നന്ദി
{{project}} ടീം.
-
+
diff --git a/app/config/locales/templates/ml.email.auth.invitation.tpl b/app/config/locales/templates/ml.email.auth.invitation.tpl
index 5f16374dcd..06b5bdf08e 100644
--- a/app/config/locales/templates/ml.email.auth.invitation.tpl
+++ b/app/config/locales/templates/ml.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
നമസ്കാരം,
-
-
+
+
{{owner}} താങ്കളെ {{project}} പ്രോജക്ടിലെ {{team}} ടീമിൽ അംഗമാവാൻ ക്ഷണിച്ചിരിക്കുന്നു.
-
-
+
+
{{team}} ടീമിൽ ചേരുവാൻ താഴെ കാണുന്ന ലിങ്കിൽ ക്ലിക്ക് ചെയ്യൂ.
-
- {{redirect}}
-
-
+
+{{cta}}
+
താൽപര്യമില്ലെങ്കിൽ ഈ മെസ്സേജ് ഇഗ്നോർ ചെയ്യാം
-
-
+
+
നന്ദി,
{{project}} ടീം.
-
+
diff --git a/app/config/locales/templates/ml.email.auth.recovery.tpl b/app/config/locales/templates/ml.email.auth.recovery.tpl
index ee1e73a52b..cf82e5c489 100644
--- a/app/config/locales/templates/ml.email.auth.recovery.tpl
+++ b/app/config/locales/templates/ml.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
നമസ്കാരം {{name}},
-
-
+
+
താങ്കളുടെ {{project}} പാസ്വേഡ് റീസെറ്റ് ചെയ്യാൻ താഴെ കാണുന്ന ലിങ്കിൽ ക്ലിക്ക് ചെയ്യുക
-
- {{redirect}}
-
-
+
+{{cta}}
+
പാസ്വേഡ് റീസെറ്റ് ചെയ്യാൻ താങ്കൾ റിക്വസ്റ്റ് ചെയ്തിട്ടില്ലെങ്കിൽ ദയവായി ഈ മെസ്സേജ് ഇഗ്നോർ ചെയ്യുക
-
-
+
+
നന്ദി,
{{project}} ടീം
-
+
diff --git a/app/config/locales/templates/my.email.auth.confirm.tpl b/app/config/locales/templates/my.email.auth.confirm.tpl
index 65a224c51f..174b100e02 100644
--- a/app/config/locales/templates/my.email.auth.confirm.tpl
+++ b/app/config/locales/templates/my.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hello {{name}},
-
-
+
+
Ikuti pautan ini untuk mengesahkan alamat e-mel anda.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jika anda tidak meminta untuk mengesahkan alamat ini, anda boleh mengabaikan mesej ini.
-
-
+
+
Terima kasih,
Kumpulan {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/my.email.auth.invitation.tpl b/app/config/locales/templates/my.email.auth.invitation.tpl
index 891e1eb4de..66e38bb608 100644
--- a/app/config/locales/templates/my.email.auth.invitation.tpl
+++ b/app/config/locales/templates/my.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Hello,
-
-
+
+
E-mel ini dihantar kepada anda kerana {{owner}}ingin mengundang Anda untuk menjadi anggota kumpulan {{team}} di dalam {{project}}.
-
-
+
+
Ikuti pautan ini untuk menyertai kumpulan {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Sekiranya anda tidak berminat,anda boleh mengabaikan mesej ini.
-
-
+
+
Terima Kasih,
Kumpulan {{project}}
-
+
diff --git a/app/config/locales/templates/my.email.auth.recovery.tpl b/app/config/locales/templates/my.email.auth.recovery.tpl
index 25f81408d7..a14c78cb59 100644
--- a/app/config/locales/templates/my.email.auth.recovery.tpl
+++ b/app/config/locales/templates/my.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hello {{name}},
-
-
+
+
Ikuti pautan ini sekiranya anda mahu menetapkan semula kata laluan {{project}} anda.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Sekiranya anda tidak meminta untuk menetapkan semula kata laluan anda,anda boleh sahaja mengabaikan mesej ini.
-
-
+
+
Terima Kasih,
Kumpulan {{project}}
-
+
diff --git a/app/config/locales/templates/nl.email.auth.confirm.tpl b/app/config/locales/templates/nl.email.auth.confirm.tpl
index 513593bfc6..04f6a14ccf 100644
--- a/app/config/locales/templates/nl.email.auth.confirm.tpl
+++ b/app/config/locales/templates/nl.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hallo {{name}},
-
-
+
+
Klink op deze link om uw emailadres te valideren.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Als u niet heeft gevraagd om dit adres te verifiëren, kunt u dit bericht negeren.
-
-
+
+
Bedankt,
{{project}} team
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/nl.email.auth.invitation.tpl b/app/config/locales/templates/nl.email.auth.invitation.tpl
index 252e104aff..75ac6f4510 100644
--- a/app/config/locales/templates/nl.email.auth.invitation.tpl
+++ b/app/config/locales/templates/nl.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Hallo,
-
-
+
+
Deze mail is naar je gestuurd omdat {{owner}} wilde dat u een lid zou worden in het {{team}} team voor {{project}}.
-
-
+
+
Volg deze link om het team te joinen {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
ALs u niet geïnteresseerd bent, kunt u dit bericht negeren.
-
-
+
+
Bedankt,
{{project}} team
-
+
diff --git a/app/config/locales/templates/nl.email.auth.recovery.tpl b/app/config/locales/templates/nl.email.auth.recovery.tpl
index 2c4d5952a2..4c7ac87961 100644
--- a/app/config/locales/templates/nl.email.auth.recovery.tpl
+++ b/app/config/locales/templates/nl.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hallo {{name}},
-
-
+
+
Klik op deze link om uw {{project}} wachtwoord te resetten.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Als u niet gevraagd heeft om uw wachtwoord te resetten, kunt u dit bericht negeren.
-
-
+
+
Bedankt,
{{project}} team
-
+
diff --git a/app/config/locales/templates/no.email.auth.confirm.tpl b/app/config/locales/templates/no.email.auth.confirm.tpl
index abe17ff65f..63c906cdf5 100644
--- a/app/config/locales/templates/no.email.auth.confirm.tpl
+++ b/app/config/locales/templates/no.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hei {{name}},
-
-
+
+
Følg denne lenken for å verifisere din e-postadresse.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Hvis du ikke har spurt om å verifisere din e-post, kan du ignorere denne meldingen.
-
-
+
+
Hilsen,
{{project}}-teamet
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/no.email.auth.invitation.tpl b/app/config/locales/templates/no.email.auth.invitation.tpl
index c56e913d3d..00cd9defe5 100644
--- a/app/config/locales/templates/no.email.auth.invitation.tpl
+++ b/app/config/locales/templates/no.email.auth.invitation.tpl
@@ -1,28 +1,19 @@
-
-
-
+
Hei,
-
-
+
+
Denne mailen ble sendt til deg fordi {{owner}} har invitert deg til å bli medlem av {{team}}-teamet på {{project}}.
-
-
+
+
Follow this link to join the {{team}} team:
Følg denne lenken for å bli med på {{team}}-teamet:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Hvis du ikke er interresert kan du ignorere denne meldingen.
-
-
+
+
Hilsen,
{{project}}-teamet
-
+
diff --git a/app/config/locales/templates/no.email.auth.recovery.tpl b/app/config/locales/templates/no.email.auth.recovery.tpl
index 75b8be0e96..472674be31 100644
--- a/app/config/locales/templates/no.email.auth.recovery.tpl
+++ b/app/config/locales/templates/no.email.auth.recovery.tpl
@@ -1,25 +1,16 @@
-
-
-
+
Hei {{name}},
-
-
+
+
Follow this link to reset your {{project}} password.
Følg denne lenken for å tilbakestille ditt {{project}}-passord.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Hvis du ikke har spurt om å tilbakestille passordet ditt, kan du ignorere denne meldingen.
-
-
+
+
Hilsen,
{{project}}-teamet
-
+
diff --git a/app/config/locales/templates/ph.email.auth.confirm.tpl b/app/config/locales/templates/ph.email.auth.confirm.tpl
index 08a9b6d639..63e5db58db 100644
--- a/app/config/locales/templates/ph.email.auth.confirm.tpl
+++ b/app/config/locales/templates/ph.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Kamusta {{name}},
-
-
+
+
Sundun ang link na ito upang ma-verify ang iyong email address.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Kung hindi mo hiniling na i-verify ang address na ito, maaari mong balewalain ang mensaheng ito.
-
-
+
+
Salamat,
Pangkat ng {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/ph.email.auth.invitation.tpl b/app/config/locales/templates/ph.email.auth.invitation.tpl
index f8a8668e50..23916efb0c 100644
--- a/app/config/locales/templates/ph.email.auth.invitation.tpl
+++ b/app/config/locales/templates/ph.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Kamusta,
-
-
+
+
Ipinadala ang email na ito sa iyo dahil nais kang anyayahan ni {{ owner }} upang maging isang kasapi ng pangkat ng {{ team }} sa {{ project }}.
-
-
+
+
Sundan ang link na ito upang sumali sa pangkat ng {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Kung hindi ka interesado, maari mong balewalain ang mensahing ito.
-
-
+
+
Salamat,
Pangkat ng {{project}}
-
+
diff --git a/app/config/locales/templates/ph.email.auth.recovery.tpl b/app/config/locales/templates/ph.email.auth.recovery.tpl
index abf1b780ef..c9096076a9 100644
--- a/app/config/locales/templates/ph.email.auth.recovery.tpl
+++ b/app/config/locales/templates/ph.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Kamusta {{name}},
-
-
+
+
Sundan ang link na ito updang i-reset ang iyong password sa {{ project }}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Kung hindi mo hiniling na i-reset ang iyong password, maaari mong balewalain ang mensahe na ito.
-
-
+
+
Salamat,
Pangkat ng {{project}}
-
+
diff --git a/app/config/locales/templates/pl.email.auth.confirm.tpl b/app/config/locales/templates/pl.email.auth.confirm.tpl
index e46187999f..5b797d331b 100644
--- a/app/config/locales/templates/pl.email.auth.confirm.tpl
+++ b/app/config/locales/templates/pl.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Witaj {{name}},
-
-
+
+
Kliknij ten link, aby zweryfikować swój adres e-mail.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jeśli nie prosiłeś o weryfikację tego adresu, możesz zignorować tę wiadomość.
-
-
+
+
Dziękujemy,
zespół {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/pl.email.auth.invitation.tpl b/app/config/locales/templates/pl.email.auth.invitation.tpl
index d11586de75..387b2e4ae8 100644
--- a/app/config/locales/templates/pl.email.auth.invitation.tpl
+++ b/app/config/locales/templates/pl.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Witaj,
-
-
+
+
Ta wiadomość została do Ciebie wysłana, ponieważ {{owner}} chciałby zaprosić Cię do dołączenia do zespołu {{team}} w {{project}}.
-
-
+
+
Kliknij ten link, aby dołączyć do zespołu {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jeśli nie jesteś zainteresowany, możesz zignorować tę wiadomość.
-
-
+
+
Dziękujemy,
zaspół {{project}}
-
+
diff --git a/app/config/locales/templates/pl.email.auth.recovery.tpl b/app/config/locales/templates/pl.email.auth.recovery.tpl
index 78066ee064..5b79846ae6 100644
--- a/app/config/locales/templates/pl.email.auth.recovery.tpl
+++ b/app/config/locales/templates/pl.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Witaj {{name}},
-
-
+
+
Kliknij ten link, aby zresetować hasło do {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Jeśli nie prosiłeś o zresetowanie hasła, możesz zignorować tę wiadomość.
-
-
+
+
Dziękujemy,
zaspół {{project}}
-
+
diff --git a/app/config/locales/templates/pn.email.auth.confirm.tpl b/app/config/locales/templates/pn.email.auth.confirm.tpl
index 3b31381808..c96d27dee1 100644
--- a/app/config/locales/templates/pn.email.auth.confirm.tpl
+++ b/app/config/locales/templates/pn.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
ਹੈਲੋ {{name}},
-
-
+
+
ਆਪਣੇ ਈਮੇਲ ਪਤੇ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਇਸ ਲਿੰਕ ਦਾ ਪਾਲਣ ਕਰੋ:
-
- {{redirect}}
-
-
+
+{{cta}}
+
ਜੇ ਤੁਸੀਂ ਇਸ ਪਤੇ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਲਈ ਨਹੀਂ ਕਿਹਾ, ਤਾਂ ਤੁਸੀਂ ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਨਜ਼ਰ ਅੰਦਾਜ਼ ਕਰ ਸਕਦੇ ਹੋ.
-
-
+
+
ਧੰਨਵਾਦ,
{{project}} ਟੀਮ
-
+
diff --git a/app/config/locales/templates/pn.email.auth.invitation.tpl b/app/config/locales/templates/pn.email.auth.invitation.tpl
index 2b0a5fd279..6280d951a1 100644
--- a/app/config/locales/templates/pn.email.auth.invitation.tpl
+++ b/app/config/locales/templates/pn.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
ਸਤ ਸ੍ਰੀ ਅਕਾਲ,
-
-
+
+
ਇਹ ਮੇਲ ਤੁਹਾਨੂੰ ਇਸ ਲਈ ਭੇਜਿਆ ਗਿਆ ਸੀ ਕਿਉਂਕਿ {{owner}} b> ਤੁਹਾਨੂੰ {{team} at ਟੀਮ {{project}} 'ਤੇ ਟੀਮ ਦੇ ਮੈਂਬਰ ਬਣਨ ਲਈ ਸੱਦਾ ਦੇਣਾ ਚਾਹੁੰਦਾ ਸੀ.
-
-
+
+
{{team}} b> ਟੀਮ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਇਸ ਲਿੰਕ ਦਾ ਪਾਲਣ ਕਰੋ:
-
- {{redirect}}
-
-
+
+{{cta}}
+
ਜੇ ਤੁਸੀਂ ਦਿਲਚਸਪੀ ਨਹੀਂ ਰੱਖਦੇ, ਤਾਂ ਤੁਸੀਂ ਇਸ ਸੰਦੇਸ਼ ਨੂੰ ਨਜ਼ਰ ਅੰਦਾਜ਼ ਕਰ ਸਕਦੇ ਹੋ.
-
-
+
+
ਧੰਨਵਾਦ,
{{project}} ਟੀਮ
-
+
diff --git a/app/config/locales/templates/pn.email.auth.recovery.tpl b/app/config/locales/templates/pn.email.auth.recovery.tpl
index e85026a203..cdb4fd069d 100644
--- a/app/config/locales/templates/pn.email.auth.recovery.tpl
+++ b/app/config/locales/templates/pn.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
ਸਤ ਸ੍ਰੀ ਅਕਾਲ {{name}},
-
-
+
+
ਆਪਣੇ {{project}} ਪਾਸਵਰਡ ਨੂੰ ਰੀਸੈਟ ਕਰਨ ਲਈ ਇਸ ਲਿੰਕ ਦਾ ਪਾਲਣ ਕਰੋ.
-
- {{redirect}}
-
-
+
+{{cta}}
+
ਜੇ ਤੁਸੀਂ ਆਪਣਾ ਪਾਸਵਰਡ ਰੀਸੈਟ ਕਰਨ ਲਈ ਨਹੀਂ ਕਿਹਾ, ਤਾਂ ਤੁਸੀਂ ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਨਜ਼ਰ ਅੰਦਾਜ਼ ਕਰ ਸਕਦੇ ਹੋ.
-
-
+
+
ਧੰਨਵਾਦ,
{{project}} ਟੀਮ
-
+
diff --git a/app/config/locales/templates/pt-br.email.auth.confirm.tpl b/app/config/locales/templates/pt-br.email.auth.confirm.tpl
index 7cb959914e..f7ffdd8c38 100644
--- a/app/config/locales/templates/pt-br.email.auth.confirm.tpl
+++ b/app/config/locales/templates/pt-br.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Olá {{name}},
-
-
+
+
Por favor, confirme o seu email acessando o link abaixo.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Caso a confirmação de email não foi solicitada por você, ignore esta mensagem.
-
-
+
+
Atenciosamente,
Equipe {{project}}
-
+
diff --git a/app/config/locales/templates/pt-br.email.auth.invitation.tpl b/app/config/locales/templates/pt-br.email.auth.invitation.tpl
index f4255ffafa..b0de23b3fd 100644
--- a/app/config/locales/templates/pt-br.email.auth.invitation.tpl
+++ b/app/config/locales/templates/pt-br.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Olá,
-
-
+
+
Este email foi enviado a você porque
{{owner}} deseja convidá-lo para se tornar membro da equipe {{team}} no {{project}}.
-
-
+
+
Entre no link abaixo para se juntar a equipe {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Caso não estiver interessado, por favor ignore esta mensagem.
-
-
+
+
Atenciosamente,
Equipe {{project}}
-
+
diff --git a/app/config/locales/templates/pt-br.email.auth.recovery.tpl b/app/config/locales/templates/pt-br.email.auth.recovery.tpl
index e2d710f38f..40842104eb 100644
--- a/app/config/locales/templates/pt-br.email.auth.recovery.tpl
+++ b/app/config/locales/templates/pt-br.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Olá {{name}},
-
-
+
+
Acesse o link abaixo para redefinir sua senha do {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Caso você não solicitou a redefinição de senha, por favor ignore esta mensagem.
-
-
+
+
Atenciosamente,
Equipe {{project}}
-
+
diff --git a/app/config/locales/templates/pt-pt.email.auth.confirm.tpl b/app/config/locales/templates/pt-pt.email.auth.confirm.tpl
index d2209883cc..a2d8998f3c 100644
--- a/app/config/locales/templates/pt-pt.email.auth.confirm.tpl
+++ b/app/config/locales/templates/pt-pt.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Olá {{name}},
-
-
+
+
Por favor, confirme o seu email através do link abaixo.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Se não solicitou a confirmação de email, por favor ignore esta mensagem.
-
-
+
+
Com os melhores cumprimentos,
Equipa {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/pt-pt.email.auth.invitation.tpl b/app/config/locales/templates/pt-pt.email.auth.invitation.tpl
index 429a30be9a..c0bdfa4136 100644
--- a/app/config/locales/templates/pt-pt.email.auth.invitation.tpl
+++ b/app/config/locales/templates/pt-pt.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Olá,
-
-
+
+
Recebeu este email porque
{{owner}} deseja convidá-lo a tornar-se membro da equipa {{team}} no {{project}}.
-
-
+
+
Use este link para se juntar à equipa {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Se não estiver interessado, por favor ignore esta mensagem.
-
-
+
+
Com os melhores cumprimentos,
Equipa {{project}}
-
+
diff --git a/app/config/locales/templates/pt-pt.email.auth.recovery.tpl b/app/config/locales/templates/pt-pt.email.auth.recovery.tpl
index 7c89f1b729..ae09ac0998 100644
--- a/app/config/locales/templates/pt-pt.email.auth.recovery.tpl
+++ b/app/config/locales/templates/pt-pt.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Olá {{name}},
-
-
+
+
Use este link para repor a sua palavra-passe {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Se não solicitou a reposição da sua palavra-passe, por favor ignore esta mensagem.
-
-
+
+
Com os melhores cumprimentos,
Equipa {{project}}
-
+
diff --git a/app/config/locales/templates/ro.email.auth.confirm.tpl b/app/config/locales/templates/ro.email.auth.confirm.tpl
index e5672f6d9a..133fe2a189 100644
--- a/app/config/locales/templates/ro.email.auth.confirm.tpl
+++ b/app/config/locales/templates/ro.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Salut {{name}},
-
-
+
+
Accesează link-ul următor pentru a-ți confirma mail-ul.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Dacă nu ai solicitat acest mail, te rugăm frumos să îl ignori.
-
-
+
+
Mulțumim,
Echipa {{project}}
-
+
diff --git a/app/config/locales/templates/ro.email.auth.invitation.tpl b/app/config/locales/templates/ro.email.auth.invitation.tpl
index 477ecfe84b..04cdf9e0bd 100644
--- a/app/config/locales/templates/ro.email.auth.invitation.tpl
+++ b/app/config/locales/templates/ro.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Salut,
-
-
+
+
Ai primit acest mail deoarece {{owner}} te-a invitat să faci parte din echipa {{team}} în proiectul {{project}}.
-
-
+
+
Accesează link-ul următor pentru a accepta invitația în echipa {{team}}:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Dacă nu ești interesat de această invitație, te rugăm frumos să o ignori.
-
-
+
+
Cu drag,
Echipa {{project}}
-
+
diff --git a/app/config/locales/templates/ro.email.auth.recovery.tpl b/app/config/locales/templates/ro.email.auth.recovery.tpl
index 2e934194bb..9e5f24cbea 100644
--- a/app/config/locales/templates/ro.email.auth.recovery.tpl
+++ b/app/config/locales/templates/ro.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Salut {{name}},
-
-
+
+
Accesează link-ul următor pentru a-ți reseta parola din proiectul {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Dacă nu ai solicitat acest mail, te rugăm frumos să îl ignori.
-
-
+
+
Cu drag,
Echipa {{project}}
-
+
diff --git a/app/config/locales/templates/ru.email.auth.confirm.tpl b/app/config/locales/templates/ru.email.auth.confirm.tpl
index 29993e988f..7e1c976c63 100644
--- a/app/config/locales/templates/ru.email.auth.confirm.tpl
+++ b/app/config/locales/templates/ru.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Здравствуйте, {{name}},
-
-
+
+
Перейдите по ссылке, чтобы подтвердить свой адрес электронной почты.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Если вы не запрашивали подтверждение этого адреса, проигнорируйте это сообщение.
-
-
+
+
Спасибо,
команда {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/ru.email.auth.invitation.tpl b/app/config/locales/templates/ru.email.auth.invitation.tpl
index 41de21d09f..7dc637a3de 100644
--- a/app/config/locales/templates/ru.email.auth.invitation.tpl
+++ b/app/config/locales/templates/ru.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Здравствуйте,
-
-
+
+
Это письмо отправлено вам, потому что {{owner}} приглашает стать членом команды {{team}} в проекте {{project}}.
-
-
+
+
Перейдите по ссылке, чтобы присоединиться к команде {{team}} :
-
- {{redirect}}
-
-
+
+{{cta}}
+
Если вы не заинтересованы, проигнорируйте это сообщение.
-
-
+
+
Спасибо,
команда {{project}}
-
+
diff --git a/app/config/locales/templates/ru.email.auth.recovery.tpl b/app/config/locales/templates/ru.email.auth.recovery.tpl
index 680278e42c..cdcc25ac05 100644
--- a/app/config/locales/templates/ru.email.auth.recovery.tpl
+++ b/app/config/locales/templates/ru.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Здравствуйте, {{name}},
-
-
+
+
Перейдите по ссылке, чтобы сбросить пароль для проекта {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Если вы не запрашивали сброс пароля, проигнорируйте это сообщение.
-
-
+
+
Спасибо,
команда {{project}}
-
+
diff --git a/app/config/locales/templates/si.email.auth.confirm.tpl b/app/config/locales/templates/si.email.auth.confirm.tpl
index c7be6ec681..aa1bc4f273 100644
--- a/app/config/locales/templates/si.email.auth.confirm.tpl
+++ b/app/config/locales/templates/si.email.auth.confirm.tpl
@@ -1,25 +1,16 @@
-
-
-
+
ආයුබෝවන් {{name}},
-
-
+
+
ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කිරීමට මෙම සබැඳිය අනුගමනය කරන්න.
-
- {{redirect}}
-
-
+
+{{cta}}
+
ඔබ මෙම ලිපිනය සත්යාපනය කිරීමට ඉල්ලා නොසිටියේ නම්, ඔබට මෙම පණිවිඩය නොසලකා හැරිය හැක.
-
-
+
+
ස්තූතියි,
{{project}} කණ්ඩායම
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/si.email.auth.invitation.tpl b/app/config/locales/templates/si.email.auth.invitation.tpl
index 1a0842d2e8..2fa979751e 100644
--- a/app/config/locales/templates/si.email.auth.invitation.tpl
+++ b/app/config/locales/templates/si.email.auth.invitation.tpl
@@ -1,31 +1,22 @@
-
-
-
+
ආයුබෝවන්,
-
-
+
+
මෙම තැපෑල ඔබ වෙත එවනු ලැබුවේ {{owner}}ට ඔබව , {{project}} ව්යාපෘතියෙහි {{team}} කණ්ඩායමේ කණ්ඩායම් සාමාජිකයෙකු වීමට ආරාධනා කිරීමට අවශ්ය වූ නිසාය.
-
-
+
+
{{team}} කණ්ඩායමට එක්වීමට මෙම සබැඳිය අනුගමනය කරන්න:
-
- {{redirect}}
-
-
+
+{{cta}}
+
ඔබ උනන්දුවක් නොදක්වන්නේ නම්, ඔබට මෙම පණිවිඩය නොසලකා හැරිය හැකිය.
-
-
+
+
ස්තූතියි,
{{project}} කණ්ඩායම.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/si.email.auth.recovery.tpl b/app/config/locales/templates/si.email.auth.recovery.tpl
index bcf32b61ba..d6d0551c29 100644
--- a/app/config/locales/templates/si.email.auth.recovery.tpl
+++ b/app/config/locales/templates/si.email.auth.recovery.tpl
@@ -1,25 +1,16 @@
-
-
-
+
ආයුබෝවන් {{name}},
-
-
+
+
ඔබගේ {{project}} ව්යාපෘතියෙහි මුරපදය නැවත සැකසීමට මෙම සබැඳිය අනුගමනය කරන්න
-
- {{redirect}}
-
-
+
+{{cta}}
+
ඔබගේ මුරපදය නැවත සැකසීමට ඔබ ඉල්ලා නොසිටියේ නම්, ඔබට මෙම පණිවිඩය නොසලකා හැරිය හැක.
-
-
+
+
ස්තූතියි,
{{project}} කණ්ඩායම
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/sl.email.auth.confirm.tpl b/app/config/locales/templates/sl.email.auth.confirm.tpl
index e7f15272da..fb6c4a59d1 100644
--- a/app/config/locales/templates/sl.email.auth.confirm.tpl
+++ b/app/config/locales/templates/sl.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Pozdravljeni {{name}},
-
-
+
+
Sledite tej povezavi za potrditev vašega email naslova.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Če niste zahtevali potrditve tega naslova, lahko to sporočilo prezrete.
-
-
+
+
Hvala,
{{project}} ekipa
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/sl.email.auth.invitation.tpl b/app/config/locales/templates/sl.email.auth.invitation.tpl
index 13467789a3..0dc64594b0 100644
--- a/app/config/locales/templates/sl.email.auth.invitation.tpl
+++ b/app/config/locales/templates/sl.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Pozdravljeni,
-
-
+
+
To sporočilo vam je bilo posredovano, ker vas je {{owner}} povabil/a, da postanete član {{team}} ekipe za {{project}}.
-
-
+
+
Sledite tej povezavi, da se pridružite {{team}} ekipi:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Če vas ne zanima, lahko to sporočilo prezrete.
-
-
+
+
Hvala,
{{project}} ekipa
-
+
diff --git a/app/config/locales/templates/sl.email.auth.recovery.tpl b/app/config/locales/templates/sl.email.auth.recovery.tpl
index 701805e12e..46b0e4ee5e 100644
--- a/app/config/locales/templates/sl.email.auth.recovery.tpl
+++ b/app/config/locales/templates/sl.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Pozdravljeni {{name}},
-
-
+
+
Za ponastavitev vašega {{project}} gesla sledite tej povezavi.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Če niste zahtevali ponastavitve gesla, lahko to sporočilo prezrete.
-
-
+
+
Hvala,
{{project}} ekipa
-
+
diff --git a/app/config/locales/templates/sv.email.auth.confirm.tpl b/app/config/locales/templates/sv.email.auth.confirm.tpl
index 0b1e4451ff..dc406e1857 100644
--- a/app/config/locales/templates/sv.email.auth.confirm.tpl
+++ b/app/config/locales/templates/sv.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hej {{name}},
-
-
+
+
Vänligen följ länken nedan för att verifiera din epostadress.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Om du inte vill verifiera din epostadress så kan du ignorera detta meddelande.
-
-
+
+
Tack,
{{project}}-teamet
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/sv.email.auth.invitation.tpl b/app/config/locales/templates/sv.email.auth.invitation.tpl
index 604e94227d..12f4ddf858 100644
--- a/app/config/locales/templates/sv.email.auth.invitation.tpl
+++ b/app/config/locales/templates/sv.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Hej,
-
-
+
+
{{owner}} vill bjuda in dig att bli del av {{team}}-teamet inom {{project}}.
-
-
+
+
Följ denna länk för att bli del av {{team}}-teamet:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Om du inte är intresserad så kan du ignorera detta meddelande.
-
-
+
+
Tack,
{{project}}-teamet
-
+
diff --git a/app/config/locales/templates/sv.email.auth.recovery.tpl b/app/config/locales/templates/sv.email.auth.recovery.tpl
index 673d914bd1..d781ed1075 100644
--- a/app/config/locales/templates/sv.email.auth.recovery.tpl
+++ b/app/config/locales/templates/sv.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Hej {{name}},
-
-
+
+
Följ denna länk för att ändra ditt {{project}} lösenord.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Om du inte bett om att ändra ditt lösenord så kan du ignorera detta meddelande.
-
-
+
+
Tack,
{{project}}-teamet
-
+
diff --git a/app/config/locales/templates/ta.email.auth.confirm.tpl b/app/config/locales/templates/ta.email.auth.confirm.tpl
index 25a34d067c..843ce248e1 100644
--- a/app/config/locales/templates/ta.email.auth.confirm.tpl
+++ b/app/config/locales/templates/ta.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
வணக்கம் {{name}},
-
-
+
+
இந்த இணைப்பைப் பின்தொடர்ந்து உங்கள் மின்னஞ்சல் முகவரியை சரிபார்க்கவும்.
-
- {{redirect}}
-
-
+
+{{cta}}
+
இந்த முகவரியை சரிபார்க்க நீங்கள் கேட்கவில்லை என்றால், இந்த செய்தியை நீங்கள் புறக்கணிக்கலாம்.
-
-
+
+
நன்றி,
{{project}} குழு
-
+
diff --git a/app/config/locales/templates/ta.email.auth.invitation.tpl b/app/config/locales/templates/ta.email.auth.invitation.tpl
index b9c417c269..00ec55d08a 100644
--- a/app/config/locales/templates/ta.email.auth.invitation.tpl
+++ b/app/config/locales/templates/ta.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
வணக்கம்,
-
-
+
+
இந்த மின்னஞ்சல் உங்களுக்கு அனுப்பப்பட்டது, ஏனெனில் {{owner}} உங்களை {{team}} குழுவின் {{project}} திட்டத்தில் உறுப்பினராக அழைக்க விரும்பினார்கள்.
-
-
+
+
இந்த இணைப்பைப் பின்தொடர்ந்து {{team}} குழுவில் சேரவும்:
-
- {{redirect}}
-
-
+
+{{cta}}
+
இந்த முகவரியை சரிபார்க்க நீங்கள் கேட்கவில்லை என்றால், இந்த செய்தியை நீங்கள் புறக்கணிக்கலாம்.
-
-
+
+
நன்றி,
{{project}} குழு
-
+
diff --git a/app/config/locales/templates/ta.email.auth.recovery.tpl b/app/config/locales/templates/ta.email.auth.recovery.tpl
index 455a6cf25b..36e9707f8d 100644
--- a/app/config/locales/templates/ta.email.auth.recovery.tpl
+++ b/app/config/locales/templates/ta.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
வணக்கம் {{name}},
-
-
+
+
இந்த இணைப்பைப் பின்தொடர்ந்து உங்கள் {{project}} திட்டத்தின் கடவுச்சொல்லை மீட்கவும்.
-
- {{redirect}}
-
-
+
+{{cta}}
+
உங்கள் கடவுச்சொல்லை மீட்டமைக்க நீங்கள் கேட்கவில்லை என்றால், இந்த செய்தியை நீங்கள் புறக்கணிக்கலாம்.
-
-
+
+
நன்றி,
{{project}} குழு
-
+
diff --git a/app/config/locales/templates/th.email.auth.confirm.tpl b/app/config/locales/templates/th.email.auth.confirm.tpl
index 99a6268ea7..c45fbf7d5d 100644
--- a/app/config/locales/templates/th.email.auth.confirm.tpl
+++ b/app/config/locales/templates/th.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
สวัสดี {{name}},
-
-
+
+
ตามไปยังลิงค์นี้เพื่อยืนยันที่อยู่อีเมลของคุณ
-
- {{redirect}}
-
-
+
+{{cta}}
+
หากคุณไม่ได้ขอให้ยืนยันที่อยู่นี้คุณสามารถเพิกเฉยต่อข้อความนี้ได้
-
-
+
+
ขอบคุณ,
ทีม {{project}}
-
+
diff --git a/app/config/locales/templates/th.email.auth.invitation.tpl b/app/config/locales/templates/th.email.auth.invitation.tpl
index 399e47c686..778613c72a 100644
--- a/app/config/locales/templates/th.email.auth.invitation.tpl
+++ b/app/config/locales/templates/th.email.auth.invitation.tpl
@@ -1,28 +1,19 @@
-
-
-
+
สวัสดี,
-
-
+
+
เมลนี้ส่งถึงคุณเพราะ {{owner}} ต้องการเชิญคุณเป็นสมาชิกในทีม {{team}} ของ {{project}}.
-
-
+
+
ตามลิงค์นี้เพื่อเข้าร่วม {{team}} ทีม:
-
- {{redirect}}
-
-
+
+{{cta}}
+
หากคุณไม่สนใจคุณสามารถละเว้นข้อความนี้
-
-
+
+
ขอบคุณ,
{{project}} ทีม
-
+
diff --git a/app/config/locales/templates/th.email.auth.recovery.tpl b/app/config/locales/templates/th.email.auth.recovery.tpl
index d835481dc4..220a193e19 100644
--- a/app/config/locales/templates/th.email.auth.recovery.tpl
+++ b/app/config/locales/templates/th.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
สวัสดี {{name}},
-
-
+
+
ตามไปยังลิงค์นี้เพื่อรีเซ็ตรหัสผ่าน {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
หากคุณไม่ได้ขอให้ตั้งรหัสผ่านใหม่คุณสามารถเพิกเฉยต่อข้อความนี้ได้
-
-
+
+
ขอบคุณ,
ทีม {{project}}
-
+
diff --git a/app/config/locales/templates/tr.email.auth.confirm.tpl b/app/config/locales/templates/tr.email.auth.confirm.tpl
index d83bda1e67..0ed2fa54c4 100644
--- a/app/config/locales/templates/tr.email.auth.confirm.tpl
+++ b/app/config/locales/templates/tr.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Merhaba {{name}},
-
-
+
+
Aşağıdaki bağlantıyı takip ederek email hesabınızı doğrulayın.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Bu adresi doğrulamayı istemediyseniz, bu mesajı yok sayabilirsiniz.
-
-
+
+
Teşekkürler,
{{project}} takımı
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/tr.email.auth.invitation.tpl b/app/config/locales/templates/tr.email.auth.invitation.tpl
index 07e8f06db4..c3c35b6bbd 100644
--- a/app/config/locales/templates/tr.email.auth.invitation.tpl
+++ b/app/config/locales/templates/tr.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Merhaba,
-
-
+
+
Bu posta size gönderildi, çünkü {{owner}} sizi {{project}} için {{team}} ekibinde takım üyesi olmaya davet etmek istedi.
-
-
+
+
Aşağıdaki bağlantıyı takip ederek {{team}} takımına takılın:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Eğer ilgilenmiyorsanız, bu mesajı yok sayabilirsiniz.
-
-
+
+
Teşekkürler,
{{project}} takımı
-
+
diff --git a/app/config/locales/templates/tr.email.auth.recovery.tpl b/app/config/locales/templates/tr.email.auth.recovery.tpl
index d04ffce5ee..4e7ce73d8e 100644
--- a/app/config/locales/templates/tr.email.auth.recovery.tpl
+++ b/app/config/locales/templates/tr.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Merhaba {{name}},
-
-
+
+
Aşağıdaki bağlantıyı takip ederek {{project}} şifresini değiştirin.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Eğer şifrenizi sıfırlamayı istemediyseniz, bu mesajı yok sayabilirsiniz.
-
-
+
+
Teşekkürler,
{{project}} takımı
-
+
diff --git a/app/config/locales/templates/ua.email.auth.confirm.tpl b/app/config/locales/templates/ua.email.auth.confirm.tpl
index 8d135457f0..ea628111cd 100644
--- a/app/config/locales/templates/ua.email.auth.confirm.tpl
+++ b/app/config/locales/templates/ua.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Вітаємо {{name}},
-
-
+
+
Перейдіть за цим посиланням, та підтвердіть свою електронну адресу
-
- {{redirect}}
-
-
+
+{{cta}}
+
Якщо ви не запитували підтвердження цієї адреси, проігноруйте це повідомлення.
-
-
+
+
Дякуємо,
команда {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/ua.email.auth.invitation.tpl b/app/config/locales/templates/ua.email.auth.invitation.tpl
index 8daaecbaaf..dc4d3aed02 100644
--- a/app/config/locales/templates/ua.email.auth.invitation.tpl
+++ b/app/config/locales/templates/ua.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Вітаємо,
-
-
+
+
Цей лист був надісланий вам тому що {{owner}} хоче запросити вас стати членом команди {{team}} у {{project}}.
-
-
+
+
Перейдіть за цим посиланням щоб приєднатись до команди {{team}} :
-
- {{redirect}}
-
-
+
+{{cta}}
+
Якщо ви не зацікавлені, проігноруйте це повідомлення.
-
-
+
+
Дякуємо,
Команда {{project}}
-
+
diff --git a/app/config/locales/templates/ua.email.auth.recovery.tpl b/app/config/locales/templates/ua.email.auth.recovery.tpl
index b833a6575a..0e1431bad9 100644
--- a/app/config/locales/templates/ua.email.auth.recovery.tpl
+++ b/app/config/locales/templates/ua.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Вітаємо, {{name}},
-
-
+
+
Перейдіть за цим посиланням для того щоб скинути свій пароль для {{project}} .
-
- {{redirect}}
-
-
+
+{{cta}}
+
Якщо ви не запитували скидання паролю, проігноруйте це повідомлення.
-
-
+
+
Дякуємо,
команда {{project}}
-
+
diff --git a/app/config/locales/templates/vi.email.auth.confirm.tpl b/app/config/locales/templates/vi.email.auth.confirm.tpl
index 40c7d496e1..463d26b1f3 100644
--- a/app/config/locales/templates/vi.email.auth.confirm.tpl
+++ b/app/config/locales/templates/vi.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Xin chào {{name}},
-
-
+
+
Hãy vào liên kết này để xác nhận địa chỉ email của bạn.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Xin hãy bỏ qua email này nếu bạn không yêu cầu xác nhận địa chỉ này.
-
-
+
+
Xin cảm ơn,
{{project}} team
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/vi.email.auth.invitation.tpl b/app/config/locales/templates/vi.email.auth.invitation.tpl
index 387c537f55..8d222ea8c7 100644
--- a/app/config/locales/templates/vi.email.auth.invitation.tpl
+++ b/app/config/locales/templates/vi.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
Xin chào,
-
-
+
+
Bạn nhận được email này vì {{owner}} muốn mời bạn tham gia {{project}} cùng với {{team}} team.
-
-
+
+
Hãy theo liên kết này để tham gia vào {{team}} team:
-
- {{redirect}}
-
-
+
+{{cta}}
+
Nếu bạn không thích tham gia, hãy bỏ qua lời nhắn này.
-
-
+
+
Xin cảm ơn,
{{project}} team
-
+
diff --git a/app/config/locales/templates/vi.email.auth.recovery.tpl b/app/config/locales/templates/vi.email.auth.recovery.tpl
index 57c704f0cd..9c7feb4900 100644
--- a/app/config/locales/templates/vi.email.auth.recovery.tpl
+++ b/app/config/locales/templates/vi.email.auth.recovery.tpl
@@ -1,24 +1,15 @@
-
-
-
+
Xin chào {{name}},
-
-
+
+
Hãy theo liên kết này để khôi phục mật khẩu của bạn ở {{project}}.
-
- {{redirect}}
-
-
+
+{{cta}}
+
Hãy bỏ qua lời nhắn này nếu bạn không yêu cầu khôi phục mật khẩu.
-
-
+
+
Xin cảm ơn,
{{project}} team
-
+
diff --git a/app/config/locales/templates/zh-cn.email.auth.confirm.tpl b/app/config/locales/templates/zh-cn.email.auth.confirm.tpl
index a557d451c7..9a0d7a3c8c 100644
--- a/app/config/locales/templates/zh-cn.email.auth.confirm.tpl
+++ b/app/config/locales/templates/zh-cn.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
{{name}} 你好,
-
-
+
+
请点击下方的链接验证你的电子邮箱地址。
-
- {{redirect}}
-
-
+
+{{cta}}
+
如果你没有请求验证本邮箱,请忽略这份邮件。
-
-
+
+
谢谢。
来自 {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/zh-cn.email.auth.invitation.tpl b/app/config/locales/templates/zh-cn.email.auth.invitation.tpl
index 7ee56a401a..4ef8caba5c 100644
--- a/app/config/locales/templates/zh-cn.email.auth.invitation.tpl
+++ b/app/config/locales/templates/zh-cn.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
你好,
-
-
+
+
{{owner}}邀请您加入{{project}}项目的{{team}}小组。
-
-
+
+
请点击下方的链接加入{{team}}小组:
-
- {{redirect}}
-
-
+
+{{cta}}
+
如果您没有加入该小组的计划,请忽略本邮件。
-
-
+
+
谢谢。
来自 {{project}}
-
+
diff --git a/app/config/locales/templates/zh-cn.email.auth.recovery.tpl b/app/config/locales/templates/zh-cn.email.auth.recovery.tpl
index 8a473b5537..1144b36b3c 100644
--- a/app/config/locales/templates/zh-cn.email.auth.recovery.tpl
+++ b/app/config/locales/templates/zh-cn.email.auth.recovery.tpl
@@ -1,25 +1,16 @@
-
-
-
+
{{name}} 你好,
-
-
+
+
请点击下方的链接重新设置{{project}}的密码。
Follow this link to reset your {{project}} password.
-
- {{redirect}}
-
-
+
+{{cta}}
+
如果您未曾申请重设密码,请忽略本邮件。
-
-
+
+
谢谢。
来自 {{project}}
-
+
diff --git a/app/config/locales/templates/zh-tw.email.auth.confirm.tpl b/app/config/locales/templates/zh-tw.email.auth.confirm.tpl
index 9ba081bb91..7a19636dbb 100644
--- a/app/config/locales/templates/zh-tw.email.auth.confirm.tpl
+++ b/app/config/locales/templates/zh-tw.email.auth.confirm.tpl
@@ -1,24 +1,15 @@
-
-
-
+
{{name}} 你好,
-
-
+
+
請點擊下方的鏈接驗證你的電子郵箱地址。
-
- {{redirect}}
-
-
+
+{{cta}}
+
如果你沒有請求驗證本郵箱,請忽略這份郵件。
-
-
+
+
謝謝。
來自 {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/zh-tw.email.auth.invitation.tpl b/app/config/locales/templates/zh-tw.email.auth.invitation.tpl
index 08fb921fd7..b5e6cc8225 100644
--- a/app/config/locales/templates/zh-tw.email.auth.invitation.tpl
+++ b/app/config/locales/templates/zh-tw.email.auth.invitation.tpl
@@ -1,27 +1,18 @@
-
-
-
+
你好,
-
-
+
+
{{owner}}邀請您加入{{project}}項目的{{team}}小組。
-
-
+
+
請點擊下方的鏈接加入{{team}}小組:
-
- {{redirect}}
-
-
+
+{{cta}}
+
如果您沒有加入該小組的計劃,請忽略本郵件。
-
-
+
+
謝謝。
來自 {{project}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/config/locales/templates/zh-tw.email.auth.recovery.tpl b/app/config/locales/templates/zh-tw.email.auth.recovery.tpl
index 8a473b5537..1144b36b3c 100644
--- a/app/config/locales/templates/zh-tw.email.auth.recovery.tpl
+++ b/app/config/locales/templates/zh-tw.email.auth.recovery.tpl
@@ -1,25 +1,16 @@
-
-
-
+
{{name}} 你好,
-
-
+
+
请点击下方的链接重新设置{{project}}的密码。
Follow this link to reset your {{project}} password.
-
- {{redirect}}
-
-
+
+{{cta}}
+
如果您未曾申请重设密码,请忽略本邮件。
-
-
+
+
谢谢。
来自 {{project}}
-
+
From f90552ccf8b189b1733eeae202f41ff61c72d970 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann
Date: Fri, 12 Jun 2020 19:56:22 +0200
Subject: [PATCH 06/14] fix tests and email clients blocking css
---
app/config/locales/templates/_base.tpl | 4 ++++
app/config/locales/templates/_cta.tpl | 9 ++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/app/config/locales/templates/_base.tpl b/app/config/locales/templates/_base.tpl
index aa79b7400c..f59b48494d 100644
--- a/app/config/locales/templates/_base.tpl
+++ b/app/config/locales/templates/_base.tpl
@@ -76,6 +76,10 @@
margin-bottom: 15px;
}
+ a {
+ word-break: break-all;
+ }
+
.btn {
box-sizing: border-box;
width: 100%;
diff --git a/app/config/locales/templates/_cta.tpl b/app/config/locales/templates/_cta.tpl
index 6cb2380e8d..634609a09e 100644
--- a/app/config/locales/templates/_cta.tpl
+++ b/app/config/locales/templates/_cta.tpl
@@ -16,4 +16,11 @@
-
\ No newline at end of file
+
+
+
+
+ {{redirect}}
+
+
+
\ No newline at end of file
From 06c61ec9179300985274616117169554dcf7cbee Mon Sep 17 00:00:00 2001
From: Torsten Dittmann
Date: Fri, 12 Jun 2020 20:21:58 +0200
Subject: [PATCH 07/14] add placeholders for colors
---
app/config/locales/templates/_base.tpl | 30 ++++++++++++++------------
app/controllers/api/account.php | 12 +++++++++++
app/controllers/api/teams.php | 6 ++++++
3 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/app/config/locales/templates/_base.tpl b/app/config/locales/templates/_base.tpl
index f59b48494d..561ce73855 100644
--- a/app/config/locales/templates/_base.tpl
+++ b/app/config/locales/templates/_base.tpl
@@ -7,7 +7,8 @@
{{title}}
-
+
| |
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index ee7896f096..17f138f457 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1086,6 +1086,12 @@ $utopia->post('/v1/account/recovery')
->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]']))
->setParam('{{name}}', $profile->getAttribute('name'))
->setParam('{{redirect}}', $url)
+ ->setParam('{{bg-body}}', '#f6f6f6')
+ ->setParam('{{bg-content}}', '#ffffff')
+ ->setParam('{{bg-cta}}', '#3498db')
+ ->setParam('{{bg-cta-hover}}', '#34495e')
+ ->setParam('{{text-content}}', '#000000')
+ ->setParam('{{text-cta}}', '#ffffff')
;
$mail = $register->get('smtp'); /* @var $mail \PHPMailer\PHPMailer\PHPMailer */
@@ -1241,6 +1247,12 @@ $utopia->post('/v1/account/verification')
->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]']))
->setParam('{{name}}', $user->getAttribute('name'))
->setParam('{{redirect}}', $url)
+ ->setParam('{{bg-body}}', '#f6f6f6')
+ ->setParam('{{bg-content}}', '#ffffff')
+ ->setParam('{{bg-cta}}', '#3498db')
+ ->setParam('{{bg-cta-hover}}', '#34495e')
+ ->setParam('{{text-content}}', '#000000')
+ ->setParam('{{text-cta}}', '#ffffff')
;
$mail = $register->get('smtp'); /* @var $mail \PHPMailer\PHPMailer\PHPMailer */
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index d41a713b86..2b49d6aa3f 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -329,6 +329,12 @@ $utopia->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-content}}', '#ffffff')
+ ->setParam('{{bg-cta}}', '#3498db')
+ ->setParam('{{bg-cta-hover}}', '#34495e')
+ ->setParam('{{text-content}}', '#000000')
+ ->setParam('{{text-cta}}', '#ffffff')
;
$mail = $register->get('smtp'); /* @var $mail \PHPMailer\PHPMailer\PHPMailer */
From 1688b96cff4390080615ba6adf1a18cac492bc5d Mon Sep 17 00:00:00 2001
From: Torsten Dittmann
Date: Sun, 14 Jun 2020 22:22:41 +0200
Subject: [PATCH 08/14] fix minor template bugs
---
app/config/locales/templates/cat.email.auth.invitation.tpl | 3 +--
app/config/locales/templates/es.email.auth.invitation.tpl | 2 +-
app/config/locales/templates/si.email.auth.recovery.tpl | 1 -
app/config/locales/templates/th.email.auth.invitation.tpl | 1 -
4 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/app/config/locales/templates/cat.email.auth.invitation.tpl b/app/config/locales/templates/cat.email.auth.invitation.tpl
index 1affb6506d..1a8b062531 100644
--- a/app/config/locales/templates/cat.email.auth.invitation.tpl
+++ b/app/config/locales/templates/cat.email.auth.invitation.tpl
@@ -2,8 +2,7 @@
Hola,
- T'hem enviat aquest correu perquè {{owner}} et vol convidar a formar part
- de l'equip {{team}} a {{project}}.
+ T'hem enviat aquest correu perquè {{owner}} et vol convidar a formar part de l'equip {{team}} a {{project}}.
Segueix aquest enllaç per unir-te a l'equip {{team}}:
diff --git a/app/config/locales/templates/es.email.auth.invitation.tpl b/app/config/locales/templates/es.email.auth.invitation.tpl
index 824f35518c..d07b7ffb55 100644
--- a/app/config/locales/templates/es.email.auth.invitation.tpl
+++ b/app/config/locales/templates/es.email.auth.invitation.tpl
@@ -9,7 +9,7 @@
{{cta}}
- Si no est�s interesado, puedes ignorar este mensaje.
+ Si no estás interesado, puedes ignorar este mensaje.
Gracias,
diff --git a/app/config/locales/templates/si.email.auth.recovery.tpl b/app/config/locales/templates/si.email.auth.recovery.tpl
index d6d0551c29..4df6902070 100644
--- a/app/config/locales/templates/si.email.auth.recovery.tpl
+++ b/app/config/locales/templates/si.email.auth.recovery.tpl
@@ -3,7 +3,6 @@
ඔබගේ {{project}} ව්යාපෘතියෙහි මුරපදය නැවත සැකසීමට මෙම සබැඳිය අනුගමනය කරන්න
-
{{cta}}
diff --git a/app/config/locales/templates/th.email.auth.invitation.tpl b/app/config/locales/templates/th.email.auth.invitation.tpl
index 778613c72a..918b28cc8f 100644
--- a/app/config/locales/templates/th.email.auth.invitation.tpl
+++ b/app/config/locales/templates/th.email.auth.invitation.tpl
@@ -2,7 +2,6 @@
สวัสดี,
-
เมลนี้ส่งถึงคุณเพราะ {{owner}} ต้องการเชิญคุณเป็นสมาชิกในทีม {{team}} ของ {{project}}.
From d6fffb045967e419fbaa06d939205d17ac2b2c6e Mon Sep 17 00:00:00 2001
From: Eldad Fux
Date: Mon, 15 Jun 2020 00:14:54 +0300
Subject: [PATCH 09/14] New OAuth grid
---
app/views/console/users/index.phtml | 45 ++++++++++++++++-------------
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index 5ae5725421..a391f67e09 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -298,20 +298,20 @@ $providers = $this->getParam('providers', []);
OAuth2 Providers
-
-
+
From d8ba32e8a24a30574e13b78165b3045783d3b993 Mon Sep 17 00:00:00 2001
From: Eldad Fux
Date: Mon, 15 Jun 2020 00:23:15 +0300
Subject: [PATCH 10/14] #413
---
CHANGES.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGES.md b/CHANGES.md
index d7902bbd8c..6a8c56c60c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@
- UI performance & accessibility improvments
- Updated ClamAV conntainer to version 1.0.9
- All emails are now sent asynchronously for improved performance (@TorstenDittmann)
+- Updated grid for OAuth2 providers list in the console
## Bug Fixes
From 565b2ca6315e8fe8c6a4b00b1ef924a9908c3265 Mon Sep 17 00:00:00 2001
From: "Eldad A. Fux"
Date: Mon, 15 Jun 2020 10:01:14 +0300
Subject: [PATCH 11/14] Update providers.php
---
app/config/providers.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/config/providers.php b/app/config/providers.php
index b1b086a865..505c2898c4 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -74,7 +74,7 @@ return [ // Ordered by ABC.
'mock' => false,
],
'google' => [
- 'developers' => 'https://developers.google.com/',
+ 'developers' => 'https://support.google.com/googleapi/answer/6158849',
'icon' => 'icon-google',
'enabled' => true,
'form' => false,
From 7e2bcce9fa3016e579d4ee80305184eceb29b873 Mon Sep 17 00:00:00 2001
From: "Eldad A. Fux"
Date: Mon, 15 Jun 2020 13:25:47 +0300
Subject: [PATCH 12/14] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index bc78047f0f..d0900ade4f 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
-[](https://discord.gg/GSeTUeA)
+[](https://discord.gg/GSeTUeA)
[](https://travis-ci.org/appwrite/appwrite)
[](https://travis-ci.org/appwrite/appwrite)
[](https://twitter.com/appwrite_io)
From 4bd84ea190b7504dd96ff4ac6691ea428b202c73 Mon Sep 17 00:00:00 2001
From: Rubens de Melo
Date: Mon, 15 Jun 2020 11:05:47 -0300
Subject: [PATCH 13/14] Fix pt-br email auth recover
Grammatical corrections
---
app/config/locales/templates/pt-br.email.auth.recovery.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/config/locales/templates/pt-br.email.auth.recovery.tpl b/app/config/locales/templates/pt-br.email.auth.recovery.tpl
index 40842104eb..5393316918 100644
--- a/app/config/locales/templates/pt-br.email.auth.recovery.tpl
+++ b/app/config/locales/templates/pt-br.email.auth.recovery.tpl
@@ -6,7 +6,7 @@
{{cta}}
- Caso você não solicitou a redefinição de senha, por favor ignore esta mensagem.
+ Caso não tenha solicitado a redefinição de senha, por favor ignore esta mensagem.
Atenciosamente,
From a102eb3938b848ecb78e6861295156a8153f030f Mon Sep 17 00:00:00 2001
From: Eldad Fux
Date: Mon, 15 Jun 2020 17:06:27 +0300
Subject: [PATCH 14/14] Fix for missing project ID error
---
app/init.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/init.php b/app/init.php
index 62508f44df..11f3c2b8b8 100644
--- a/app/init.php
+++ b/app/init.php
@@ -278,9 +278,10 @@ $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register))
$projectDB->setNamespace('app_'.$project->getId());
$projectDB->setMocks(Config::getParam('collections', []));
-$user = $projectDB->getDocument(Auth::$unique);
-
-if (APP_MODE_ADMIN === $mode) {
+if (APP_MODE_ADMIN !== $mode) {
+ $user = $projectDB->getDocument(Auth::$unique);
+}
+else {
$user = $consoleDB->getDocument(Auth::$unique);
$user