From 1e5dcfe93fb41957381b5ed485ad3e49b1ea7b50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Wed, 20 Mar 2024 17:00:51 +0100 Subject: [PATCH 1/1] Replace dropped site.title with title.site --- Resources/config/packages/rapsysair.yaml | 4 ++-- Resources/translations/messages.en_gb.yaml | 10 +++++----- Resources/translations/messages.fr_fr.yaml | 10 +++++----- Resources/views/mail/recover.html.twig | 2 +- Resources/views/mail/recover.text.twig | 2 +- Resources/views/mail/recover_mail.html.twig | 4 ++-- Resources/views/mail/recover_mail.text.twig | 2 +- Resources/views/mail/register.html.twig | 4 ++-- Resources/views/mail/register.text.twig | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Resources/config/packages/rapsysair.yaml b/Resources/config/packages/rapsysair.yaml index fad52c8..ee6ce47 100644 --- a/Resources/config/packages/rapsysair.yaml +++ b/Resources/config/packages/rapsysair.yaml @@ -89,7 +89,7 @@ rapsysuser: 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: @@ -111,7 +111,7 @@ rapsysuser: 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: diff --git a/Resources/translations/messages.en_gb.yaml b/Resources/translations/messages.en_gb.yaml index baef62a..5bb0f5d 100644 --- 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' -'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.' @@ -597,9 +597,9 @@ '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 ?' diff --git a/Resources/translations/messages.fr_fr.yaml b/Resources/translations/messages.fr_fr.yaml index aa1a79c..628909a 100644 --- 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' -'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.' @@ -607,9 +607,9 @@ '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 ?' diff --git a/Resources/views/mail/recover.html.twig b/Resources/views/mail/recover.html.twig index ecfc7f2..95bdf8c 100644 --- a/Resources/views/mail/recover.html.twig +++ b/Resources/views/mail/recover.html.twig @@ -6,7 +6,7 @@  

{{ 'Subject: %subject%'|trans({'%subject%': subject})|raw }}

-

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

diff --git a/Resources/views/mail/recover.text.twig b/Resources/views/mail/recover.text.twig index eb567d7..b7cbfff 100644 --- 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 %} -*{{ '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 }} diff --git a/Resources/views/mail/recover_mail.html.twig b/Resources/views/mail/recover_mail.html.twig index 4082be8..611ac5c 100644 --- a/Resources/views/mail/recover_mail.html.twig +++ b/Resources/views/mail/recover_mail.html.twig @@ -5,8 +5,8 @@   -

{{ 'Subject: %subject%'|trans({'%subject%': 'welcome back to %site.title%'|trans({'%site.title%': site.title})|raw}) }}

-

{{ 'Thanks so much for rejoining %site.title%, the space reservation program.'|trans({'%site.title%': site.title}) }}

+

{{ 'Subject: %subject%'|trans({'%subject%': 'welcome back to %title.site%'|trans({'%title.site%': title.site})|raw}) }}

+

{{ '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: '|trans }}

{{ recover_url }}

diff --git a/Resources/views/mail/recover_mail.text.twig b/Resources/views/mail/recover_mail.text.twig index b5e09ea..6c2fe94 100644 --- 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 %} -*{{ '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}) }} diff --git a/Resources/views/mail/register.html.twig b/Resources/views/mail/register.html.twig index fa82217..7b293fc 100644 --- a/Resources/views/mail/register.html.twig +++ b/Resources/views/mail/register.html.twig @@ -4,9 +4,9 @@   -

{{ 'Subject: %subject%'|trans({'%subject%': 'welcome to %site.title%'|trans({'%site.title%': site.title})|raw}) }}

+

{{ 'Subject: %subject%'|trans({'%subject%': 'welcome to %title.site%'|trans({'%title.site%': title.site})|raw}) }}

{% if recipient_name %}{{ 'Hi %recipient_name%,'|trans({'%recipient_name%': recipient_name}) }}{% else %}{% trans %}Hi,{% endtrans %}{% endif %}

-

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

diff --git a/Resources/views/mail/register.text.twig b/Resources/views/mail/register.text.twig index f50b97a..23faead 100644 --- 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 %} -*{{ '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 }} -- 2.41.1