From 41d9b5f8bac8bdbda6da8eaecc06c63a65658b0e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Wed, 27 Nov 2019 01:21:00 +0100
Subject: [PATCH] Remove useless translation Switch to base body Add proper
 escaping

---
 Resources/views/mail/body.html.twig         | 8 ++++----
 Resources/views/mail/recover.html.twig      | 8 ++++----
 Resources/views/mail/recover_mail.html.twig | 8 ++++----
 Resources/views/mail/register.html.twig     | 4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Resources/views/mail/body.html.twig b/Resources/views/mail/body.html.twig
index fd32b8b..6e580ea 100644
--- 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" />
@@ -17,14 +17,14 @@
 {% 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>
-			<td>{{ copy_long|trans }} - {{ copy_short|trans }}</td>
+			<td>{{ copy_long }} - {{ copy_short }}</td>
 		</tr>
 	</table>
 {% endblock %}
diff --git a/Resources/views/mail/recover.html.twig b/Resources/views/mail/recover.html.twig
index d7ed809..4f9d00d 100644
--- a/Resources/views/mail/recover.html.twig
+++ b/Resources/views/mail/recover.html.twig
@@ -5,10 +5,10 @@
 		<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>
diff --git a/Resources/views/mail/recover_mail.html.twig b/Resources/views/mail/recover_mail.html.twig
index 0cfc299..511b8cc 100644
--- 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>
-				<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>
diff --git a/Resources/views/mail/register.html.twig b/Resources/views/mail/register.html.twig
index b5228d2..7497c6e 100644
--- a/Resources/views/mail/register.html.twig
+++ b/Resources/views/mail/register.html.twig
@@ -5,9 +5,9 @@
 		<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>
-				<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>
-- 
2.41.0