From: Raphaël Gertz <git@rapsys.eu>
Date: Sat, 28 Aug 2021 08:21:20 +0000 (+0200)
Subject: Add confirm or recover link
X-Git-Tag: 0.2.0~25
X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/airbundle/commitdiff_plain/e676d3f52f59de1689f6a6c98c18a27d54a7f773?hp=b99f2af57efb16c003da2b62096d6e17cf3e08d1

Add confirm or recover link
Set them as bigger link class
Set recipient_name as optional in register mail template
---

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 @@
 			<td>
 				<h2>{{ 'Subject: %subject%'|trans({'%subject%': subject})|raw }}</h2>
 				<p>{{ 'Thanks so much for rejoining %site.title%, the space reservation program.'|trans({'%site.title%': site.title}) }}</p>
-				<p>{{ 'To recover your account you can follow this link: '|trans }}</p>
-				<p><a href="{{ recover_url|escape('html_attr') }}">{{ recover_url }}</a></p>
+				<p>{% trans %}To recover your account follow this link:{% endtrans %}</p>
+				<p><a href="{{ recover_url|escape('html_attr') }}" class="link">{{ recover_url }}</a></p>
 			</td>
 			<td>&nbsp;</td>
 		</tr>
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 @@
 			<td>&nbsp;</td>
 			<td>
 				<h2>{{ 'Subject: %subject%'|trans({'%subject%': 'welcome to %site.title%'|trans({'%site.title%': site.title})|raw}) }}</h2>
-				<h3>{{ 'Hi %recipient_name%,'|trans({'%recipient_name%': recipient_name}) }}</h3>
+				<h3>{% if recipient_name %}{{ 'Hi %recipient_name%,'|trans({'%recipient_name%': recipient_name}) }}{% else %}{% trans %}Hi,{% endtrans %}{% endif %}</h3>
 				<p>{{ 'Thanks so much for joining %site.title%, the space reservation program.'|trans({'%site.title%': site.title}) }}</p>
+				<p>{% trans %}To create your account you must follow this link:{% endtrans %}</p>
+				<p><a href="{{ confirm_url|escape('html_attr') }}" class="link">{{ confirm_url }}</a></p>
 			</td>
 			<td>&nbsp;</td>
 		</tr>
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 }}