From ef8ac6041a52e2bcb0df8b3b57f4b54198e81a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 2 Oct 2023 17:44:21 +0200
Subject: [PATCH] Fix deprecation of transchoice

---
 .../Resources/views/Event/list.html.twig      |  7 +++++-
 .../Resources/views/Event/show.html.twig      |  2 +-
 .../translations/messages+int-icu.fr.yml      | 13 +++++++++++
 .../translations/messages.fr.yml              |  2 --
 .../Resources/views/Person/create.html.twig   |  4 +---
 .../Resources/views/Person/list.html.twig     |  2 +-
 .../Person/list_by_phonenumber.html.twig      |  4 ++--
 .../views/Person/list_with_period.html.twig   |  4 ++--
 .../translations/messages+intl-icu.fr.yaml    | 15 ++++++++++++
 .../translations/messages.fr.yml              |  2 --
 .../Resources/views/Search/results.html.twig  | 23 +++++--------------
 .../translations/messages.fr.yml              |  1 -
 .../translations/messages.intl-icu.fr.yaml    |  7 ++++++
 .../ChillTaskBundle/Menu/UserMenuBuilder.php  |  6 ++---
 .../translations/messages.fr.yml              |  4 ----
 .../translations/messages.intl-icu.fr.yml     | 14 +++++++++++
 16 files changed, 71 insertions(+), 39 deletions(-)
 create mode 100644 src/Bundle/ChillEventBundle/translations/messages+int-icu.fr.yml
 create mode 100644 src/Bundle/ChillReportBundle/translations/messages.intl-icu.fr.yaml
 create mode 100644 src/Bundle/ChillTaskBundle/translations/messages.intl-icu.fr.yml

diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
index d6f871125..4bdb1f0f8 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
@@ -1,6 +1,11 @@
 <h2>{{ 'Event search'|trans }}</h2>
 
-<p>{% transchoice total with { '%pattern%' : pattern } %}%total% events match the search %pattern%{% endtranschoice %}</p>
+<p>
+    {{ 'total events match the search'|trans({'total' : total}) }}&nbsp;:
+    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
+        <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
+    </a>
+</p>
 
 <style>
     table.events td:last-child {
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
index 7a5eb23cd..f6b84cf68 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
@@ -67,7 +67,7 @@
 
     <h2>{{ 'Participations'|trans }}</h2>
     {% set count = event.participations|length %}
-    <p>{% transchoice count %}%count% participations to this event{% endtranschoice %}</p>
+    <p>{{ 'count participations to this event'|trans({'count': count}) }}</p>
 
     {% if count > 0 %}
         <table class="table table-bordered border-dark align-middle">
diff --git a/src/Bundle/ChillEventBundle/translations/messages+int-icu.fr.yml b/src/Bundle/ChillEventBundle/translations/messages+int-icu.fr.yml
new file mode 100644
index 000000000..1dac8969e
--- /dev/null
+++ b/src/Bundle/ChillEventBundle/translations/messages+int-icu.fr.yml
@@ -0,0 +1,13 @@
+total events match the search: >-
+    { total, plural,
+        =0 {Aucun événement ne correspond aux termes de recherche}
+        one {Un événement correspond aux termes de recherche}
+        other {# événements correspondent aux termes de recherche}
+    }
+
+count participations to this event: >-
+    { count, plural,
+        =0 {Aucun participant à l'événement}
+        one {Un participant à l'événement}
+        other {# participants à l'événement}
+    }
diff --git a/src/Bundle/ChillEventBundle/translations/messages.fr.yml b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
index 6b6ac220f..9be54f11d 100644
--- a/src/Bundle/ChillEventBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
@@ -11,7 +11,6 @@ Participation: Participation
 Participations: Participations
 Status: Statut
 Last update: Dernière mise à jour
-'%count% participations to this event': '{0} Aucun participant à l''événement | {1} Un participant à l''événement | ]1,Inf] %count% participants à l''événement'
 Moderator: Animateur
 
 #CRUD event
@@ -54,7 +53,6 @@ Are you sure you want to remove that event ?: Êtes-vous certain de vouloir supp
 
 #search
 Event search: Recherche d'événements
-'%total% events match the search %pattern%' : '{0} Aucun événement ne correspond aux termes de recherche "%pattern%" | {1} Un événement a été trouvé par la recherche "%pattern%" | ]1,Inf] %total% événements correspondent aux termes de recherche "%pattern%".'
 
 CHILL_EVENT_UPDATE: Modifier un événement
 CHILL_EVENT_CREATE: Créer un événement
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index 03bece4d5..1ceb84395 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -25,9 +25,7 @@
     {% if alternatePersons is not empty %}
         <div class="alert alert-warning flash_message">
             <span>
-            {% transchoice alternatePersons|length with { '%nb%': alternatePersons|length } %}
-                %nb% person with similar name. Please verify that this is a new person
-            {% endtranschoice %}
+                {{ 'nb person with similar name. Please verify that this is a new person'|trans({'nb' : alternatePersons|length}) }}
             </span>
         </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
index 5423388e6..a76e87948 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
@@ -18,7 +18,7 @@
     <h2>{{ title|default('Person search results')|trans }}</h2>
 
     <p>
-        {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
+        {{ 'total persons matching the search pattern'|trans({'total' : total}) }}&nbsp;:
         <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
                     <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
         </a>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
index 754952df0..0bdfed628 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
@@ -18,9 +18,9 @@
     <h2>{{ title|default('Person search results by phonenumber')|trans }}</h2>
 
     <p>
-        {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
+        {{ 'total persons matching the search pattern'|trans({'total' : total}) }}&nbsp;:
         <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
-                    <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
+            <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
         </a>
     </p>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
index 4735fb5a3..7dcf5a5bf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
@@ -201,9 +201,9 @@
     <h2>{{ title|default('Person search results')|trans }}</h2>
 
     <p>
-        {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
+        {{ 'total persons matching the search pattern'|trans({'total' : total}) }}&nbsp;:
         <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
-            <i class="fa fa-fw fa-search" aria-hidden="true"></i> {{ pattern }}
+            <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
         </a>
     </p>
 
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index 091b9232f..250bca9c7 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -135,3 +135,18 @@ exports:
     by_person:
         Filtered by person\'s geographical unit (based on address) computed at date, only units:
             "Filtré par zone géographique sur base de l'adresse, calculé à {datecalc, date, short}, seulement les zones suivantes: {units}"
+
+'total persons matching the search pattern': >-
+    { total, plural,
+        =0 {Aucun usager ne correspond aux termes de recherche}
+        one {Un usager correspond aux termes de recherche}
+        many {# usagers correspondent aux terms de recherche}
+        other {# usagers correspondent aux terms de recherche}
+    }
+
+'nb person with similar name. Please verify that this is a new person': >-
+    { nb, plural,
+        =0 {Aucun usager n'a un nom similaire}
+        one {Un usager a un nom similaire. Vérifiez qu'il ne s'agit pas de lui.}
+        other {# usagers ont un nom similaire. Vérifiez qu'il ne s'agit pas de l'un d'eux}
+    }
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 12ec6ea29..0a8371f38 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -151,14 +151,12 @@ Reset: 'Remise à zéro'
 'Add a person': 'Ajout d''un usager'
 'Person Menu': 'Menu usager'
 'The person data are not valid': 'Les données de votre formulaire sont invalides.'
-'%nb% person with similar name. Please verify that this is a new person': '{1} Une usager a un nom similaire. Vérifiez qu''il ne s''agit pas d''elle. | ]1, Inf] %nb% usagers ont un nom similaire. Vérifiez qu''il ne s''agit pas de l''une d''elles.'
 'The person has been created': 'Le dossier a été créé'
 'Person search results': 'Recherche de usagers'
 Person search results by phonenumber: Recherche d'usager par numéro de téléphone
 'Search within persons': 'Recherche parmi les usagers'
 Open person file: Ouvrir le dossier de l'usager
 and %number% other: '{0} et aucun autre| {1} et une autre |]1, Inf] et %number% autres'
-'%total% persons matching the search pattern:': '{0} Aucune usager ne correspond aux termes de recherche : | {1} Un usager a été trouvé par la recherche : | ]1,Inf] %total% usagers correspondent aux termes de recherche :'
 'Last opening since %last_opening%': 'Dernière ouverture le %last_opening%.'
 'Person accompanying period - %name%': 'Historique du dossier - %name%'
 'Opening date': 'Date d''ouverture'
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Search/results.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Search/results.html.twig
index 68367bebd..7960f7164 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Search/results.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Search/results.html.twig
@@ -1,22 +1,11 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
 <h2>{{ 'Reports search results'|trans }}</h2>
 
-<p>{{ '%total% reports matching the search "%pattern%"'|transchoice( total, {'%pattern%': pattern, '%total%' : total}) }}</p>
+<p>
+    {{ 'total reports matching the search'|trans({'total' : total}) }}&nbsp;:
+    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
+        <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
+    </a>
+</p>
 
 {% if reports|length > 0 %}
     <table class="striped rounded">
diff --git a/src/Bundle/ChillReportBundle/translations/messages.fr.yml b/src/Bundle/ChillReportBundle/translations/messages.fr.yml
index b39f8d079..c22ed17fb 100644
--- a/src/Bundle/ChillReportBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillReportBundle/translations/messages.fr.yml
@@ -34,7 +34,6 @@ No report registered for this person.: Aucun rapport pour cet usager.
 'You may not set a date argument and a date in default': Vous avez introduit deux dates, l'une avec l'argument date et l'autre en zone de recherche par défaut. Merci d'indiquer l'un ou l'autre
 'You must provide either a date:YYYY-mm-dd argument or a YYYY-mm-dd default search': Merci d'indiquer soit un argument date:YYYY-mm-dd, soit une date dans la recherche par défaut.
 'Reports search results': Recherche dans les rapports
-'%total% reports matching the search "%pattern%"': '{0} Aucun rapport ne correspond à la recherche "%pattern%" | {1} Un rapport correspond à la recherche "%pattern%" | ]1,Inf]%total% rapports correspondent à la recherche "%pattern%"'
 
 #timeline
 '%user% has filled a %report_label% report': "%user% a ajouté un rapport '%report_label%'"
diff --git a/src/Bundle/ChillReportBundle/translations/messages.intl-icu.fr.yaml b/src/Bundle/ChillReportBundle/translations/messages.intl-icu.fr.yaml
new file mode 100644
index 000000000..f38303d42
--- /dev/null
+++ b/src/Bundle/ChillReportBundle/translations/messages.intl-icu.fr.yaml
@@ -0,0 +1,7 @@
+total reports matching the search: >-
+    { total, plural,
+        =0 {Aucun rapport ne correspond à la recherche}
+        one {Un rapport correspond à la recherche}
+        many {# rapports correspondent à la recherche}
+        other {# rapports correspondent à la recherche}
+    }
diff --git a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
index a590fe278..3a3972367 100644
--- a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
@@ -66,7 +66,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         if (0 < $ended) {
             $this->addItemInMenu(
                 $menu,
-                '%number% tasks over deadline',
+                'nb tasks over deadline',
                 $ended,
                 -15,
                 ['new', 'in_progress'],
@@ -77,7 +77,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         if (0 < $warning) {
             $this->addItemInMenu(
                 $menu,
-                '%number% tasks near deadline',
+                'nb tasks near deadline',
                 $warning,
                 -14,
                 ['new', 'in_progress'],
@@ -103,7 +103,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
     {
         if (0 < $number) {
             $menu->addChild(
-                $this->translator->transChoice($message, $number),
+                $this->translator->trans($message, $number),
                 [
                     'route' => 'chill_task_singletask_my_tasks',
                     'routeParameters' => [
diff --git a/src/Bundle/ChillTaskBundle/translations/messages.fr.yml b/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
index 599ca8640..b0d155f59 100644
--- a/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
@@ -95,10 +95,6 @@ Are you sure you want to start this task ?: Êtes-vous sûrs de vouloir démarre
 "The transition is successfully applied": "La transition a bien été effectuée"
 "The transition could not be applied": "La transition n'a pas pu être appliquée"
 
-#widget
-"%number% tasks over deadline": "{0} Aucune tâche dépassée|{1} Une tâche dépassée | ]1,Inf[ %count% tâches dépassées"
-"%number% tasks near deadline": "{0} Aucune tâche en rappel|{1} Une tâche en rappel | ]1,Inf[ %count% tâches en rappel"
-
 Tasks near deadline: Tâches à échéance proche
 Tasks over deadline: Tâches à échéance dépassée
 Tasks without alert: Tâches à échéance future ou sans échéance
diff --git a/src/Bundle/ChillTaskBundle/translations/messages.intl-icu.fr.yml b/src/Bundle/ChillTaskBundle/translations/messages.intl-icu.fr.yml
new file mode 100644
index 000000000..dabbe6b35
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/translations/messages.intl-icu.fr.yml
@@ -0,0 +1,14 @@
+#widget
+nb tasks over deadline: >-
+    {nb, plural,
+        =0 {Aucune tâche dépassée}
+        one {Une tâche dépassée}
+        other {# tâches dépassées}
+    }
+
+nb tasks near deadline: >-
+    {nb, plural,
+        =0 {Aucune tâche en rappel}
+        one {Une tâche en rappel}
+        other {# tâches en rappel}
+    }