From 7f1dadc136eef38bfb536f96d1ae801096075e49 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 20 Jul 2022 11:24:13 +0200
Subject: [PATCH] user scope/job filters: improve translation in csv

---
 .../Export/Filter/UserJobFilter.php              | 16 ++++++++++++++--
 .../Export/Filter/UserScopeFilter.php            | 16 ++++++++++++++--
 .../translations/messages.fr.yml                 |  4 ++--
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/UserJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/UserJobFilter.php
index 6e2c7d19f..a3fe907b1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/UserJobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/UserJobFilter.php
@@ -46,8 +46,20 @@ class UserJobFilter implements FilterInterface
 
     public function describeAction($data, $format = 'string')
     {
-        // to complete..
-        return ['Filtered by user jobs'];
+        $jobs = [];
+
+        foreach ($data['accepted_userjob'] as $j) {
+            if ('null' === $j) {
+                $jobs[] = $this->translator->trans('Not given');
+            } else {
+                $jobs[] = $this->translatableStringHelper->localize($j->getLabel());
+            }
+        }
+
+        return [
+            'Filtered by user jobs: only %jobs%',
+            ['%jobs%' => implode(', ', $jobs)],
+        ];
     }
 
     public function addRole()
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/UserScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/UserScopeFilter.php
index 8f4eefb88..f235d9b86 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/UserScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/UserScopeFilter.php
@@ -45,8 +45,20 @@ class UserScopeFilter implements FilterInterface
 
     public function describeAction($data, $format = 'string')
     {
-        // to complete..
-        return ['Filtered by user scopes'];
+        $scopes = [];
+
+        foreach ($data['accepted_userscope'] as $s) {
+            if ('null' === $s) {
+                $scopes[] = $this->translator->trans('Not given');
+            } else {
+                $scopes[] = $this->translatableStringHelper->localize($s->getName());
+            }
+        }
+
+        return [
+            'Filtered by user scopes: only %scopes%',
+            ['%scopes%' => implode(', ', $scopes)],
+        ];
     }
 
     public function addRole()
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 122571198..7939a083d 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -378,11 +378,11 @@ Having an accompanying period closed after this date: Ayant une période d'accom
 
 Filter by user scope: Filtrer par service du référent
 Accepted userscope: Services
-Filtered by user scopes: Filtré par service du référent
+"Filtered by user scopes: only %scopes%": "Filtré par service du référent: uniquement %scopes%"
 
 Filter by user job: Filtrer par métier du référent
 Accepted userjob: Métiers
-Filtered by user jobs: Filtré par métier du référent
+"Filtered by user jobs: only %jobs%": "Filtré par métier du référent: uniquement %jobs%"
 
 ## aggregators
 Group people by nationality: Aggréger les personnes par nationalités