From 91aff369a60d88afc7d4f74114daf56a7d0bf1e7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Mon, 28 Dec 2020 09:14:18 +0100
Subject: [PATCH] Change copy and site flat keys to keytree Prevent double
 translation

---
 Resources/views/mail/body.html.twig         | 6 +++---
 Resources/views/mail/contact.text.twig      | 2 +-
 Resources/views/mail/recover.html.twig      | 4 ++--
 Resources/views/mail/recover.text.twig      | 4 ++--
 Resources/views/mail/recover_mail.html.twig | 4 ++--
 Resources/views/mail/recover_mail.text.twig | 4 ++--
 Resources/views/mail/register.html.twig     | 4 ++--
 Resources/views/mail/register.text.twig     | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Resources/views/mail/body.html.twig b/Resources/views/mail/body.html.twig
index 6e580ea..89d8435 100644
--- a/Resources/views/mail/body.html.twig
+++ b/Resources/views/mail/body.html.twig
@@ -17,14 +17,14 @@
 {% block body %}
 	<table class="header">
 		<tr>
-			<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>
+			<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 }} - {{ copy_short }}</td>
+			<td>{{ copy.long }} - {{ copy.short }}</td>
 		</tr>
 	</table>
 {% endblock %}
diff --git a/Resources/views/mail/contact.text.twig b/Resources/views/mail/contact.text.twig
index dda3abd..16f6419 100644
--- a/Resources/views/mail/contact.text.twig
+++ b/Resources/views/mail/contact.text.twig
@@ -6,4 +6,4 @@
 
 --
 
-{{ copy_long }} - {{ copy_short }}
+{{ copy.long }} - {{ copy.short }}
diff --git a/Resources/views/mail/recover.html.twig b/Resources/views/mail/recover.html.twig
index 4f9d00d..c473b40 100644
--- a/Resources/views/mail/recover.html.twig
+++ b/Resources/views/mail/recover.html.twig
@@ -5,8 +5,8 @@
 		<tr>
 			<td>&nbsp;</td>
 			<td>
-				<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>
+				<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>
 			</td>
diff --git a/Resources/views/mail/recover.text.twig b/Resources/views/mail/recover.text.twig
index 794d375..c6ef6df 100644
--- a/Resources/views/mail/recover.text.twig
+++ b/Resources/views/mail/recover.text.twig
@@ -2,10 +2,10 @@
 {% for i in range(1, subject|length) %}={% endfor %}
 
 
-*{{ 'Thanks so much for rejoining %site_title%, the space reservation program.'|trans({'%site_title%': site_title|trans}) }}*
+*{{ '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}) }}
 
 --
 
-{{ copy_long }} - {{ copy_short }}
+{{ copy.long }} - {{ copy.short }}
diff --git a/Resources/views/mail/recover_mail.html.twig b/Resources/views/mail/recover_mail.html.twig
index 511b8cc..3bdcb90 100644
--- a/Resources/views/mail/recover_mail.html.twig
+++ b/Resources/views/mail/recover_mail.html.twig
@@ -5,8 +5,8 @@
 		<tr>
 			<td>&nbsp;</td>
 			<td>
-				<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>
+				<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>
diff --git a/Resources/views/mail/recover_mail.text.twig b/Resources/views/mail/recover_mail.text.twig
index 5a44050..6acbc4a 100644
--- a/Resources/views/mail/recover_mail.text.twig
+++ b/Resources/views/mail/recover_mail.text.twig
@@ -2,10 +2,10 @@
 {% for i in range(1, subject|length) %}={% endfor %}
 
 
-*{{ 'Thanks so much for rejoining %site_title%, the space reservation program.'|trans({'%site_title%': site_title|trans}) }}*
+*{{ 'Thanks so much for rejoining %site.title%, the space reservation program.'|trans({'%site.title%': site.title|trans}) }}*
 
 {{ 'Your account password has been changed, to recover your account you can follow this link: %recover_url%'|trans({'%recover_url%': recover_url}) }}
 
 --
 
-{{ copy_long }} - {{ copy_short }}
+{{ copy.long }} - {{ copy.short }}
diff --git a/Resources/views/mail/register.html.twig b/Resources/views/mail/register.html.twig
index 7497c6e..c01c1a7 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})|raw}) }}</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}) }}</p>
+				<p>{{ 'Thanks so much for joining %site.title%, the space reservation program.'|trans({'%site.title%': site.title}) }}</p>
 			</td>
 			<td>&nbsp;</td>
 		</tr>
diff --git a/Resources/views/mail/register.text.twig b/Resources/views/mail/register.text.twig
index b91e442..347ac5a 100644
--- a/Resources/views/mail/register.text.twig
+++ b/Resources/views/mail/register.text.twig
@@ -2,8 +2,8 @@
 {% for i in range(1, subject|length) %}={% endfor %}
 
 
-*{{ 'Thanks so much for joining %site_title%, the space reservation program.'|trans({'%site_title%': site_title|trans}) }}*
+*{{ 'Thanks so much for joining %site.title%, the space reservation program.'|trans({'%site.title%': site.title|trans}) }}*
 
 --
 
-{{ copy_long }} - {{ copy_short }}
+{{ copy.long }} - {{ copy.short }}
-- 
2.41.1