Remove useless translation

Switch to base body
Add proper escaping

diff --git a/Resources/views/mail/body.html.twig b/Resources/views/mail/body.html.twig
index fd32b8b0833a14b1b4022424ac2e23b10f8c372b..6e580ea373260493dbcadff3ee771c94c7a7e210 100644 (file)
--- a/Resources/views/mail/body.html.twig
+++ b/Resources/views/mail/body.html.twig
@@ -1,4 +1,4 @@
-{% extends '@RapsysAir/mail/base.html.twig' %}
+{% extends '@RapsysAir/base.html.twig' %}

 {% block stylesheets %}
        <meta name="viewport" content="width=device-width" />
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 {% block stylesheets %}
        <meta name="viewport" content="width=device-width" />
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />


@@ -17,14 +17,14 @@
 {% block body %}
        <table class="header">
                <tr>
 {% block body %}
        <table class="header">
                <tr>

-                       <td><a href="{{ site_url }}"><img src="{{ email.image(site_logo) }}" alt="{{ site_title|trans }}" /></a></td>
-                       <td><h1><a href="{{ site_url }}">{{ site_title|trans }}</a></h1></td>
+                       <td><a href="{{ site_url|escape('html_attr') }}"><img src="{{ email.image(site_logo) }}" alt="{{ site_title|escape('html_attr') }}" /></a></td>
+                       <td><h1><a href="{{ site_url|escape('html_attr') }}">{{ site_title }}</a></h1></td>

                </tr>
        </table>
         {% block content %}{% endblock %}
        <table class="footer">
                <tr>
                </tr>
        </table>
         {% block content %}{% endblock %}
        <table class="footer">
                <tr>

-                       <td>{{ copy_long|trans }} - {{ copy_short|trans }}</td>
+                       <td>{{ copy_long }} - {{ copy_short }}</td>

                </tr>
        </table>
 {% endblock %}
                </tr>
        </table>
 {% endblock %}

diff --git a/Resources/views/mail/recover.html.twig b/Resources/views/mail/recover.html.twig
index d7ed80926daec97b8845394cd522199e8ca9a2d4..4f9d00d21c3c5fe77c05825cdb5e75a6fe51b134 100644 (file)
--- a/Resources/views/mail/recover.html.twig
+++ b/Resources/views/mail/recover.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 %}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>{{ '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>

diff --git a/Resources/views/mail/recover_mail.html.twig b/Resources/views/mail/recover_mail.html.twig
index 0cfc299506eb510176b190d0a01506129da24b75..511b8ccb061a8b77f7b0085d9b28194d48cc7508 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>

diff --git a/Resources/views/mail/register.html.twig b/Resources/views/mail/register.html.twig
index b5228d23ad6a631d54e1e2ed7e106ddb1206d05a..7497c6e17641a37f80b8a982ccc220f6e725ac3e 100644 (file)
--- a/Resources/views/mail/register.html.twig
+++ b/Resources/views/mail/register.html.twig
@@ -5,9 +5,9 @@
                <tr>
                        <td>&nbsp;</td>
                        <td>
                <tr>
                        <td>&nbsp;</td>
                        <td>

-                               <h2>{{ 'Subject: %subject%'|trans({'%subject%': 'welcome to %site_title%'|trans({'%site_title%': site_title|trans})}) }}</h2>
+                               <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>{{ '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>
+                               <p>{{ 'Thanks so much for joining %site_title%, the space reservation program.'|trans({'%site_title%': site_title}) }}</p>

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