Rename function findByLocaleUserId to findByUserIdLocaleIndexByLocationId

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

diff --git a/Resources/views/mail/recover_mail.html.twig b/Resources/views/mail/recover_mail.html.twig
index 0cfc299506eb510176b190d0a01506129da24b75..3bdcb906e9164fe3363f511eace1626b68bb68c8 100644 (file)
--- a/Resources/views/mail/recover_mail.html.twig
+++ b/Resources/views/mail/recover_mail.html.twig
@@ -5,10 +5,10 @@
                <tr>
                        <td>&nbsp;</td>
                        <td>
                <tr>
                        <td>&nbsp;</td>
                        <td>

-                               <h2>{{ 'Subject: %subject%'|trans({'%subject%': 'welcome back to %site_title%'|trans({'%site_title%': site_title|trans})}) }}</h2>
-                               <p>{{ 'Thanks so much for rejoining %site_title%, the space reservation program.'|trans({'%site_title%': site_title|trans}) }}</p>
-                               <p>{% trans %}Your account password has been changed, to recover your account you can follow this link: {% endtrans %}</p>
-                               <p><a href="{{ recover_url }}">{{ recover_url }}</a></p>
+                               <h2>{{ 'Subject: %subject%'|trans({'%subject%': 'welcome back to %site.title%'|trans({'%site.title%': site.title})|raw}) }}</h2>
+                               <p>{{ 'Thanks so much for rejoining %site.title%, the space reservation program.'|trans({'%site.title%': site.title}) }}</p>
+                               <p>{{ 'Your account password has been changed, to recover your account you can follow this link: '|trans }}</p>
+                               <p><a href="{{ recover_url|escape('html_attr') }}">{{ recover_url }}</a></p>

                        </td>
                        <td>&nbsp;</td>
                </tr>
                        </td>
                        <td>&nbsp;</td>
                </tr>