front: fix timetable train and paced train count displayed

Signed-off-by: Theo Macron <[email protected]>

Author: Akctarus

front/public/locales/en/operationalStudies/scenario.json

@@ -29,10 +29,12 @@
   "pacedTrain_one": "1 service",
   "pacedTrain_other": "{{count}} services",
   "pacedTrain_zero": "0 service",
-  "pacedTrainCount_one": "1/{{totalCount}} service selected",
-  "pacedTrainCount_other": "{{count}}/{{totalCount}} services selected",
-  "pacedTrainCount_zero": "$t(pacedTrain, { 'count': {{totalCount}} })",
-  "pacedTrainAndTrainCount": "{{pacedTrainCount}}/$t(pacedTrain, { 'count': {{totalPacedTrainCount}} }) and {{trainCount}}/$t(train, { 'count': {{totalTrainScheduleCount}} }) selected",
+  "pacedTrainCount_one": "1/{{totalCount}} service",
+  "pacedTrainCount_other": "{{count}}/{{totalCount}} services",
+  "pacedTrainCountSelected_one": "1/{{totalCount}} service selected",
+  "pacedTrainCountSelected_other": "{{count}}/{{totalCount}} services selected",
+  "pacedTrainCountSelected_zero": "$t(pacedTrain, { 'count': {{totalCount}} })",
+  "pacedTrainAndTrainCount": "$t(pacedTrainCount, { 'count': {{pacedTrainCount}}, 'totalCount': {{totalPacedTrainCount}} }) and $t(trainCount, { 'count': {{trainCount}}, 'totalCount': {{totalTrainScheduleCount}} }) selected",
   "scenarioCancel": "Cancel",
   "scenarioCreateButton": "Create a scenario",
   "scenarioCreationTitle": "Create a scenario",
@@ -110,9 +112,11 @@
     "validityFilter": "Trains validity"
   },
   "toggleTimetable": "Toggle the timetable",
-  "trainCount_one": "1/{{totalCount}} train selected",
-  "trainCount_other": "{{count}}/{{totalCount}} trains selected",
-  "trainCount_zero": "$t(train, { 'count': {{totalCount}} })",
+  "trainCount_one": "1/{{totalCount}} train",
+  "trainCount_other": "{{count}}/{{totalCount}} trains",
+  "trainCountSelected_one": "1/{{totalCount}} train selected",
+  "trainCountSelected_other": "{{count}}/{{totalCount}} trains selected",
+  "trainCountSelected_zero": "$t(train, { 'count': {{totalCount}} })",
   "train_one": "1 train",
   "train_other": "{{count}} trains",
   "train_zero": "0 train",

front/public/locales/fr/operationalStudies/scenario.json

@@ -29,10 +29,12 @@
   "pacedTrain_one": "1 mission",
   "pacedTrain_other": "{{count}} missions",
   "pacedTrain_zero": "",
-  "pacedTrainCount_one": "1/{{totalCount}} mission sélectionnée",
-  "pacedTrainCount_other": "{{count}}/{{totalCount}} missions sélectionnées",
-  "pacedTrainCount_zero": "$t(pacedTrain, { 'count': {{totalCount}} })",
-  "pacedTrainAndTrainCount": "{{pacedTrainCount}}/$t(pacedTrain, { 'count': {{totalPacedTrainCount}} }) et {{trainCount}}/$t(train, { 'count': {{totalTrainScheduleCount}} }) sélectionnés",
+  "pacedTrainCount_one": "1/{{totalCount}} mission",
+  "pacedTrainCount_other": "{{count}}/{{totalCount}} missions",
+  "pacedTrainCountSelected_one": "1/{{totalCount}} mission sélectionnée",
+  "pacedTrainCountSelected_other": "{{count}}/{{totalCount}} missions sélectionnées",
+  "pacedTrainCountSelected_zero": "$t(pacedTrain, { 'count': {{totalCount}} })",
+  "pacedTrainAndTrainCount": "$t(pacedTrainCount, { 'count': {{pacedTrainCount}}, 'totalCount': {{totalPacedTrainCount}} }) et $t(trainCount, { 'count': {{trainCount}}, 'totalCount': {{totalTrainScheduleCount}} }) sélectionnés",
   "scenarioCancel": "Annuler",
   "scenarioCreateButton": "Créer le scénario",
   "scenarioCreationTitle": "Créer un scénario",
@@ -110,9 +112,11 @@
     "validityFilter": "Validité des trains"
   },
   "toggleTimetable": "Basculer l'affichage de la grille horaire",
-  "trainCount_one": "1/{{totalCount}} train sélectionné",
-  "trainCount_other": "{{count}}/{{totalCount}} trains sélectionnés",
-  "trainCount_zero": "$t(train, { 'count': {{totalCount}} })",
+  "trainCount_one": "1/{{totalCount}} train",
+  "trainCount_other": "{{count}}/{{totalCount}} trains",
+  "trainCountSelected_one": "1/{{totalCount}} train sélectionné",
+  "trainCountSelected_other": "{{count}}/{{totalCount}} trains sélectionnés",
+  "trainCountSelected_zero": "$t(train, { 'count': {{totalCount}} })",
   "train_one": "1 train",
   "train_other": "{{count}} trains",
   "train_zero": "",

front/src/modules/trainschedule/components/Timetable/TimetableToolbar.tsx

@@ -237,27 +237,21 @@ const TimetableToolbar = ({
   const computedItemLabel = () => {
     if (totalTrainScheduleCount === 0 && totalPacedTrainCount === 0) return t('timetable.noItem');
 
-    const pacedTrainLabel = t('pacedTrainCount', {
+    const pacedTrainLabel = t('pacedTrainCountSelected', {
       count: selectedPacedTrainIds.length,
       totalCount: totalPacedTrainCount,
     });
 
-    const trainScheduleLabel = t('trainCount', {
+    const trainScheduleLabel = t('trainCountSelected', {
       count: selectedTrainScheduleIds.length,
       totalCount: totalTrainScheduleCount,
     });
 
-    if (
-      totalTrainScheduleCount === 0 ||
-      (selectedPacedTrainIds.length > 0 && selectedTrainScheduleIds.length === 0)
-    ) {
+    if (totalTrainScheduleCount === 0) {
       return pacedTrainLabel;
     }
 
-    if (
-      totalPacedTrainCount === 0 ||
-      (selectedTrainScheduleIds.length > 0 && selectedPacedTrainIds.length === 0)
-    ) {
+    if (totalPacedTrainCount === 0) {
       return trainScheduleLabel;
     }