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 c473b40773359c54d299c881e3e3443b64649489..e62dcc73d24c144403a8b70bf3eebdefc7f70360 100644 (file)
--- 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>
                        <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>
                        </td>
                        <td>&nbsp;</td>
                </tr>

diff --git a/Resources/views/mail/recover.text.twig b/Resources/views/mail/recover.text.twig
index f33fc09dd9e58ed578a40d1deba0c9d5eb45c0a2..eb567d7e2f4e236a5dd9a15d4330d35213cd5eac 100644 (file)
--- 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}) }}*
 
 
 *{{ '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 c01c1a78158a3d7a4396f71ff18b95f0b77b7912..0659b9f3eef9fbfea134a7202d8bd24e03e768ef 100644 (file)
--- 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>
                        <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>{{ '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>
                        </td>
                        <td>&nbsp;</td>
                </tr>

diff --git a/Resources/views/mail/register.text.twig b/Resources/views/mail/register.text.twig
index 06360f57a16593c195062bee3d8c1d90439af9b9..f50b97aca3a170c5b62796358b683d70d2d54c32 100644 (file)
--- 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}) }}*
 
 
 *{{ '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 }}
 --
 
 {{ copy.long }} - {{ copy.short }}