Shorten air bundle route aliases

[airbundle] / Resources / views / mail / register.html.twig

diff --git a/Resources/views/mail/register.html.twig b/Resources/views/mail/register.html.twig
index b5228d23ad6a631d54e1e2ed7e106ddb1206d05a..fa82217d1ca177ee079e3cdad1e5374019cbf5af 100644 (file)
--- a/Resources/views/mail/register.html.twig
+++ b/Resources/views/mail/register.html.twig
@@ -1,13 +1,14 @@
-{% extends '@RapsysAir/mail/body.html.twig' %}
-{% block title %}{{ subject }}{% endblock %}
+{% extends '@RapsysAir/mail/base.html.twig' %}
 {% block content %}
        <table class="content">
                <tr>
                        <td>&nbsp;</td>
                        <td>
-                               <h2>{{ 'Subject: %subject%'|trans({'%subject%': 'welcome to %site_title%'|trans({'%site_title%': site_title|trans})}) }}</h2>
-                               <h3>{{ 'Hi %recipient_name%,'|trans({'%recipient_name%': recipient_name}) }}</h3>
-                               <p>{{ 'Thanks so much for joining %site_title%, the space reservation program.'|trans({'%site_title%': site_title|trans}) }}</p>
+                               <h2>{{ 'Subject: %subject%'|trans({'%subject%': 'welcome to %site.title%'|trans({'%site.title%': site.title})|raw}) }}</h2>
+                               <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>