From e676d3f52f59de1689f6a6c98c18a27d54a7f773 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sat, 28 Aug 2021 10:21:20 +0200 Subject: [PATCH 1/1] Add confirm or recover link Set them as bigger link class Set recipient_name as optional in register mail template --- Resources/views/mail/recover.html.twig | 4 ++-- Resources/views/mail/recover.text.twig | 3 ++- Resources/views/mail/register.html.twig | 4 +++- Resources/views/mail/register.text.twig | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Resources/views/mail/recover.html.twig b/Resources/views/mail/recover.html.twig index c473b40..e62dcc7 100644 --- a/Resources/views/mail/recover.html.twig +++ b/Resources/views/mail/recover.html.twig @@ -7,8 +7,8 @@

{{ 'Subject: %subject%'|trans({'%subject%': subject})|raw }}

{{ 'Thanks so much for rejoining %site.title%, the space reservation program.'|trans({'%site.title%': site.title}) }}

-

{{ 'To recover your account you can follow this link: '|trans }}

-

{{ recover_url }}

+

{% trans %}To recover your account follow this link:{% endtrans %}

+

{{ recover_url }}

  diff --git a/Resources/views/mail/recover.text.twig b/Resources/views/mail/recover.text.twig index f33fc09..eb567d7 100644 --- a/Resources/views/mail/recover.text.twig +++ b/Resources/views/mail/recover.text.twig @@ -4,7 +4,8 @@ *{{ 'Thanks so much for rejoining %site.title%, the space reservation program.'|trans({'%site.title%': site.title}) }}* -{{ 'To recover your account you can follow this link: %recover_url%'|trans({'%recover_url%': recover_url}) }} +{% trans %}To recover your account follow this link:{% endtrans %} +{{ recover_url }} -- diff --git a/Resources/views/mail/register.html.twig b/Resources/views/mail/register.html.twig index c01c1a7..0659b9f 100644 --- a/Resources/views/mail/register.html.twig +++ b/Resources/views/mail/register.html.twig @@ -6,8 +6,10 @@  

{{ 'Subject: %subject%'|trans({'%subject%': 'welcome to %site.title%'|trans({'%site.title%': site.title})|raw}) }}

-

{{ 'Hi %recipient_name%,'|trans({'%recipient_name%': recipient_name}) }}

+

{% if recipient_name %}{{ 'Hi %recipient_name%,'|trans({'%recipient_name%': recipient_name}) }}{% else %}{% trans %}Hi,{% endtrans %}{% endif %}

{{ 'Thanks so much for joining %site.title%, the space reservation program.'|trans({'%site.title%': site.title}) }}

+

{% trans %}To create your account you must follow this link:{% endtrans %}

+

{{ confirm_url }}

  diff --git a/Resources/views/mail/register.text.twig b/Resources/views/mail/register.text.twig index 06360f5..f50b97a 100644 --- a/Resources/views/mail/register.text.twig +++ b/Resources/views/mail/register.text.twig @@ -4,6 +4,9 @@ *{{ 'Thanks so much for joining %site.title%, the space reservation program.'|trans({'%site.title%': site.title}) }}* +{% trans %}To create your account you must follow this link:{% endtrans %} +{{ confirm_url }} + -- {{ copy.long }} - {{ copy.short }} -- 2.41.1