Rename section to page.title

Rename description to page.description
Rename site_title to site.title
Cleanup

diff --git a/Resources/views/form/contact.html.twig b/Resources/views/form/contact.html.twig
index ee75ed07b5cb773ff1e602080787d58f1104fe56..783bc6e56e64f01f82fc469f8497ca95a4a5a99f 100644 (file)
--- a/Resources/views/form/contact.html.twig
+++ b/Resources/views/form/contact.html.twig
@@ -2,8 +2,8 @@
 {% block content %}
        <section id="form">
                <header>
 {% block content %}
        <section id="form">
                <header>

-                       <h2><a href="{{ path('rapsys_air_contact') }}">{{ section }}</a></h2>
-                       <p>{{ description }}</p>
+                       <h2><a href="{{ path('rapsys_air_contact') }}">{{ page.title }}</a></h2>
+                       <p>{{ page.description }}</p>

                </header>
                {% if sent %}
                        <p class="message notice">{% trans %}Your message has been sent{% endtrans %}</p>
                </header>
                {% if sent %}
                        <p class="message notice">{% trans %}Your message has been sent{% endtrans %}</p>

diff --git a/Resources/views/mail/recover.text.twig b/Resources/views/mail/recover.text.twig
index c6ef6dfa4009f19b94ff6a062ddc86f86be43097..f33fc09dd9e58ed578a40d1deba0c9d5eb45c0a2 100644 (file)
--- a/Resources/views/mail/recover.text.twig
+++ b/Resources/views/mail/recover.text.twig
@@ -2,7 +2,7 @@
 {% 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}) }}*
+*{{ '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}) }}
 

diff --git a/Resources/views/mail/recover_mail.text.twig b/Resources/views/mail/recover_mail.text.twig
index 6acbc4a699108f0d4917bd70bc49ad9fd29ee490..b5e09eab41eacb0c736041701a2926e4f2c1ea6c 100644 (file)
--- a/Resources/views/mail/recover_mail.text.twig
+++ b/Resources/views/mail/recover_mail.text.twig
@@ -2,7 +2,7 @@
 {% 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}) }}*

 
 {{ '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}) }}
 

diff --git a/Resources/views/mail/register.text.twig b/Resources/views/mail/register.text.twig
index 347ac5a8ec8733b793d5d3e53d61e39f2372c12e..06360f57a16593c195062bee3d8c1d90439af9b9 100644 (file)
--- a/Resources/views/mail/register.text.twig
+++ b/Resources/views/mail/register.text.twig
@@ -2,7 +2,7 @@
 {% 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}) }}*

 
 --
 
 
 --