Replace dropped site.title with title.site

diff --git a/Resources/config/packages/rapsysair.yaml b/Resources/config/packages/rapsysair.yaml
index fad52c86c81bdf82d19e0e096e78d4e2316a5abb..ee6ce479de2250e1f50b7027d458f050a4bdacff 100644 (file)
--- a/Resources/config/packages/rapsysair.yaml
+++ b/Resources/config/packages/rapsysair.yaml
@@ -89,7 +89,7 @@ rapsysuser:
                 title:
                     page: 'Recover'
         mail:
                 title:
                     page: 'Recover'
         mail:

-            subject: 'Welcome back %%recipient_name%% to %%site.title%%'
+            subject: 'Welcome back %%recipient_name%% to %%title.site%%'

             html: '@RapsysAir/mail/recover.html.twig'
             text: '@RapsysAir/mail/recover.text.twig'
             context:
             html: '@RapsysAir/mail/recover.html.twig'
             text: '@RapsysAir/mail/recover.text.twig'
             context:


@@ -111,7 +111,7 @@ rapsysuser:
                 title:
                     page: 'Register'
         mail:
                 title:
                     page: 'Register'
         mail:

-            subject: 'Welcome %%recipient_name%% to %%site.title%%'
+            subject: 'Welcome %%recipient_name%% to %%title.site%%'

             html: '@RapsysAir/mail/register.html.twig'
             text: '@RapsysAir/mail/register.text.twig'
             context:
             html: '@RapsysAir/mail/register.html.twig'
             text: '@RapsysAir/mail/register.text.twig'
             context:

diff --git a/Resources/translations/messages.en_gb.yaml b/Resources/translations/messages.en_gb.yaml
index baef62a2ef89e4a4c935abd9a9c4015c2c817a9f..5bb0f5d1651fcc95dc24d89a062ccd3c77a4b326 100644 (file)
--- a/Resources/translations/messages.en_gb.yaml
+++ b/Resources/translations/messages.en_gb.yaml
@@ -529,8 +529,8 @@
 'Temperature': 'Temperature'
 'terms of service': 'terms of service'
 'Terms of service': 'Terms of service'
 'Temperature': 'Temperature'
 'terms of service': 'terms of service'
 'Terms of service': 'Terms of service'

-'Thanks so much for joining %site.title%, the space reservation program.': 'Thanks so much for joining %site.title%, the space reservation program.'
-'Thanks so much for rejoining %site.title%, the space reservation program.': 'Thanks so much for rejoining %site.title%, the space reservation program.'
+'Thanks so much for joining %title.site%, the space reservation program.': 'Thanks so much for joining %title.site%, the space reservation program.'
+'Thanks so much for rejoining %title.site%, the space reservation program.': 'Thanks so much for rejoining %title.site%, the space reservation program.'

 'the afternoon': 'the afternoon'
 'the after': 'the after'
 'The dancer can follow an organizer by email.': 'The dancer can follow an organizer by email.'
 'the afternoon': 'the afternoon'
 'the after': 'the after'
 'The dancer can follow an organizer by email.': 'The dancer can follow an organizer by email.'


@@ -597,9 +597,9 @@
 'Website of %title': 'Website of %title%'
 'Website': 'Website'
 'Wednesday': 'Wednesday'
 'Website of %title': 'Website of %title%'
 'Website': 'Website'
 'Wednesday': 'Wednesday'

-'Welcome back %recipient_name% to %site.title%': 'Welcome back %recipient_name% to %site.title%'
-'Welcome %recipient_name% to %site.title%': 'Welcome %recipient_name% to %site.title%'
-'welcome to %site.title%': 'welcome to %site.title%'
+'Welcome back %recipient_name% to %title.site%': 'Welcome back %recipient_name% to %title.site%'
+'Welcome %recipient_name% to %title.site%': 'Welcome %recipient_name% to %title.site%'
+'welcome to %title.site%': 'welcome to %title.site%'

 'What is it ?': 'What is it ?'
 'When the feature will be available on Libre Air.': 'When the feature will be available on Libre Air.'
 'Who are we ?': 'Who are we ?'
 'What is it ?': 'What is it ?'
 'When the feature will be available on Libre Air.': 'When the feature will be available on Libre Air.'
 'Who are we ?': 'Who are we ?'

diff --git a/Resources/translations/messages.fr_fr.yaml b/Resources/translations/messages.fr_fr.yaml
index aa1a79cac825a939282b68b008f7230ccba3e8b2..628909a6bb724fd2987e6dad28fb3612b11f1875 100644 (file)
--- a/Resources/translations/messages.fr_fr.yaml
+++ b/Resources/translations/messages.fr_fr.yaml
@@ -539,8 +539,8 @@
 'Temperature': 'Température'
 'terms of service': 'conditions générales d''utilisation'
 'Terms of service': 'Conditions générales d''utilisation'
 'Temperature': 'Température'
 'terms of service': 'conditions générales d''utilisation'
 'Terms of service': 'Conditions générales d''utilisation'

-'Thanks so much for joining %site.title%, the space reservation program.': 'Merci d''avoir joint %site.title%, le système de réservation d''espace en plein air'
-'Thanks so much for rejoining %site.title%, the space reservation program.': 'Merci d''avoir rejoint %site.title%, le système de réservation d''espace en plein air'
+'Thanks so much for joining %title.site%, the space reservation program.': 'Merci d''avoir joint %title.site%, le système de réservation d''espace en plein air'
+'Thanks so much for rejoining %title.site%, the space reservation program.': 'Merci d''avoir rejoint %title.site%, le système de réservation d''espace en plein air'

 'the after': 'en after'
 'the afternoon': 'en après-midi'
 'The dancer can follow an organizer by email.': 'Le danseur pourra suivre un organisateur par courriel.'
 'the after': 'en after'
 'the afternoon': 'en après-midi'
 'The dancer can follow an organizer by email.': 'Le danseur pourra suivre un organisateur par courriel.'


@@ -607,9 +607,9 @@
 'Website of %title%': 'Site de %title%'
 'Website': 'Site internet'
 'Wednesday': 'Mercredi'
 'Website of %title%': 'Site de %title%'
 'Website': 'Site internet'
 'Wednesday': 'Mercredi'

-'Welcome back %recipient_name% to %site.title%': 'Bienvenue à nouveau %recipient_name% sur %site.title%'
-'Welcome %recipient_name% to %site.title%': 'Bienvenue %recipient_name% sur %site.title%'
-'welcome to %site.title%': 'bienvenue sur %site.title%'
+'Welcome back %recipient_name% to %title.site%': 'Bienvenue à nouveau %recipient_name% sur %title.site%'
+'Welcome %recipient_name% to %title.site%': 'Bienvenue %recipient_name% sur %title.site%'
+'welcome to %title.site%': 'bienvenue sur %title.site%'

 'What is it ?': 'Qu''est-ce que c''est ?'
 'When the feature will be available on Libre Air.': 'Lorsque la fonctionnalité sera disponible sur Air Libre.'
 'Who are we ?': 'Qui sommes nous ?'
 'What is it ?': 'Qu''est-ce que c''est ?'
 'When the feature will be available on Libre Air.': 'Lorsque la fonctionnalité sera disponible sur Air Libre.'
 'Who are we ?': 'Qui sommes nous ?'

diff --git a/Resources/views/mail/recover.html.twig b/Resources/views/mail/recover.html.twig
index ecfc7f2b91a2e3e9fab90f25e935a3658ffb0433..95bdf8c7338c6265e68773a4476f2db569ffe036 100644 (file)
--- a/Resources/views/mail/recover.html.twig
+++ b/Resources/views/mail/recover.html.twig
@@ -6,7 +6,7 @@
                        <td>&nbsp;</td>
                        <td>
                                <h2>{{ 'Subject: %subject%'|trans({'%subject%': subject})|raw }}</h2>
                        <td>&nbsp;</td>
                        <td>
                                <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>{{ 'Thanks so much for rejoining %title.site%, the space reservation program.'|trans({'%title.site%': title.site}) }}</p>

                                <p>{% trans %}To recover your account follow this link:{% endtrans %}</p>
                                <p><a href="{{ recover_url|escape('html_attr') }}" class="link">{{ recover_url }}</a></p>
                        </td>
                                <p>{% trans %}To recover your account follow this link:{% endtrans %}</p>
                                <p><a href="{{ recover_url|escape('html_attr') }}" class="link">{{ recover_url }}</a></p>
                        </td>

diff --git a/Resources/views/mail/recover.text.twig b/Resources/views/mail/recover.text.twig
index eb567d7e2f4e236a5dd9a15d4330d35213cd5eac..b7cbfff44ca8199c63e422636f21bf2ee11f4fc8 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 %title.site%, the space reservation program.'|trans({'%title.site%': title.site}) }}*

 
 {% trans %}To recover your account follow this link:{% endtrans %}
 {{ recover_url }}
 
 {% trans %}To recover your account follow this link:{% endtrans %}
 {{ recover_url }}

diff --git a/Resources/views/mail/recover_mail.html.twig b/Resources/views/mail/recover_mail.html.twig
index 4082be81a5a890f5305ecc658e8f3bd67d854e7c..611ac5c84baa647fdf15ad5ead41cc3318234b40 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 %title.site%'|trans({'%title.site%': title.site})|raw}) }}</h2>
+                               <p>{{ 'Thanks so much for rejoining %title.site%, the space reservation program.'|trans({'%title.site%': title.site}) }}</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 b5e09eab41eacb0c736041701a2926e4f2c1ea6c..6c2fe94580fd310eec290af02832ab34bb6003bd 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}) }}*
+*{{ 'Thanks so much for rejoining %title.site%, the space reservation program.'|trans({'%title.site%': title.site}) }}*

 
 {{ '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.html.twig b/Resources/views/mail/register.html.twig
index fa82217d1ca177ee079e3cdad1e5374019cbf5af..7b293fc2211324dc4855af4bf41aa80a92b3ae3a 100644 (file)
--- a/Resources/views/mail/register.html.twig
+++ b/Resources/views/mail/register.html.twig
@@ -4,9 +4,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 %title.site%'|trans({'%title.site%': title.site})|raw}) }}</h2>

                                <h3>{% if recipient_name %}{{ 'Hi %recipient_name%,'|trans({'%recipient_name%': recipient_name}) }}{% else %}{% trans %}Hi,{% endtrans %}{% endif %}</h3>
                                <h3>{% if recipient_name %}{{ 'Hi %recipient_name%,'|trans({'%recipient_name%': recipient_name}) }}{% else %}{% trans %}Hi,{% endtrans %}{% endif %}</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 %title.site%, the space reservation program.'|trans({'%title.site%': title.site}) }}</p>

                                <p>{% trans %}To create your account you must follow this link:{% endtrans %}</p>
                                <p><a href="{{ confirm_url|escape('html_attr') }}" class="link">{{ confirm_url }}</a></p>
                        </td>
                                <p>{% trans %}To create your account you must follow this link:{% endtrans %}</p>
                                <p><a href="{{ confirm_url|escape('html_attr') }}" class="link">{{ confirm_url }}</a></p>
                        </td>

diff --git a/Resources/views/mail/register.text.twig b/Resources/views/mail/register.text.twig
index f50b97aca3a170c5b62796358b683d70d2d54c32..23faead900341c1e7414e466f6b631a1b94000b3 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}) }}*
+*{{ 'Thanks so much for joining %title.site%, the space reservation program.'|trans({'%title.site%': title.site}) }}*

 
 {% trans %}To create your account you must follow this link:{% endtrans %}
 {{ confirm_url }}
 
 {% trans %}To create your account you must follow this link:{% endtrans %}
 {{ confirm_url }}