Change copy and site flat keys to keytree

Prevent double translation

diff --git a/Resources/views/mail/body.html.twig b/Resources/views/mail/body.html.twig
index 6e580ea373260493dbcadff3ee771c94c7a7e210..89d84350bd72fdb638d6e5730b1668ed376c9f82 100644 (file)
--- a/Resources/views/mail/body.html.twig
+++ b/Resources/views/mail/body.html.twig
@@ -17,14 +17,14 @@
 {% block body %}
        <table class="header">
                <tr>
 {% 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>
                </tr>
        </table>
         {% block content %}{% endblock %}
        <table class="footer">
                <tr>

-                       <td>{{ copy_long }} - {{ copy_short }}</td>
+                       <td>{{ copy.long }} - {{ copy.short }}</td>

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

diff --git a/Resources/views/mail/contact.text.twig b/Resources/views/mail/contact.text.twig
index dda3abd9a34edfd7b83fb4b6e933241ee1642be1..16f64195242bfcb3ee1845292130d2591f1ce1c7 100644 (file)
--- 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 4f9d00d21c3c5fe77c05825cdb5e75a6fe51b134..c473b40773359c54d299c881e3e3443b64649489 100644 (file)
--- a/Resources/views/mail/recover.html.twig
+++ b/Resources/views/mail/recover.html.twig
@@ -5,8 +5,8 @@
                <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})|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>
                                <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 794d3759866f1fe0cf24c0d25999d6222d7fb9e3..c6ef6dfa4009f19b94ff6a062ddc86f86be43097 100644 (file)
--- 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 %}
 
 
 {% 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}) }}
 
 --
 
 
 {{ '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 511b8ccb061a8b77f7b0085d9b28194d48cc7508..3bdcb906e9164fe3363f511eace1626b68bb68c8 100644 (file)
--- 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>
                <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>
                                <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 5a440509e63e72506276d0147c47062208e935ad..6acbc4a699108f0d4917bd70bc49ad9fd29ee490 100644 (file)
--- 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 %}
 
 
 {% 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}) }}
 
 --
 
 
 {{ '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 7497c6e17641a37f80b8a982ccc220f6e725ac3e..c01c1a78158a3d7a4396f71ff18b95f0b77b7912 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})|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>
                                <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>
                        </td>
                        <td>&nbsp;</td>
                </tr>

diff --git a/Resources/views/mail/register.text.twig b/Resources/views/mail/register.text.twig
index b91e44246de6df1593c14763874c4f93f6fe0f05..347ac5a8ec8733b793d5d3e53d61e39f2372c12e 100644 (file)
--- 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 %}
 
 
 {% 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 }}