From a5329c5d697b64c365da70184dad3cccf3c4f973 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 19 Aug 2024 16:11:18 +0200
Subject: [PATCH 01/25] Create commands to manage translations

---
 .../DetectMissingTranslationsCommand.php      | 199 ++++++++++++++++++
 .../DetectTranslationDuplicatesCommand.php    | 132 ++++++++++++
 .../config/services/command.yaml              |   8 +
 3 files changed, 339 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Command/DetectMissingTranslationsCommand.php
 create mode 100644 src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php

diff --git a/src/Bundle/ChillMainBundle/Command/DetectMissingTranslationsCommand.php b/src/Bundle/ChillMainBundle/Command/DetectMissingTranslationsCommand.php
new file mode 100644
index 000000000..12a194699
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Command/DetectMissingTranslationsCommand.php
@@ -0,0 +1,199 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Yaml\Yaml;
+use Symfony\Component\Filesystem\Filesystem;
+
+class DetectMissingTranslationsCommand extends Command
+{
+    protected static $defaultName = 'chill:main:detect-missing-translations';
+
+    private const BASE_DIR = 'vendor/chill-project/chill-bundles/src/Bundle';
+
+    protected function configure(): void
+    {
+        $this
+            ->setDescription('Checks for missing translations in the specified locale.')
+            ->addOption('bundle', null, InputOption::VALUE_REQUIRED, 'The relative path to the translation files', 'translations')
+            ->addOption('locale', null, InputOption::VALUE_REQUIRED, 'The locale to check for missing translations', 'fr');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $locale = $input->getOption('locale');
+        $bundle = $input->getOption('bundle');
+        $bundlePath = self::BASE_DIR . '/' . $bundle;
+//        $vuePath = $bundlePath . '/Resources/public/vuejs';
+        $twigPath = $bundlePath . '/Resources/public';
+        $localeFile = $bundlePath . "/translations/messages.$locale.yml";
+
+        if (!file_exists($localeFile)) {
+            $output->writeln("<error>The locale file '$localeFile' does not exist.</error>");
+            return Command::FAILURE;
+        }
+
+        $missingKeys = [];
+
+        // Load existing translations for the specified locale
+        $existingTranslations = Yaml::parseFile($localeFile);
+
+        // Extract translation keys from Vue components
+/*        $vueKeys = $this->extractVueKeys($vuePath);
+        foreach ($vueKeys as $key) {
+            if (!$this->keyExistsInTranslations($key, $existingTranslations)) {
+                $missingKeys[$key] = 'Missing translation in Vue component';
+            }
+        }*/
+
+        // Extract translation keys from Twig templates
+        $twigKeys = $this->extractTwigKeys($twigPath);
+        foreach ($twigKeys as $key) {
+            if (!$this->keyExistsInTranslations($key, $existingTranslations)) {
+                $missingKeys[$key] = 'Missing translation in Twig template';
+            }
+        }
+
+        // Extract translation keys from PHP code
+        $phpKeys = $this->extractPhpKeys($bundlePath);
+        foreach ($phpKeys as $key) {
+            if (!$this->keyExistsInTranslations($key, $existingTranslations)) {
+                $missingKeys[$key] = 'Missing translation in PHP code';
+            }
+        }
+
+        if (empty($missingKeys)) {
+            $output->writeln("<info>No missing translations found.</info>");
+        } else {
+            $output->writeln("<comment>Missing translations:</comment>");
+            foreach ($missingKeys as $key => $info) {
+                $output->writeln("<info>$key:</info> $info");
+            }
+
+            // Prompt user to add missing translations
+            $this->promptForTranslations($missingKeys, $localeFile);
+        }
+
+        return Command::SUCCESS;
+    }
+
+    private function extractVueKeys($path)
+    {
+        $keys = [];
+        $files = $this->getAllFiles($path, ['vue']);
+
+        foreach ($files as $file) {
+            $content = file_get_contents($file);
+            preg_match_all('/\$t\((\'|")(.*?)(\'|")\)/', $content, $matches);
+            foreach ($matches[2] as $match) {
+                $keys[] = $match;
+            }
+        }
+
+        return array_unique($keys);
+    }
+
+    private function extractTwigKeys($path)
+    {
+        $keys = [];
+        $files = $this->getAllFiles($path, ['html.twig', 'twig']);
+
+        foreach ($files as $file) {
+            $content = file_get_contents($file);
+            preg_match_all('/\|trans\s*\(\'(.*?)\'/', $content, $matches);
+            foreach ($matches[1] as $match) {
+                $keys[] = $match;
+            }
+        }
+
+        return array_unique($keys);
+    }
+
+    private function extractPhpKeys($path)
+    {
+        $keys = [];
+        $files = $this->getAllFiles($path, ['php']);
+
+        foreach ($files as $file) {
+            $content = file_get_contents($file);
+            preg_match_all('/->trans\((\'|")(.*?)(\'|")\)/', $content, $matches);
+            foreach ($matches[2] as $match) {
+                $keys[] = $match;
+            }
+        }
+
+        return array_unique($keys);
+    }
+
+    private function getAllFiles($directory, array $extensions)
+    {
+        $files = [];
+        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory));
+
+        foreach ($iterator as $file) {
+            if ($file->isFile() && in_array($file->getExtension(), $extensions)) {
+                $files[] = $file->getPathname();
+            }
+        }
+
+        return $files;
+    }
+
+    private function keyExistsInTranslations($key, $translations)
+    {
+        $keys = explode('.', $key);
+        $current = $translations;
+
+        foreach ($keys as $part) {
+            if (isset($current[$part])) {
+                $current = $current[$part];
+            } else {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private function promptForTranslations($missingKeys, $localeFile)
+    {
+        $fs = new Filesystem();
+        foreach ($missingKeys as $key => $info) {
+            $translation = readline("Enter translation for '$key': ");
+            if ($translation !== '') {
+                // Add translation to the YAML file
+                $existing = file_exists($localeFile) ? Yaml::parseFile($localeFile) : [];
+                $this->addTranslation($existing, $key, $translation);
+                $fs->dumpFile($localeFile, Yaml::dump($existing));
+            }
+        }
+    }
+
+    private function addTranslation(&$translations, $key, $translation)
+    {
+        $keys = explode('.', $key);
+        $current = &$translations;
+
+        foreach ($keys as $part) {
+            if (!isset($current[$part])) {
+                $current[$part] = [];
+            }
+            $current = &$current[$part];
+        }
+
+        $current = $translation;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php b/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
new file mode 100644
index 000000000..56ccebba2
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
@@ -0,0 +1,132 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Yaml\Yaml;
+
+class DetectTranslationDuplicatesCommand extends Command
+{
+    protected static $defaultName = 'app:detect-duplicate-translations';
+
+    private const string BASE_DIR = 'vendor/chill-project/chill-bundles';
+
+    protected function configure(): void
+    {
+        $this
+            ->setDescription('Detects duplicate translations in YAML files.')
+            ->addOption('path', null, InputOption::VALUE_REQUIRED, 'The directory or file path containing translation files', 'translations');
+//            ->addOption('output', null, InputOption::VALUE_OPTIONAL, 'The file path to write the output to', 'php://stdout');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $relativePath = $input->getOption('path');
+        $basePath = self::BASE_DIR;
+        $fullPath = $basePath . '/' . $relativePath;
+
+//        $outputPath = $input->getOption('output');
+
+        if (!file_exists($fullPath)) {
+            $output->writeln("<error>The path '$fullPath' does not exist.</error>");
+            return Command::FAILURE;
+        }
+
+        $translationMap = [];
+
+        if (is_dir($fullPath)) {
+            // Process all YAML files in the directory
+            foreach (glob($fullPath . '/*.yaml') as $file) {
+                $this->processFile($file, $translationMap);
+            }
+        } elseif (is_file($fullPath)) {
+            // Process the specific YAML file
+            $this->processFile($fullPath, $translationMap);
+        } else {
+            $output->writeln("<error>The path '$fullPath' is neither a directory nor a file.</error>");
+            return Command::FAILURE;
+        }
+
+        $duplicates = array_filter($translationMap, function($keys) {
+            return count($keys) > 1;
+        });
+
+        if (empty($duplicates)) {
+            $output->writeln("<info>No duplicate translations found.</info>");
+        } else {
+            $output->writeln("<comment>Duplicate translations found:</comment>");
+            foreach ($duplicates as $translation => $keys) {
+                $output->writeln("<info>Translation:</info> '$translation' <info>is used in keys:</info> " . implode(', ', $keys));
+            }
+        }
+
+/*        $outputText = "";
+        if (empty($duplicates)) {
+            $outputText .= "No duplicate translations found.\n";
+        } else {
+            $outputText .= "Duplicate translations found:\n";
+            foreach ($duplicates as $translation => $keys) {
+                $outputText .= "Translation: '$translation' is used in keys: " . implode(', ', $keys) . "\n";
+            }
+        }
+
+        // Write output to the specified file or to stdout
+        if ($outputPath === 'php://stdout') {
+            $output->writeln($outputText);
+        } else {
+            try {
+                file_put_contents($outputPath, $outputText);
+                $output->writeln("<info>Output written to '$outputPath'</info>");
+            } catch (\Exception $e) {
+                $output->writeln("<error>Failed to write to '$outputPath': " . $e->getMessage() . "</error>");
+                return Command::FAILURE;
+            }
+        }*/
+
+        return Command::SUCCESS;
+    }
+
+    private function processFile($file, &$translationMap): void
+    {
+        try {
+            $translations = Yaml::parseFile($file);
+
+            // Flatten the array to handle nested keys
+            $this->flattenArray($translations, '', $translationMap);
+
+        } catch (\Exception $e) {
+            // Handle YAML parsing exceptions
+            // You might want to log the error or notify the user
+        }
+    }
+
+    private function flattenArray(array $array, $prefix, &$translationMap): void
+    {
+        foreach ($array as $key => $value) {
+            $fullKey = $prefix ? $prefix . '.' . $key : $key;
+            if (is_array($value)) {
+                // Recursively process nested arrays
+                $this->flattenArray($value, $fullKey, $translationMap);
+            } else {
+                // Handle translation value
+                if (isset($translationMap[$value])) {
+                    $translationMap[$value][] = $fullKey;
+                } else {
+                    $translationMap[$value] = [$fullKey];
+                }
+            }
+        }
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/config/services/command.yaml b/src/Bundle/ChillMainBundle/config/services/command.yaml
index 94cb2cf97..106b01f37 100644
--- a/src/Bundle/ChillMainBundle/config/services/command.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/command.yaml
@@ -74,3 +74,11 @@ services:
     Chill\MainBundle\Command\SynchronizeEntityInfoViewsCommand:
         tags:
             - {name: console.command}
+
+    Chill\MainBundle\Command\DetectTranslationDuplicatesCommand:
+        tags:
+            - { name: console.command }
+
+    Chill\MainBundle\Command\DetectMissingTranslationsCommand:
+        tags:
+            - { name: console.command }

From 155066be130b42de199ecefaaec3f2e47c87822b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 19 Aug 2024 16:48:03 +0200
Subject: [PATCH 02/25] Remove irrelevant command

---
 .../DetectMissingTranslationsCommand.php      | 199 ------------------
 1 file changed, 199 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Command/DetectMissingTranslationsCommand.php

diff --git a/src/Bundle/ChillMainBundle/Command/DetectMissingTranslationsCommand.php b/src/Bundle/ChillMainBundle/Command/DetectMissingTranslationsCommand.php
deleted file mode 100644
index 12a194699..000000000
--- a/src/Bundle/ChillMainBundle/Command/DetectMissingTranslationsCommand.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\MainBundle\Command;
-
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Yaml\Yaml;
-use Symfony\Component\Filesystem\Filesystem;
-
-class DetectMissingTranslationsCommand extends Command
-{
-    protected static $defaultName = 'chill:main:detect-missing-translations';
-
-    private const BASE_DIR = 'vendor/chill-project/chill-bundles/src/Bundle';
-
-    protected function configure(): void
-    {
-        $this
-            ->setDescription('Checks for missing translations in the specified locale.')
-            ->addOption('bundle', null, InputOption::VALUE_REQUIRED, 'The relative path to the translation files', 'translations')
-            ->addOption('locale', null, InputOption::VALUE_REQUIRED, 'The locale to check for missing translations', 'fr');
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $locale = $input->getOption('locale');
-        $bundle = $input->getOption('bundle');
-        $bundlePath = self::BASE_DIR . '/' . $bundle;
-//        $vuePath = $bundlePath . '/Resources/public/vuejs';
-        $twigPath = $bundlePath . '/Resources/public';
-        $localeFile = $bundlePath . "/translations/messages.$locale.yml";
-
-        if (!file_exists($localeFile)) {
-            $output->writeln("<error>The locale file '$localeFile' does not exist.</error>");
-            return Command::FAILURE;
-        }
-
-        $missingKeys = [];
-
-        // Load existing translations for the specified locale
-        $existingTranslations = Yaml::parseFile($localeFile);
-
-        // Extract translation keys from Vue components
-/*        $vueKeys = $this->extractVueKeys($vuePath);
-        foreach ($vueKeys as $key) {
-            if (!$this->keyExistsInTranslations($key, $existingTranslations)) {
-                $missingKeys[$key] = 'Missing translation in Vue component';
-            }
-        }*/
-
-        // Extract translation keys from Twig templates
-        $twigKeys = $this->extractTwigKeys($twigPath);
-        foreach ($twigKeys as $key) {
-            if (!$this->keyExistsInTranslations($key, $existingTranslations)) {
-                $missingKeys[$key] = 'Missing translation in Twig template';
-            }
-        }
-
-        // Extract translation keys from PHP code
-        $phpKeys = $this->extractPhpKeys($bundlePath);
-        foreach ($phpKeys as $key) {
-            if (!$this->keyExistsInTranslations($key, $existingTranslations)) {
-                $missingKeys[$key] = 'Missing translation in PHP code';
-            }
-        }
-
-        if (empty($missingKeys)) {
-            $output->writeln("<info>No missing translations found.</info>");
-        } else {
-            $output->writeln("<comment>Missing translations:</comment>");
-            foreach ($missingKeys as $key => $info) {
-                $output->writeln("<info>$key:</info> $info");
-            }
-
-            // Prompt user to add missing translations
-            $this->promptForTranslations($missingKeys, $localeFile);
-        }
-
-        return Command::SUCCESS;
-    }
-
-    private function extractVueKeys($path)
-    {
-        $keys = [];
-        $files = $this->getAllFiles($path, ['vue']);
-
-        foreach ($files as $file) {
-            $content = file_get_contents($file);
-            preg_match_all('/\$t\((\'|")(.*?)(\'|")\)/', $content, $matches);
-            foreach ($matches[2] as $match) {
-                $keys[] = $match;
-            }
-        }
-
-        return array_unique($keys);
-    }
-
-    private function extractTwigKeys($path)
-    {
-        $keys = [];
-        $files = $this->getAllFiles($path, ['html.twig', 'twig']);
-
-        foreach ($files as $file) {
-            $content = file_get_contents($file);
-            preg_match_all('/\|trans\s*\(\'(.*?)\'/', $content, $matches);
-            foreach ($matches[1] as $match) {
-                $keys[] = $match;
-            }
-        }
-
-        return array_unique($keys);
-    }
-
-    private function extractPhpKeys($path)
-    {
-        $keys = [];
-        $files = $this->getAllFiles($path, ['php']);
-
-        foreach ($files as $file) {
-            $content = file_get_contents($file);
-            preg_match_all('/->trans\((\'|")(.*?)(\'|")\)/', $content, $matches);
-            foreach ($matches[2] as $match) {
-                $keys[] = $match;
-            }
-        }
-
-        return array_unique($keys);
-    }
-
-    private function getAllFiles($directory, array $extensions)
-    {
-        $files = [];
-        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory));
-
-        foreach ($iterator as $file) {
-            if ($file->isFile() && in_array($file->getExtension(), $extensions)) {
-                $files[] = $file->getPathname();
-            }
-        }
-
-        return $files;
-    }
-
-    private function keyExistsInTranslations($key, $translations)
-    {
-        $keys = explode('.', $key);
-        $current = $translations;
-
-        foreach ($keys as $part) {
-            if (isset($current[$part])) {
-                $current = $current[$part];
-            } else {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private function promptForTranslations($missingKeys, $localeFile)
-    {
-        $fs = new Filesystem();
-        foreach ($missingKeys as $key => $info) {
-            $translation = readline("Enter translation for '$key': ");
-            if ($translation !== '') {
-                // Add translation to the YAML file
-                $existing = file_exists($localeFile) ? Yaml::parseFile($localeFile) : [];
-                $this->addTranslation($existing, $key, $translation);
-                $fs->dumpFile($localeFile, Yaml::dump($existing));
-            }
-        }
-    }
-
-    private function addTranslation(&$translations, $key, $translation)
-    {
-        $keys = explode('.', $key);
-        $current = &$translations;
-
-        foreach ($keys as $part) {
-            if (!isset($current[$part])) {
-                $current[$part] = [];
-            }
-            $current = &$current[$part];
-        }
-
-        $current = $translation;
-    }
-}

From 23d882d4cd2ab0629660e69ac668970f74aebc33 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 17 Sep 2024 12:32:51 +0200
Subject: [PATCH 03/25] Improve script to find translation duplicates

Format the output using a table.
Use existing translator.default service to fetch translation files and extract keys and translations from the translation catalogue for a certain locale.
---
 .../DetectTranslationDuplicatesCommand.php    | 151 +++++++++---------
 1 file changed, 74 insertions(+), 77 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php b/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
index 56ccebba2..16e0c0b24 100644
--- a/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
@@ -15,118 +15,115 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Yaml\Yaml;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Console\Helper\Table;
 
 class DetectTranslationDuplicatesCommand extends Command
 {
     protected static $defaultName = 'app:detect-duplicate-translations';
 
-    private const string BASE_DIR = 'vendor/chill-project/chill-bundles';
+    public function __construct(private readonly TranslatorInterface $translator, private readonly KernelInterface $kernel)
+    {
+        parent::__construct();
+    }
 
     protected function configure(): void
     {
         $this
             ->setDescription('Detects duplicate translations in YAML files.')
-            ->addOption('path', null, InputOption::VALUE_REQUIRED, 'The directory or file path containing translation files', 'translations');
-//            ->addOption('output', null, InputOption::VALUE_OPTIONAL, 'The file path to write the output to', 'php://stdout');
+            ->addOption('locale', null, InputOption::VALUE_REQUIRED, 'Locale to check for duplicate translations', 'en');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $relativePath = $input->getOption('path');
-        $basePath = self::BASE_DIR;
-        $fullPath = $basePath . '/' . $relativePath;
+        $locale = $input->getOption('locale');
 
-//        $outputPath = $input->getOption('output');
+        // Loop through all bundles and get the translation directories
+        foreach ($this->kernel->getBundles() as $bundle) {
+            $bundlePath = $bundle->getPath();
+            $translationDir = $this->getTranslationDirectory($bundle->getName(), $bundlePath);
 
-        if (!file_exists($fullPath)) {
-            $output->writeln("<error>The path '$fullPath' does not exist.</error>");
-            return Command::FAILURE;
-        }
-
-        $translationMap = [];
-
-        if (is_dir($fullPath)) {
-            // Process all YAML files in the directory
-            foreach (glob($fullPath . '/*.yaml') as $file) {
-                $this->processFile($file, $translationMap);
+            if ($translationDir && is_dir($translationDir)) {
+                foreach (glob($translationDir . '/*.yaml') as $file) {
+                    $this->translator->addResource('yaml', $file, $locale);
+                }
             }
-        } elseif (is_file($fullPath)) {
-            // Process the specific YAML file
-            $this->processFile($fullPath, $translationMap);
-        } else {
-            $output->writeln("<error>The path '$fullPath' is neither a directory nor a file.</error>");
-            return Command::FAILURE;
         }
 
-        $duplicates = array_filter($translationMap, function($keys) {
+        $catalogue = $this->translator->getCatalogue($locale);
+
+        $allTranslations = [];
+
+        // Iterate through each domain in the catalogue
+        foreach ($catalogue->all() as $domain => $translations) {
+            foreach ($translations as $key => $value) {
+                if (is_array($value)) {
+                    $this->flattenTranslation($value, "$domain.$key", $allTranslations);
+                } else {
+                    if (!isset($allTranslations[$value])) {
+                        $allTranslations[$value] = [];
+                    }
+                    $allTranslations[$value][] = "$domain.$key";
+                }
+            }
+        }
+
+        // Detect values that appear in more than one key
+        $duplicates = array_filter($allTranslations, function ($keys) {
             return count($keys) > 1;
         });
 
         if (empty($duplicates)) {
-            $output->writeln("<info>No duplicate translations found.</info>");
+            $output->writeln("<info>No duplicate translations found for locale '$locale'.</info>");
         } else {
-            $output->writeln("<comment>Duplicate translations found:</comment>");
-            foreach ($duplicates as $translation => $keys) {
-                $output->writeln("<info>Translation:</info> '$translation' <info>is used in keys:</info> " . implode(', ', $keys));
-            }
-        }
+            $output->writeln("<comment>Duplicate translations found for locale '$locale':</comment>");
 
-/*        $outputText = "";
-        if (empty($duplicates)) {
-            $outputText .= "No duplicate translations found.\n";
-        } else {
-            $outputText .= "Duplicate translations found:\n";
-            foreach ($duplicates as $translation => $keys) {
-                $outputText .= "Translation: '$translation' is used in keys: " . implode(', ', $keys) . "\n";
-            }
-        }
+            // Display the duplicates in a table
+            $table = new Table($output);
+            $table->setHeaders(['Translation', 'Used in Keys']);
 
-        // Write output to the specified file or to stdout
-        if ($outputPath === 'php://stdout') {
-            $output->writeln($outputText);
-        } else {
-            try {
-                file_put_contents($outputPath, $outputText);
-                $output->writeln("<info>Output written to '$outputPath'</info>");
-            } catch (\Exception $e) {
-                $output->writeln("<error>Failed to write to '$outputPath': " . $e->getMessage() . "</error>");
-                return Command::FAILURE;
+            foreach ($duplicates as $translation => $keys) {
+                $wrappedTranslation = $this->wrapText($translation, 40);
+                $wrappedKeys = $this->wrapText(implode(', ', $keys), 80);
+
+                $table->addRow([$wrappedTranslation, $wrappedKeys]);
             }
-        }*/
+
+            $table->render();
+        }
 
         return Command::SUCCESS;
     }
 
-    private function processFile($file, &$translationMap): void
+    private function flattenTranslation(array $translations, string $prefix, array &$allTranslations): void
     {
-        try {
-            $translations = Yaml::parseFile($file);
-
-            // Flatten the array to handle nested keys
-            $this->flattenArray($translations, '', $translationMap);
-
-        } catch (\Exception $e) {
-            // Handle YAML parsing exceptions
-            // You might want to log the error or notify the user
-        }
-    }
-
-    private function flattenArray(array $array, $prefix, &$translationMap): void
-    {
-        foreach ($array as $key => $value) {
-            $fullKey = $prefix ? $prefix . '.' . $key : $key;
+        foreach ($translations as $key => $value) {
+            $fullKey = "$prefix.$key";
             if (is_array($value)) {
-                // Recursively process nested arrays
-                $this->flattenArray($value, $fullKey, $translationMap);
+                $this->flattenTranslation($value, $fullKey, $allTranslations);
             } else {
-                // Handle translation value
-                if (isset($translationMap[$value])) {
-                    $translationMap[$value][] = $fullKey;
-                } else {
-                    $translationMap[$value] = [$fullKey];
+                if (!isset($allTranslations[$value])) {
+                    $allTranslations[$value] = [];
                 }
+                $allTranslations[$value][] = $fullKey;
             }
         }
     }
+
+    private function getTranslationDirectory(string $bundleName, string $bundlePath): ?string
+    {
+        $translationDir = $bundlePath . '/translations';
+
+        if ($bundleName === 'ChillAsideActivityBundle') {
+            $translationDir = $bundlePath . '/src/translations';
+        }
+
+        return is_dir($translationDir) ? $translationDir : null;
+    }
+
+    private function wrapText(string $text, int $width): string
+    {
+        return wordwrap($text, $width, "\n", true);
+    }
 }

From 5921404712d00f602ded067cdf285776f2a80a5c Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 17 Sep 2024 12:50:02 +0200
Subject: [PATCH 04/25] Remove unutilized script

---
 src/Bundle/ChillMainBundle/config/services/command.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/config/services/command.yaml b/src/Bundle/ChillMainBundle/config/services/command.yaml
index 106b01f37..5d2491fc9 100644
--- a/src/Bundle/ChillMainBundle/config/services/command.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/command.yaml
@@ -78,7 +78,3 @@ services:
     Chill\MainBundle\Command\DetectTranslationDuplicatesCommand:
         tags:
             - { name: console.command }
-
-    Chill\MainBundle\Command\DetectMissingTranslationsCommand:
-        tags:
-            - { name: console.command }

From 611261c863a85f64018cb88f0f4fbd88b3bb87f0 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 17 Sep 2024 16:48:44 +0200
Subject: [PATCH 05/25] Example usage of translation keys from yaml files
 within vue component

---
 .../Resources/public/vuejs/_components/Modal.vue      | 11 +++++++++--
 .../ChillMainBundle/translations/messages.fr.yml      |  4 ++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index 11bb9db2f..720f91c5d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -17,7 +17,7 @@
                 <slot name="body"></slot>
               </div>
               <div class="modal-footer" v-if="!hideFooter">
-                <button class="btn btn-cancel" @click="$emit('close')">{{ $t('action.close') }}</button>
+                <button class="btn btn-cancel" @click="$emit('close')">{{ closeKey }}</button>
                 <slot name="footer"></slot>
               </div>
             </div>
@@ -30,6 +30,7 @@
 
 <script lang="ts">
 import {defineComponent} from "vue";
+import { trans, MODAL_ACTION_CLOSE } from '../../../../../../../../../../assets/translator'
 /*
  *    This Modal component is a mix between Vue3 modal implementation
  *    [+] with 'v-if:showModal' directive:parameter, html scope is added/removed not just shown/hidden
@@ -53,7 +54,13 @@ export default defineComponent({
          default: false
       }
    },
-   emits: ['close']
+   emits: ['close'],
+    computed: {
+       closeKey() {
+           console.log('close key', trans(MODAL_ACTION_CLOSE))
+           return trans(MODAL_ACTION_CLOSE)
+       }
+    }
 });
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 421cac473..3f2cb49f3 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -1,3 +1,7 @@
+modal:
+    action:
+        close: Fermer
+
 "This program is free software: you can redistribute it and/or modify it under the terms of the <strong>GNU Affero General Public License</strong>": "Ce programme est un logiciel libre: vous pouvez le redistribuer et/ou le modifier selon les termes de la licence <strong>GNU Affero GPL</strong>"
 User manual: Manuel d'utilisation
 Search: Rechercher

From 41f13e29e093e30c9e0f2831b4141475844d944f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 20 Sep 2024 12:16:31 +0200
Subject: [PATCH 06/25] Expand detection of duplicates in translations command

Added functionality to specify key namespaces that should be exluded from duplicate detection
Added functionality to check the accidental creation of duplicates based on an md5 hash of translation duplicates.
---
 .../DetectTranslationDuplicatesCommand.php    | 79 +++++++++++++++----
 1 file changed, 65 insertions(+), 14 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php b/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
index 16e0c0b24..a2038a309 100644
--- a/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Command;
 
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,6 +20,7 @@ use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Symfony\Component\Console\Helper\Table;
 
+
 class DetectTranslationDuplicatesCommand extends Command
 {
     protected static $defaultName = 'app:detect-duplicate-translations';
@@ -32,12 +34,16 @@ class DetectTranslationDuplicatesCommand extends Command
     {
         $this
             ->setDescription('Detects duplicate translations in YAML files.')
-            ->addOption('locale', null, InputOption::VALUE_REQUIRED, 'Locale to check for duplicate translations', 'en');
+            ->addOption('locale', null, InputOption::VALUE_REQUIRED, 'Locale to check for duplicate translations', 'en')
+            ->addOption('exclude-namespaces', null, InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, 'Namespaces to exclude from duplicate detection', [])
+            ->addArgument('verify-hash', InputArgument::OPTIONAL, 'The expected hash to verify translation integrity');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $locale = $input->getOption('locale');
+        $excludedNamespaces = $input->getOption('exclude-namespaces');
+        $expectedHash = $input->getArgument('verify-hash');
 
         // Loop through all bundles and get the translation directories
         foreach ($this->kernel->getBundles() as $bundle) {
@@ -58,6 +64,9 @@ class DetectTranslationDuplicatesCommand extends Command
         // Iterate through each domain in the catalogue
         foreach ($catalogue->all() as $domain => $translations) {
             foreach ($translations as $key => $value) {
+                if ($this->isExcludedNamespace("$domain.$key", $excludedNamespaces)) {
+                    continue;
+                }
                 if (is_array($value)) {
                     $this->flattenTranslation($value, "$domain.$key", $allTranslations);
                 } else {
@@ -74,25 +83,27 @@ class DetectTranslationDuplicatesCommand extends Command
             return count($keys) > 1;
         });
 
-        if (empty($duplicates)) {
-            $output->writeln("<info>No duplicate translations found for locale '$locale'.</info>");
-        } else {
-            $output->writeln("<comment>Duplicate translations found for locale '$locale':</comment>");
+        $duplicatesHash = $this->generateDuplicatesHash($duplicates);
 
-            // Display the duplicates in a table
-            $table = new Table($output);
-            $table->setHeaders(['Translation', 'Used in Keys']);
+        if ($expectedHash) {
+            if ($duplicatesHash === $expectedHash) {
+                $output->writeln('<info>Translations are consistent with the expected hash.</info>');
 
-            foreach ($duplicates as $translation => $keys) {
-                $wrappedTranslation = $this->wrapText($translation, 40);
-                $wrappedKeys = $this->wrapText(implode(', ', $keys), 80);
+                $output->writeln("<info>Current duplicate hash: $duplicatesHash</info>");
+                return Command::SUCCESS;
+            } else {
+                $output->writeln('<error>Translation hash mismatch! Potential duplicate added.</error>');
+                $this->renderDuplicatesTable($output, $duplicates, $locale);
 
-                $table->addRow([$wrappedTranslation, $wrappedKeys]);
+                $output->writeln("<info>Current duplicate hash: $duplicatesHash</info>");
+                return Command::FAILURE;
             }
-
-            $table->render();
         }
 
+        $this->renderDuplicatesTable($output, $duplicates, $locale);
+
+        $output->writeln("<info>Current duplicate hash: $duplicatesHash</info>");
+
         return Command::SUCCESS;
     }
 
@@ -126,4 +137,44 @@ class DetectTranslationDuplicatesCommand extends Command
     {
         return wordwrap($text, $width, "\n", true);
     }
+
+    private function isExcludedNamespace(string $key, array $excludedNamespaces): bool
+    {
+        foreach ($excludedNamespaces as $namespace) {
+            if (str_starts_with($key, $namespace)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private function generateDuplicatesHash(array $duplicates): string
+    {
+        ksort($duplicates);
+        foreach ($duplicates as $translation => $keys) {
+            sort($keys);
+        }
+
+        return hash('md5', serialize($duplicates));
+    }
+
+    private function renderDuplicatesTable(OutputInterface $output, array $duplicates, string $locale): void
+    {
+        if (empty($duplicates)) {
+            $output->writeln("<info>No duplicate translations found for locale '$locale'.</info>");
+            return;
+        }
+
+        $output->writeln("<comment>Duplicate translations found for locale '$locale':</comment>");
+        $table = new Table($output);
+        $table->setHeaders(['Translation', 'Used in Keys']);
+
+        foreach ($duplicates as $translation => $keys) {
+            $wrappedTranslation = $this->wrapText($translation, 40);
+            $wrappedKeys = $this->wrapText(implode(', ', $keys), 80);
+            $table->addRow([$wrappedTranslation, $wrappedKeys]);
+        }
+
+        $table->render();
+    }
 }

From c602c27b39cac6ab3295ddec5110aa84373c2f8a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 20 Sep 2024 13:57:56 +0200
Subject: [PATCH 07/25] Remove empty translation key, causing errors

---
 src/Bundle/ChillEventBundle/translations/messages.fr.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillEventBundle/translations/messages.fr.yml b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
index 6046881ff..8136a9e84 100644
--- a/src/Bundle/ChillEventBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
@@ -123,7 +123,6 @@ Role: Rôles
 Role creation: Nouveau rôle
 Role edit: Modifier un rôle
 
-'': ''
 xlsx: xlsx
 ods: ods
 csv: csv

From 9732b80298b0e346d67813a2b1db320fcc42d9f1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 20 Sep 2024 13:58:23 +0200
Subject: [PATCH 08/25] Implement translation with Symfony translator within
 vue component

---
 .../Resources/public/vuejs/_components/Modal.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index 720f91c5d..cd1ffbf23 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -17,7 +17,7 @@
                 <slot name="body"></slot>
               </div>
               <div class="modal-footer" v-if="!hideFooter">
-                <button class="btn btn-cancel" @click="$emit('close')">{{ closeKey }}</button>
+                <button class="btn btn-cancel" @click="$emit('close')">{{ trans(modalActionClose) }}</button>
                 <slot name="footer"></slot>
               </div>
             </div>
@@ -55,12 +55,14 @@ export default defineComponent({
       }
    },
    emits: ['close'],
-    computed: {
-       closeKey() {
-           console.log('close key', trans(MODAL_ACTION_CLOSE))
-           return trans(MODAL_ACTION_CLOSE)
-       }
-    }
+    setup() {
+        const modalActionClose = MODAL_ACTION_CLOSE;
+
+        return {
+            modalActionClose,
+            trans
+        };
+    },
 });
 </script>
 

From c1c632dcb05ecee107af28ab1b26be1a875ca92a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 20 Sep 2024 14:02:36 +0200
Subject: [PATCH 09/25] Refactor use of translation key in vue template
 slightly

---
 .../Resources/public/vuejs/_components/Modal.vue            | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index cd1ffbf23..f6546f554 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -17,7 +17,7 @@
                 <slot name="body"></slot>
               </div>
               <div class="modal-footer" v-if="!hideFooter">
-                <button class="btn btn-cancel" @click="$emit('close')">{{ trans(modalActionClose) }}</button>
+                <button class="btn btn-cancel" @click="$emit('close')">{{ trans(MODAL_ACTION_CLOSE) }}</button>
                 <slot name="footer"></slot>
               </div>
             </div>
@@ -56,10 +56,8 @@ export default defineComponent({
    },
    emits: ['close'],
     setup() {
-        const modalActionClose = MODAL_ACTION_CLOSE;
-
         return {
-            modalActionClose,
+            MODAL_ACTION_CLOSE,
             trans
         };
     },

From 9c963a2122b99ee00f86b3413b9bbd82962866e3 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 24 Sep 2024 11:04:17 +0200
Subject: [PATCH 10/25] Implement translator in vue components and use script
 setup syntax

---
 .../public/vuejs/_components/BadgeEntity.vue  |  49 ++-
 .../public/vuejs/_components/Confidential.vue |  27 +-
 .../EntityWorkflow/ListWorkflow.vue           |  90 ++----
 .../EntityWorkflow/ListWorkflowModal.vue      | 142 ++++-----
 .../EntityWorkflow/PickWorkflow.vue           |  86 ++---
 .../public/vuejs/_components/Modal.vue        |  40 +--
 .../Notification/NotificationReadToggle.vue   | 120 ++++---
 .../public/vuejs/_components/OpenWopiLink.vue | 300 ++++++++----------
 .../translations/messages+intl-icu.fr.yaml    |   6 +
 .../translations/messages.fr.yml              |  12 +
 10 files changed, 400 insertions(+), 472 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
index 4e99b7fd3..c15f44564 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
@@ -1,12 +1,12 @@
 <template>
 
     <span v-if="entity.type === 'person'" class="badge rounded-pill bg-person">
-        {{ $t('person') }}
+        {{ trans(PERSON) }}
     </span>
 
     <span v-if="entity.type === 'thirdparty'" class="badge rounded-pill bg-thirdparty">
         <template v-if="options.displayLong !== true">
-            {{ $t('thirdparty.thirdparty')}}
+            {{ trans(THIRDPARTY)}}
         </template>
 
         <i class="fa fa-fw fa-user" v-if="entity.kind === 'child'"></i>
@@ -14,41 +14,36 @@
         <i class="fa fa-fw fa-user-md" v-else></i>
 
         <template v-if="options.displayLong === true">
-            <span v-if="entity.kind === 'child'">{{ $t('thirdparty.child')}}</span>
-            <span v-else-if="entity.kind === 'company'">{{ $t('thirdparty.company')}}</span>
-            <span v-else>{{ $t('thirdparty.contact')}}</span>
+            <span v-if="entity.kind === 'child'">{{ trans(THIRDPARTY_CONTACT_OF)}}</span>
+            <span v-else-if="entity.kind === 'company'">{{ trans(THIRDPARTY_COMPANY)}}</span>
+            <span v-else>{{ trans(THIRDPARTY_A_CONTACT)}}</span>
         </template>
     </span>
 
     <span v-if="entity.type === 'user'" class="badge rounded-pill bg-user">
-        {{ $t('user')}}
+        {{ trans(ACCEPTED_USERS)}}
     </span>
 
     <span v-if="entity.type === 'household'" class="badge rounded-pill bg-user">
-        {{ $t('household')}}
+        {{ trans(HOUSEHOLD)}}
     </span>
 
 
 </template>
 
-<script>
-export default {
-    name: "BadgeEntity",
-    props: ['options', 'entity'],
-    i18n: {
-        messages: {
-            fr: {
-                person: "Usager",
-                thirdparty: {
-                    thirdparty: "Tiers",
-                    child: "Personne de contact",
-                    company: "Personne morale",
-                    contact: "Personne physique",
-                },
-                user: 'TMS',
-                household: 'Ménage',
-            }
-        }
-    }
-}
+<script setup lang="ts">
+import {
+    trans,
+    HOUSEHOLD,
+    ACCEPTED_USERS,
+    THIRDPARTY_A_CONTACT,
+    THIRDPARTY_COMPANY,
+    THIRDPARTY_CONTACT_OF,
+    PERSON, THIRDPARTY
+} from '../../../../../../../../../../assets/translator'
+
+const props = defineProps({
+        options: Object,
+        entity: Object
+    })
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index 837440524..6afded7b5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -9,23 +9,16 @@
     </div>
 </template>
 
-<script>
-export default {
-    name: "Confidential",
-    data() {
-        return {
-            isBlurred: true,
-            toggleIcon: 'fa-eye',
-        };
-    },
-    methods : {
-        toggleBlur() {
-            console.log(this.positionBtnFar);
-            this.isBlurred = !this.isBlurred;
-            this.toggleIcon = this.isBlurred ? 'fa-eye' : 'fa-eye-slash';
-        },
-    },
-}
+<script setup lang="ts">
+import { ref } from 'vue';
+
+const isBlurred = ref(true);
+const toggleIcon = ref('fa-eye');
+
+const toggleBlur = () => {
+    isBlurred.value = !isBlurred.value;
+    toggleIcon.value = isBlurred.value ? 'fa-eye' : 'fa-eye-slash';
+};
 </script>
 
 <style scoped lang='scss'>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
index 0e16b522f..d321f8e0d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
@@ -44,17 +44,17 @@
             <div class="item-col flex-grow-1">
                <p v-if="isUserSubscribedToStep(w)">
                   <i class="fa fa-check fa-fw"></i>
-                  {{ $t('you_subscribed_to_all_steps') }}
+                  {{ trans(WORKFLOW_YOU_DESCRIBED_TO_ALL_STEPS) }}
                </p>
                <p v-if="isUserSubscribedToFinal(w)">
                   <i class="fa fa-check fa-fw"></i>
-                  {{ $t('you_subscribed_to_final_step') }}
+                  {{ trans(WORKFLOW_YOU_SUBSCRIBED_TO_FINAL_STEP) }}
                </p>
             </div>
             <div class="item-col">
                <ul class="record_actions">
                   <li>
-                     <a :href="goToUrl(w)" class="btn btn-sm btn-show" :title="$t('action.show')"></a>
+                     <a :href="goToUrl(w)" class="btn btn-sm btn-show" :title="trans(SEE)"></a>
                   </li>
                </ul>
             </div>
@@ -64,69 +64,47 @@
    </div>
 </template>
 
-<script>
+<script setup lang="ts">
 import Popover from 'bootstrap/js/src/popover';
+import { onMounted } from 'vue';
+import { trans, SEE, BY_USER, WORKFLOW_AT, WORKFLOW_YOU_SUBSCRIBED_TO_ALL_STEPS, WORKFLOW_YOU_SUBSCRIBED_TO_FINAL_STEP } from '../../../../../../../../../../../assets/translator'
 
-const i18n = {
-   messages: {
-      fr: {
-         you_subscribed_to_all_steps: "Vous recevrez une notification à chaque étape",
-         you_subscribed_to_final_step: "Vous recevrez une notification à l'étape finale",
-         by: "Par",
-         at: "Le"
-      }
-   }
-}
-
-export default {
-   name: "ListWorkflow",
-   i18n: i18n,
-   props: {
+    // props
+    const props = defineProps({
       workflows: {
          type: Array,
          required: true,
       }
-   },
-   methods: {
-      goToUrl(w) {
-         return `/fr/main/workflow/${w.id}/show`;
-      },
-      getPopTitle(step) {
-         if (step.transitionPrevious != null) {
-            //console.log(step.transitionPrevious.text);
-            let freezed = step.isFreezed ? `<i class="fa fa-snowflake-o fa-sm me-1"></i>` : ``;
-            return `${freezed}${step.transitionPrevious.text}`;
-         }
-      },
-      getPopContent(step) {
-         if (step.transitionPrevious != null) {
-            return `<ul class="small_in_title">
-              <li><span class="item-key">${i18n.messages.fr.by} : </span><b>${step.transitionPreviousBy.text}</b></li>
-              <li><span class="item-key">${i18n.messages.fr.at} : </span><b>${this.formatDate(step.transitionPreviousAt.datetime)}</b></li>
-              </ul>`
-            ;
-         }
-      },
-      formatDate(datetime) {
-         return datetime.split('T')[0] +' '+ datetime.split('T')[1].substring(0,5)
-      },
-      isUserSubscribedToStep(w) {
-         // todo
-         return false;
-      },
-      isUserSubscribedToFinal(w) {
-         // todo
-         return false;
-      },
-   },
-   mounted() {
+    })
+
+    // methods
+    const goToUrl = (w) => `/fr/main/workflow/${w.id}/show`;
+    const getPopTitle = (step) => {
+     if (step.transitionPrevious != null) {
+        //console.log(step.transitionPrevious.text);
+        let freezed = step.isFreezed ? `<i class="fa fa-snowflake-o fa-sm me-1"></i>` : ``;
+        return `${freezed}${step.transitionPrevious.text}`;
+     }
+    }
+    const getPopContent = (step) => {
+     if (step.transitionPrevious != null) {
+        return `<ul class="small_in_title">
+          <li><span class="item-key">{{ trans(BY_USER) }} : </span><b>${step.transitionPreviousBy.text}</b></li>
+          <li><span class="item-key">{{ trans(WORKFLOW_AT) }} : </span><b>${this.formatDate(step.transitionPreviousAt.datetime)}</b></li>
+          </ul>`
+        ;
+     }
+    }
+    const formatDate = (datetime) => datetime.split('T')[0] +' '+ datetime.split('T')[1].substring(0,5)
+    const isUserSubscribedToStep = (w) => false;
+    const isUserSubscribedToFinal = (w) => false;
+
+    onMounted(() => {
       const triggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'));
       const popoverList = triggerList.map(function (el) {
-         //console.log('popover', el)
          return new Popover(el, {
             html: true,
          });
       });
-   }
-}
+    })
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue
index 151bc06c7..2b98b7c81 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue
@@ -4,26 +4,26 @@
       class="btn btn-primary"
       @click="openModal">
       <b>{{ countWorkflows }}</b>
-      <template v-if="countWorkflows > 1">{{ $t('workflows') }}</template>
-      <template v-else>{{ $t('workflow') }}</template>
+      <template v-if="countWorkflows > 1">{{ trans(WORKFLOW_ASSOCIATED, { aw: 'other' }) }}</template>
+      <template v-else>{{ trans(WORKFLOW_ASSOCIATED, { aw: 1 }) }}</template>
    </button>
 
-   <pick-workflow v-else-if="allowCreate"
+   <Pick-workflow v-else-if="allowCreate"
       :relatedEntityClass="this.relatedEntityClass"
       :relatedEntityId="this.relatedEntityId"
       :workflowsAvailables="workflowsAvailables"
       :preventDefaultMoveToGenerate="this.$props.preventDefaultMoveToGenerate"
       :goToGenerateWorkflowPayload="this.goToGenerateWorkflowPayload"
       @go-to-generate-workflow="goToGenerateWorkflow"
-   ></pick-workflow>
+   ></Pick-workflow>
 
    <teleport to="body">
-      <modal v-if="modal.showModal"
+      <Modal v-if="modal.showModal"
          :modalDialogClass="modal.modalDialogClass"
          @close="modal.showModal = false">
 
          <template v-slot:header>
-            <h2 class="modal-title">{{ $t('workflow_list') }}</h2>
+            <h2 class="modal-title">{{ trans(WORKFLOW_LIST) }}</h2>
          </template>
 
          <template v-slot:body>
@@ -43,89 +43,67 @@
             ></pick-workflow>
          </template>
 
-      </modal>
+      </Modal>
    </teleport>
 </template>
 
-<script>
+<script setup>
+import { ref, computed, defineProps, defineEmits } from 'vue';
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
 import PickWorkflow from 'ChillMainAssets/vuejs/_components/EntityWorkflow/PickWorkflow.vue';
 import ListWorkflowVue from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflow.vue';
+import { trans, WORKFLOW_ASSOCIATED, WORKFLOW_LIST } from '../../../../../../../../../../../assets/translator'
 
-export default {
-   name: "ListWorkflowModal",
-   components: {
-      Modal,
-      PickWorkflow,
-      ListWorkflowVue
-   },
-   emits: ['goToGenerateWorkflow'],
-   props: {
-      workflows: {
-         type: Array,
-         required: true,
-      },
-      allowCreate: {
-         type: Boolean,
-         required: true,
-      },
-      relatedEntityClass: {
-         type: String,
-         required: true,
-      },
-      relatedEntityId: {
-         type: Number,
-         required: false,
-      },
-      workflowsAvailables: {
-         type: Array,
-         required: true,
-      },
-      preventDefaultMoveToGenerate: {
-          type: Boolean,
-          required: false,
-          default: false,
-      },
-      goToGenerateWorkflowPayload: {
-         required: false,
-         default: {}
-      },
-   },
-    data() {
-      return {
-         modal: {
-            showModal: false,
-            modalDialogClass: "modal-dialog-scrollable modal-xl"
-         },
-      }
-   },
-   computed: {
-      countWorkflows() {
-         return this.workflows.length;
-      },
-      hasWorkflow() {
-         return this.countWorkflows > 0;
-      }
-   },
-   methods: {
-      openModal() {
-         this.modal.showModal = true;
-      },
-      goToGenerateWorkflow(data) {
-          console.log('go to generate workflow intercepted', data);
-          this.$emit('goToGenerateWorkflow', data);
-      }
-   },
-   i18n: {
-      messages: {
-         fr: {
-            workflow_list: "Liste des workflows associés",
-            workflow: " workflow associé",
-            workflows: " workflows associés",
-         }
-      }
-   }
-}
+// Define props
+const props = defineProps({
+    workflows: {
+        type: Array,
+        required: true,
+    },
+    allowCreate: {
+        type: Boolean,
+        required: true,
+    },
+    relatedEntityClass: {
+        type: String,
+        required: true,
+    },
+    relatedEntityId: {
+        type: Number,
+        required: false,
+    },
+    workflowsAvailables: {
+        type: Array,
+        required: true,
+    },
+    preventDefaultMoveToGenerate: {
+        type: Boolean,
+        required: false,
+        default: false,
+    },
+    goToGenerateWorkflowPayload: {
+        required: false,
+        default: () => ({}),
+    },
+});
+
+// Define emits
+const emit = defineEmits(['goToGenerateWorkflow']);
+
+// Reactive data
+const modal = ref({
+    showModal: false,
+    modalDialogClass: "modal-dialog-scrollable modal-xl"
+});
+
+// Computed properties
+const countWorkflows = computed(() => props.workflows.length);
+const hasWorkflow = computed(() => countWorkflows.value > 0);
+
+// Methods
+const openModal = () => modal.value.showModal = true;
+
+const goToGenerateWorkflow = (data) => emit('goToGenerateWorkflow', data);
 </script>
 
 <style scoped></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue
index 9ed1ef6cc..54918aef6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue
@@ -13,51 +13,57 @@
     </template>
 </template>
 
-<script>
+<script setup>
+import { defineProps, defineEmits } from 'vue';
+import { buildLinkCreate } from 'ChillMainAssets/lib/entity-workflow/api.js';
 
-import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
-
-export default {
-    name: "PickWorkflow",
-    props: {
-        relatedEntityClass: {
-            type: String,
-            required: true,
-        },
-        relatedEntityId: {
-            type: Number,
-            required: false,
-        },
-        workflowsAvailables: {
-            type: Array,
-            required: true,
-        },
-        preventDefaultMoveToGenerate: {
-            type: Boolean,
-            required: false,
-            default: false,
-        },
-        goToGenerateWorkflowPayload: {
-            required: false,
-            default: {}
-        },
+// Define props
+const props = defineProps({
+    relatedEntityClass: {
+        type: String,
+        required: true,
     },
-    emits: ['goToGenerateWorkflow'],
-    methods: {
-        makeLink(workflowName) {
-            return buildLinkCreate(workflowName, this.relatedEntityClass, this.relatedEntityId);
-        },
-        goToGenerateWorkflow(event, workflowName) {
-            console.log('goToGenerateWorkflow', event, workflowName);
+    relatedEntityId: {
+        type: Number,
+        required: false,
+    },
+    workflowsAvailables: {
+        type: Array,
+        required: true,
+    },
+    preventDefaultMoveToGenerate: {
+        type: Boolean,
+        required: false,
+        default: false,
+    },
+    goToGenerateWorkflowPayload: {
+        required: false,
+        default: () => ({}), // Use a function to return an object
+    },
+});
 
-            if (!this.$props.preventDefaultMoveToGenerate) {
-                console.log('to go generate');
-                window.location.assign(this.makeLink(workflowName));
-            }
+// Define emits
+const emit = defineEmits(['goToGenerateWorkflow']);
 
-            this.$emit('goToGenerateWorkflow', {event, workflowName, link: this.makeLink(workflowName), payload: this.goToGenerateWorkflowPayload});
-        }
+// Methods
+function makeLink(workflowName) {
+    return buildLinkCreate(workflowName, props.relatedEntityClass, props.relatedEntityId);
+}
+
+function goToGenerateWorkflow(event, workflowName) {
+    console.log('goToGenerateWorkflow', event, workflowName);
+
+    if (!props.preventDefaultMoveToGenerate) {
+        console.log('to go generate');
+        window.location.assign(makeLink(workflowName));
     }
+
+    emit('goToGenerateWorkflow', {
+        event,
+        workflowName,
+        link: makeLink(workflowName),
+        payload: props.goToGenerateWorkflowPayload,
+    });
 }
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index f6546f554..e2589cfcb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -28,9 +28,7 @@
    </transition>
 </template>
 
-<script lang="ts">
-import {defineComponent} from "vue";
-import { trans, MODAL_ACTION_CLOSE } from '../../../../../../../../../../assets/translator'
+<script setup lang="ts">
 /*
  *    This Modal component is a mix between Vue3 modal implementation
  *    [+] with 'v-if:showModal' directive:parameter, html scope is added/removed not just shown/hidden
@@ -40,28 +38,24 @@ import { trans, MODAL_ACTION_CLOSE } from '../../../../../../../../../../assets/
  *    [+] using bootstrap css classes, the modal have a responsive behaviour,
  *    [+] modal design can be configured using css classes (size, scroll)
  */
-export default defineComponent({
-   name: 'Modal',
-   props: {
-      modalDialogClass: {
-         type: Object,
-         required: false,
-         default: {},
-      },
-      hideFooter: {
-         type: Boolean,
-         required: false,
-         default: false
-      }
-   },
-   emits: ['close'],
-    setup() {
-        return {
-            MODAL_ACTION_CLOSE,
-            trans
-        };
+import { trans, MODAL_ACTION_CLOSE } from '../../../../../../../../../../assets/translator'
+import { defineProps, defineEmits } from 'vue';
+
+// Define the props
+const props = defineProps({
+    modalDialogClass: {
+        type: Object,
+        required: false,
+        default: {},
+    },
+    hideFooter: {
+        type: Boolean,
+        required: false,
+        default: false,
     },
 });
+
+const emit = defineEmits(['close']);
 </script>
 
 <style lang="scss">
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
index 7f56e40d6..2bd906d7d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
@@ -6,12 +6,12 @@
                 class="btn"
                 :class="overrideClass"
                 type="button"
-                :title="$t('markAsUnread')"
+                :title="trans(NOTIFICATION_MARK_AS_UNREAD)"
                 @click="markAsUnread"
                 >
             <i class="fa fa-sm fa-envelope-o"></i>
             <span v-if="!buttonNoText" class="ps-2">
-                {{ $t('markAsUnread') }}
+                {{ trans(NOTIFICATION_MARK_AS_UNREAD) }}
             </span>
         </button>
 
@@ -19,12 +19,12 @@
                 class="btn"
                 :class="overrideClass"
                 type="button"
-                :title="$t('markAsRead')"
+                :title="trans(NOTIFICATION_MARK_AS_READ)"
                 @click="markAsRead"
                 >
             <i class="fa fa-sm fa-envelope-open-o"></i>
             <span v-if="!buttonNoText" class="ps-2">
-                {{ $t('markAsRead') }}
+                {{ trans(NOTIFICATION_MARK_AS_READ) }}
             </span>
         </button>
 
@@ -40,71 +40,65 @@
     </div>
 </template>
 
-<script>
+<script setup lang="ts">
+import { ref, computed } from 'vue';
 import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods.ts';
+import { trans, NOTIFICATION_MARK_AS_READ, NOTIFICATION_MARK_AS_UNREAD } from '../../../../../../../../../../../assets/translator'
 
-export default {
-    name: "NotificationReadToggle",
-    props: {
-        isRead: {
-            required: true,
-            type: Boolean,
-        },
-        notificationId: {
-            required: true,
-            type: Number,
-        },
-        // Optional
-        buttonClass: {
-            required: false,
-            type: String
-        },
-        buttonNoText: {
-            required: false,
-            type: Boolean,
-        },
-        showUrl: {
-            required: false,
-            type: String
-        }
+// Props
+const props = defineProps({
+    isRead: {
+        type: Boolean,
+        required: true,
     },
-    emits: ['markRead', 'markUnread'],
-    computed: {
-        /// [Option] override default button appearance (btn-misc)
-        overrideClass() {
-            return this.buttonClass ? this.buttonClass : 'btn-misc'
-        },
-        /// [Option] don't display text on button
-        buttonHideText() {
-            return this.buttonNoText;
-        },
-        /// [Option] showUrl is href for show page second button.
-        //  When passed, the component return a button-group with 2 buttons.
-        isButtonGroup() {
-            return this.showUrl;
-        }
+    notificationId: {
+        type: Number,
+        required: true,
     },
-    methods: {
-        markAsUnread() {
-           makeFetch('POST', `/api/1.0/main/notification/${this.notificationId}/mark/unread`, []).then(response => {
-               this.$emit('markRead', { notificationId: this.notificationId });
-           })
-        },
-        markAsRead() {
-            makeFetch('POST', `/api/1.0/main/notification/${this.notificationId}/mark/read`, []).then(response => {
-                this.$emit('markUnread', { notificationId: this.notificationId });
-            })
+    buttonClass: {
+        type: String,
+        required: false,
+    },
+    buttonNoText: {
+        type: Boolean,
+        required: false,
+    },
+    showUrl: {
+        type: String,
+        required: false,
+    },
+});
+
+// Emits
+const emit = defineEmits(['markRead', 'markUnread']);
+
+// Computed
+const overrideClass = computed(() => props.buttonClass || 'btn-misc');
+const buttonHideText = computed(() => props.buttonNoText);
+const isButtonGroup = computed(() => props.showUrl);
+
+// Methods
+const markAsUnread = () => {
+    makeFetch('POST', `/api/1.0/main/notification/${props.notificationId}/mark/unread`, []).then(() => {
+        emit('markRead', { notificationId: props.notificationId });
+    });
+};
+
+const markAsRead = () => {
+    makeFetch('POST', `/api/1.0/main/notification/${props.notificationId}/mark/read`, []).then(() => {
+        emit('markUnread', { notificationId: props.notificationId });
+    });
+};
+
+// i18n setup
+/*const { t } = useI18n({
+    messages: {
+        fr: {
+            markAsUnread: 'Marquer comme non-lu',
+            markAsRead: 'Marquer comme lu',
         },
     },
-    i18n: {
-        messages: {
-            fr: {
-                markAsUnread: 'Marquer comme non-lu',
-                markAsRead: 'Marquer comme lu'
-            }
-        }
-    }
-}
+});*/
 </script>
 
 <style lang="scss">
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue
index 5f8a85208..fa6bddab4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue
@@ -4,21 +4,21 @@
          isChangeIcon ? 'change-icon' : '',
          isChangeClass ? options.changeClass : 'btn-wopilink' ]"
       @click="openModal">
-      
+
       <i v-if="isChangeIcon" class="fa me-2" :class="options.changeIcon"></i>
-      
+
       <span v-if="!noText">
-         {{ $t('online_edit_document') }}
+         {{ trans(WOPI_ONLINE_EDIT_DOCUMENT) }}
       </span>
    </a>
-   
+
    <teleport to="body">
       <div class="wopi-frame" v-if="isOpenDocument">
          <modal v-if="modal.showModal"
             :modalDialogClass="modal.modalDialogClass"
             :hideFooter=true
             @close="modal.showModal = false">
-            
+
             <template v-slot:header>
                <img class="logo" :src="logo" height="45"/>
                   <span class="ms-auto me-3">
@@ -31,189 +31,161 @@
                   </a>
                   -->
             </template>
-            
+
             <template v-slot:body>
                <div v-if="loading" class="loading">
-                  <i class="fa fa-circle-o-notch fa-spin fa-3x" :title="$t('loading')"></i>
+                  <i class="fa fa-circle-o-notch fa-spin fa-3x" :title="trans(WOPI_LOADING)"></i>
                </div>
                <iframe
                   :src="this.wopiUrl"
                   @load="loaded"
                ></iframe>
             </template>
-            
+
          </modal>
       </div>
       <div v-else>
-         <modal v-if="modal.showModal"
+         <Modal v-if="modal.showModal"
             modalDialogClass="modal-sm"
             @close="modal.showModal = false">
-            
+
             <template v-slot:header>
-               <h3>{{ $t('invalid_title') }}</h3>
+               <h3>{{ trans(WOPI_INVALID_TITLE) }}</h3>
             </template>
             <template v-slot:body>
-               <div class="alert alert-warning">{{ $t('invalid_message') }}</div>
+               <div class="alert alert-warning">{{ trans(WOPI_ONLINE_EDIT_DOCUMENT) }}</div>
             </template>
-   
-         </modal>
+
+         </Modal>
       </div>
    </teleport>
 </template>
 
-<script>
+<script setup lang="ts">
+import { ref, computed } from 'vue';
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
 import logo from 'ChillMainAssets/chill/img/logo-chill-sans-slogan_white.png';
+import { useI18n } from 'vue-i18n';
+import { trans, WOPI_ONLINE_EDIT_DOCUMENT, WOPI_INVALID_TITLE, WOPI_LOADING } from '../../../../../../../../../../assets/translator'
 
-export default {
-   name: "OpenWopiLink",
-   components: {
-      Modal
-   },
-   props: {
-      wopiUrl: {
-         type: String,
-         required: true
-      },
-      type: {
-         type: String,
-         required: true
-      },
-      options: {
-         type: Object,
-         required: false
-      }
-   },
-   data() {
-      return {
-         modal: {
-            showModal: false,
-            modalDialogClass: "modal-fullscreen" //modal-dialog-scrollable
-         },
-         logo: logo,
-         loading: false,
-         mime: [
-            // TODO temporary hardcoded. to be replaced by twig extension or a collabora server query
-            'application/clarisworks',
-            'application/coreldraw',
-            'application/macwriteii',
-            'application/msword',
-            'application/pdf',
-            'application/vnd.lotus-1-2-3',
-            'application/vnd.ms-excel',
-            'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-            'application/vnd.ms-excel.sheet.macroEnabled.12',
-            'application/vnd.ms-excel.template.macroEnabled.12',
-            'application/vnd.ms-powerpoint',
-            'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
-            'application/vnd.ms-powerpoint.template.macroEnabled.12',
-            'application/vnd.ms-visio.drawing',
-            'application/vnd.ms-word.document.macroEnabled.12',
-            'application/vnd.ms-word.template.macroEnabled.12',
-            'application/vnd.ms-works',
-            'application/vnd.oasis.opendocument.chart',
-            'application/vnd.oasis.opendocument.formula',
-            'application/vnd.oasis.opendocument.graphics',
-            'application/vnd.oasis.opendocument.graphics-flat-xml',
-            'application/vnd.oasis.opendocument.graphics-template',
-            'application/vnd.oasis.opendocument.presentation',
-            'application/vnd.oasis.opendocument.presentation-flat-xml',
-            'application/vnd.oasis.opendocument.presentation-template',
-            'application/vnd.oasis.opendocument.spreadsheet',
-            'application/vnd.oasis.opendocument.spreadsheet-flat-xml',
-            'application/vnd.oasis.opendocument.spreadsheet-template',
-            'application/vnd.oasis.opendocument.text',
-            'application/vnd.oasis.opendocument.text-flat-xml',
-            'application/vnd.oasis.opendocument.text-master',
-            'application/vnd.oasis.opendocument.text-master-template',
-            'application/vnd.oasis.opendocument.text-template',
-            'application/vnd.oasis.opendocument.text-web',
-            'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-            'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-            'application/vnd.openxmlformats-officedocument.presentationml.template',
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-            'application/vnd.sun.xml.calc',
-            'application/vnd.sun.xml.calc.template',
-            'application/vnd.sun.xml.chart',
-            'application/vnd.sun.xml.draw',
-            'application/vnd.sun.xml.draw.template',
-            'application/vnd.sun.xml.impress',
-            'application/vnd.sun.xml.impress.template',
-            'application/vnd.sun.xml.math',
-            'application/vnd.sun.xml.writer',
-            'application/vnd.sun.xml.writer.global',
-            'application/vnd.sun.xml.writer.template',
-            'application/vnd.visio',
-            'application/vnd.visio2013',
-            'application/vnd.wordperfect',
-            'application/x-abiword',
-            'application/x-aportisdoc',
-            'application/x-dbase',
-            'application/x-dif-document',
-            'application/x-fictionbook+xml',
-            'application/x-gnumeric',
-            'application/x-hwp',
-            'application/x-iwork-keynote-sffkey',
-            'application/x-iwork-numbers-sffnumbers',
-            'application/x-iwork-pages-sffpages',
-            'application/x-mspublisher',
-            'application/x-mswrite',
-            'application/x-pagemaker',
-            'application/x-sony-bbeb',
-            'application/x-t602',
-         ]
-      }
-   },
-   computed: {
-      isOpenDocument() {
-         if (this.mime.indexOf(this.type) !== -1) {
-            return true;
-         }
-         return false;
-      },
-      noText() {
-         if (typeof this.options.noText !== 'undefined') {
-            return this.options.noText === true;
-         }
-         return false;
-      },
-      isChangeIcon() {
-         if (typeof this.options.changeIcon !== 'undefined') {
-            return (!(this.options.changeIcon === null || this.options.changeIcon === ''))
-         }
-         return false;
-      },
-      isChangeClass() {
-         if (typeof this.options.changeClass !== 'undefined') {
-            return (!(this.options.changeClass === null || this.options.changeClass === ''))
-         }
-         return false;
-      }
-   },
-   methods: {
-      openModal() {
-         this.loading = true;
-         this.modal.showModal = true;
-      },
-      loaded() {
-         this.loading = false;
-      }
-   },
-   i18n: {
-      messages: {
-         fr: {
-            online_edit_document: "Éditer en ligne",
-            save_and_quit: "Enregistrer et quitter",
-            loading: "Chargement de l'éditeur en ligne",
-            invalid_title: "Format incompatible",
-            invalid_message: "Désolé, ce format de document n'est pas éditable en ligne.",
-         }
-      }
-   }
-}
+
+// Props
+const props = defineProps({
+    wopiUrl: {
+        type: String,
+        required: true,
+    },
+    type: {
+        type: String,
+        required: true,
+    },
+    options: {
+        type: Object,
+        required: false,
+    },
+});
+
+// data
+const modal = ref({
+    showModal: false,
+    modalDialogClass: "modal-fullscreen",
+});
+const logoImg = logo;
+const loading = ref(false);
+
+// MIME types
+const mime = [
+    // TODO temporary hardcoded. to be replaced by twig extension or a collabora server query
+    'application/clarisworks',
+    'application/coreldraw',
+    'application/macwriteii',
+    'application/msword',
+    'application/pdf',
+    'application/vnd.lotus-1-2-3',
+    'application/vnd.ms-excel',
+    'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+    'application/vnd.ms-excel.sheet.macroEnabled.12',
+    'application/vnd.ms-excel.template.macroEnabled.12',
+    'application/vnd.ms-powerpoint',
+    'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+    'application/vnd.ms-powerpoint.template.macroEnabled.12',
+    'application/vnd.ms-visio.drawing',
+    'application/vnd.ms-word.document.macroEnabled.12',
+    'application/vnd.ms-word.template.macroEnabled.12',
+    'application/vnd.ms-works',
+    'application/vnd.oasis.opendocument.chart',
+    'application/vnd.oasis.opendocument.formula',
+    'application/vnd.oasis.opendocument.graphics',
+    'application/vnd.oasis.opendocument.graphics-flat-xml',
+    'application/vnd.oasis.opendocument.graphics-template',
+    'application/vnd.oasis.opendocument.presentation',
+    'application/vnd.oasis.opendocument.presentation-flat-xml',
+    'application/vnd.oasis.opendocument.presentation-template',
+    'application/vnd.oasis.opendocument.spreadsheet',
+    'application/vnd.oasis.opendocument.spreadsheet-flat-xml',
+    'application/vnd.oasis.opendocument.spreadsheet-template',
+    'application/vnd.oasis.opendocument.text',
+    'application/vnd.oasis.opendocument.text-flat-xml',
+    'application/vnd.oasis.opendocument.text-master',
+    'application/vnd.oasis.opendocument.text-master-template',
+    'application/vnd.oasis.opendocument.text-template',
+    'application/vnd.oasis.opendocument.text-web',
+    'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+    'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+    'application/vnd.openxmlformats-officedocument.presentationml.template',
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+    'application/vnd.sun.xml.calc',
+    'application/vnd.sun.xml.calc.template',
+    'application/vnd.sun.xml.chart',
+    'application/vnd.sun.xml.draw',
+    'application/vnd.sun.xml.draw.template',
+    'application/vnd.sun.xml.impress',
+    'application/vnd.sun.xml.impress.template',
+    'application/vnd.sun.xml.math',
+    'application/vnd.sun.xml.writer',
+    'application/vnd.sun.xml.writer.global',
+    'application/vnd.sun.xml.writer.template',
+    'application/vnd.visio',
+    'application/vnd.visio2013',
+    'application/vnd.wordperfect',
+    'application/x-abiword',
+    'application/x-aportisdoc',
+    'application/x-dbase',
+    'application/x-dif-document',
+    'application/x-fictionbook+xml',
+    'application/x-gnumeric',
+    'application/x-hwp',
+    'application/x-iwork-keynote-sffkey',
+    'application/x-iwork-numbers-sffnumbers',
+    'application/x-iwork-pages-sffpages',
+    'application/x-mspublisher',
+    'application/x-mswrite',
+    'application/x-pagemaker',
+    'application/x-sony-bbeb',
+    'application/x-t602',
+]
+
+// Computed
+const isOpenDocument = computed(() => mime.includes(props.type));
+
+const noText = computed(() => props.options?.noText === true);
+
+const isChangeIcon = computed(() => !!props.options?.changeIcon);
+
+const isChangeClass = computed(() => !!props.options?.changeClass);
+
+// Methods
+const openModal = () => {
+    loading.value = true;
+    modal.value.showModal = true;
+};
+
+const loaded = () => {
+    loading.value = false;
+};
 </script>
 
 <style lang="scss">
diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
index 96b2edd98..662ef0d10 100644
--- a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
@@ -45,6 +45,12 @@ workflow:
             few {# workflows}
             other {# workflows}
         }
+    associated: >-
+        {aw, plural,
+            =0 {Aucun workflow associé}
+            one {# Workflow associé}
+            other {# Workflows associés}
+        }
 
 duration:
     minute: >-
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 3f2cb49f3..c66a3e827 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -478,6 +478,8 @@ Follow workflow: Suivre la décision
 Workflow history: Historique de la décision
 
 workflow:
+    list: Liste des workflows associés
+    associated: workflow associé
     Created by: Créé par
     My decision: Ma décision
     Next step: Prochaine étape
@@ -525,6 +527,7 @@ workflow:
     Previous workflow transitionned help: Workflows où vous avez exécuté une action.
     For: Pour
     Cc: Cc
+    At: Le
     You must select a next step, pick another decision if no next steps are available: Il faut une prochaine étape. Choissisez une autre décision si nécessaire.
     An access key was also sent to those addresses: Un lien d'accès a été envoyé à ces adresses
     Those users are also granted to apply a transition by using an access key: Ces utilisateurs ont obtenu l'accès grâce au lien reçu par email
@@ -575,6 +578,8 @@ notification:
     dest by email help: Les adresses email mentionnées ici recevront un lien d'accès. Un compte utilisateur sera toujours nécessaire.
     Remove an email: Supprimer l'adresse email
     Email with access link: Adresse email ayant reçu un lien d'accès
+    mark_as_read: Marquer comme lu
+    mark_as_unread: Marquer comme non-lu
 
 export:
     address_helper:
@@ -708,4 +713,11 @@ news:
     read_more: Lire la suite
     show_details: Voir l'actualité
 
+wopi:
+    online_edit_document: Éditer en ligne
+    save_and_quit: Enregistrer et quitter
+    loading: Chargement de l'éditeur en ligne
+    invalid_title: Format incompatible
+    invalid_message: Désolé, ce format de document n'est pas éditable en ligne.
+
 

From 077163a7748ec1f50feefd24a92514dd58571527 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 25 Sep 2024 10:11:35 +0200
Subject: [PATCH 11/25] Transfer translations from i18n file to yaml file

---
 .../Resources/public/vuejs/Address/i18n.js    |  3 +-
 .../translations/messages.fr.yml              | 47 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index 28670f56c..63977c8df 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -1,5 +1,6 @@
 import { multiSelectMessages } from 'ChillMainAssets/vuejs/_js/i18n'
-
+// translations added to yaml file and used through symfony ux translator.
+// these can be deleted once everything is verified to work.
 const addressMessages = {
     fr: {
         add_an_address_title: 'Créer une adresse',
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index c66a3e827..86440c503 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -106,6 +106,48 @@ address:
     address_homeless: L'adresse est-elle celle d'un domicile fixe ?
     real address: Adresse d'un domicile
     consider homeless: Cette adresse est incomplète
+    add_an_address_title: Créer une adresse
+    edit_an_address_title: Modifier une adresse
+    create_a_new_address: Créer une nouvelle adresse
+    edit_address: Modifier l'adresse
+    select_an_address_title: Sélectionner une adresse
+    fill_an_address: Compléter l'adresse
+    select_country: Choisir le pays
+    country: Pays
+    select_city: Choisir une localité
+    city: Localité
+    other_city: Autre localité
+    select_address: Choisir une adresse
+    address: Adresse
+    other_address: Autre adresse
+    create_address: Adresse inconnue. Cliquez ici pour créer une nouvelle adresse
+    isNoAddress: Pas d'adresse complète
+    isConfidential: Adresse confidentielle
+    street: Nom de rue
+    streetNumber: Numéro
+    floor: Étage
+    corridor: Couloir
+    steps: Escalier
+    flat: Appartement
+    buildingName: Résidence
+    extra: Complément d'adresse
+    distribution: Cedex
+    create_postal_code: Localité inconnue. Cliquez ici pour créer une nouvelle localité
+    postalCode_name: Nom
+    postalCode_code: Code postal
+    date: Date de la nouvelle adresse
+    valid_from: L'adresse est valable à partir du
+    valid_to: L'adresse est valable jusqu'au
+    back_to_the_list: Retour à la liste
+    loading: chargement en cours...
+    address_suggestions: Suggestion d'adresses
+    address_new_success: La nouvelle adresse est enregistrée.
+    address_edit_success: L'adresse a été mise à jour.
+    wait_redirection: La page est redirigée.
+    not_yet_address: Il n'y a pas encore d'adresse. Cliquez sur '+ Créer une adresse'
+    use_this_address: Utiliser cette adresse
+    household:
+        move_date: Date du déménagement
 address more:
     floor: ét
     corridor: coul
@@ -534,7 +576,10 @@ workflow:
     Access link copied: Lien d'accès copié
     This link grant any user to apply a transition: Le lien d'accès suivant permet d'appliquer une transition
     The workflow may be accssed through this link: Une transition peut être appliquée sur ce workflow grâce au lien d'accès suivant
-
+    subscribe_final: Recevoir une notification à l'étape finale
+    unsubscribe_final: Ne plus recevoir de notification à l'étape finale
+    subscribe_all_steps: Recevoir une notification à chaque étape du suivi
+    unsubscribe_all_steps: Ne plus recevoir de notification à chaque étape du suivi
 
 Subscribe final: Recevoir une notification à l'étape finale
 Subscribe all steps: Recevoir une notification à chaque étape

From 7edd644963b96f10141cedac766393177557af0d Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 25 Sep 2024 10:13:04 +0200
Subject: [PATCH 12/25] wip: use script setup and new translator within vue
 components main bundle

---
 .../public/vuejs/_components/BadgeEntity.vue  |  2 +-
 .../public/vuejs/_components/Confidential.vue |  2 +-
 .../_components/Entity/AddressRenderBox.vue   | 73 ++++++++--------
 .../_components/Entity/UserRenderBoxBadge.vue |  7 +-
 .../EntityWorkflowVueSubscriber.vue           | 86 +++++--------------
 .../EntityWorkflow/ListWorkflow.vue           |  2 +-
 .../public/vuejs/_components/Modal.vue        |  2 +-
 .../Notification/NotificationReadToggle.vue   |  6 +-
 .../public/vuejs/_components/OpenWopiLink.vue |  8 +-
 9 files changed, 68 insertions(+), 120 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
index c15f44564..633b142f8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
@@ -31,7 +31,7 @@
 
 </template>
 
-<script setup lang="ts">
+<script setup>
 import {
     trans,
     HOUSEHOLD,
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index 6afded7b5..78e627f79 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -9,7 +9,7 @@
     </div>
 </template>
 
-<script setup lang="ts">
+<script setup>
 import { ref } from 'vue';
 
 const isBlurred = ref(true);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
index 00fb2b996..fac79fc8c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -51,12 +51,12 @@
       <div v-if="useDatePane === true" class="address-more">
          <div v-if="address.validFrom">
             <span class="validFrom">
-               <b>{{ $t('validFrom') }}</b>: {{ $d(address.validFrom.date) }}
+               <b>{{ trans(ADDRESS_VALID_FROM) }}</b>: {{ $d(address.validFrom.date) }}
             </span>
          </div>
          <div v-if="address.validTo">
             <span class="validTo">
-               <b>{{ $t('validTo') }}</b>: {{ $d(address.validTo.date) }}
+               <b>{{ trans(ADDRESS_VALID_TO) }}</b>: {{ $d(address.validTo.date) }}
             </span>
          </div>
       </div>
@@ -64,48 +64,47 @@
    </component>
 </template>
 
-<script>
-
+<script setup>
+import { computed } from 'vue';
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
 import AddressDetailsButton from "ChillMainAssets/vuejs/_components/AddressDetails/AddressDetailsButton.vue";
+import { trans, ADDRESS_VALID_FROM, ADDRESS_VALID_TO } from '../../../../../../../../../../../assets/translator'
 
-export default {
-   name: 'AddressRenderBox',
-   components: {
-      Confidential,
-      AddressDetailsButton,
-   },
-   props: {
-      address: {
-         type: Object
-      },
-      isMultiline: {
-         default: true,
-         type: Boolean
-      },
-      useDatePane: {
-         default: false,
-         type: Boolean
-      },
-      showButtonDetails: {
+// Props
+const props = defineProps({
+    address: {
+        type: Object,
+    },
+    isMultiline: {
         default: true,
-        type: Boolean
-      }
-   },
-   computed: {
-      component() {
-         return this.isMultiline === true ? "div" : "span";
-      },
-      multiline() {
-         return this.isMultiline === true ? "multiline" : "";
-      },
-      isConfidential() {
-         return this.address.confidential;
-      }
-   }
+        type: Boolean,
+    },
+    useDatePane: {
+        default: false,
+        type: Boolean,
+    },
+    showButtonDetails: {
+        default: true,
+        type: Boolean,
+    },
+});
+
+// Components
+const components = {
+    Confidential,
+    AddressDetailsButton,
 };
+
+// Computed
+const component = computed(() => (props.isMultiline ? 'div' : 'span'));
+
+const multiline = computed(() => (props.isMultiline ? 'multiline' : ''));
+
+const isConfidential = computed(() => props.address?.confidential);
+
 </script>
 
+
 <style lang="scss" scoped>
 p {
    &:after {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
index a9c2db9b4..5b193194d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
@@ -5,9 +5,6 @@
 </span>
 </template>
 
-<script>
-export default {
-    name: "UserRenderBoxBadge",
-    props: ['user'],
-}
+<script setup>
+    const props = defineProps(['user'])
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
index 895345b63..5e0aed917 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
@@ -2,39 +2,30 @@
     <div class="d-grid gap-2 my-3">
         <button class="btn btn-misc" type="button" v-if="!subscriberFinal" @click="subscribeTo('subscribe', 'final')">
             <i class="fa fa-check fa-fw"></i>
-            {{ $t('subscribe_final') }}
+            {{ trans(WORKFLOW_SUBSCRIBE_FINAL) }}
         </button>
         <button class="btn btn-misc" type="button" v-if="subscriberFinal" @click="subscribeTo('unsubscribe', 'final')">
             <i class="fa fa-times fa-fw"></i>
-            {{ $t('unsubscribe_final') }}
+            {{ trans(WORKFLOW_UNSUBSCRIBE_FINAL) }}
         </button>
         <button class="btn btn-misc" type="button" v-if="!subscriberStep" @click="subscribeTo('subscribe', 'step')">
             <i class="fa fa-check fa-fw"></i>
-            {{ $t('subscribe_all_steps') }}
+            {{ trans(WORKFLOW_SUBSCRIBE_ALL_STEPS) }}
         </button>
         <button class="btn btn-misc" type="button" v-if="subscriberStep" @click="subscribeTo('unsubscribe', 'step')">
             <i class="fa fa-times fa-fw"></i>
-            {{ $t('unsubscribe_all_steps') }}
+            {{ trans(WORKFLOW_UNSUBSCRIBE_ALL_STEPS) }}
         </button>
     </div>
 </template>
 
-<script>
-import {makeFetch} from 'ChillMainAssets/lib/api/apiMethods.ts';
+<script setup>
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods.ts';
+import { defineProps, defineEmits } from 'vue';
+import { trans, WORKFLOW_SUBSCRIBE_FINAL, WORKFLOW_UNSUBSCRIBE_FINAL, WORKFLOW_SUBSCRIBE_ALL_STEPS, WORKFLOW_UNSUBSCRIBE_ALL_STEPS } from '../../../../../../../../../../../assets/translator'
 
-export default {
-    name: "EntityWorkflowVueSubscriber",
-    i18n: {
-       messages: {
-          fr: {
-             subscribe_final: "Recevoir une notification à l'étape finale",
-             unsubscribe_final: "Ne plus recevoir de notification à l'étape finale",
-             subscribe_all_steps: "Recevoir une notification à chaque étape du suivi",
-             unsubscribe_all_steps: "Ne plus recevoir de notification à chaque étape du suivi",
-          }
-       }
-    },
-    props: {
+    // props
+    const props = defineProps({
         entityWorkflowId: {
             type: Number,
             required: true,
@@ -47,55 +38,22 @@ export default {
             type: Boolean,
             required: true,
         },
-    },
-    emits: ['subscriptionUpdated'],
-    methods: {
-        subscribeTo(step, to) {
-            let params = new URLSearchParams();
-            params.set('subscribe', to);
+    })
 
-            const url = `/api/1.0/main/workflow/${this.entityWorkflowId}/${step}?` + params.toString();
+    //methods
+    const subscribeTo = (step, to) => {
+        let params = new URLSearchParams();
+        params.set('subscribe', to);
 
-            makeFetch('POST', url).then(response => {
-                this.$emit('subscriptionUpdated', response);
-            });
-        }
-    },
-}
-/*
-*   ALTERNATIVES
-*
-    <div class="form-check form-switch">
-        <input class="form-check-input" type="checkbox" role="switch" id="laststep">
-        <label class="form-check-label" for="laststep">{{ $t('subscribe_final') }}</label>
-    </div>
-    <div class="form-check form-switch">
-        <input class="form-check-input" type="checkbox" role="switch" id="allsteps">
-        <label class="form-check-label" for="allsteps">{{ $t('subscribe_all_steps') }}</label>
-    </div>
+        const url = `/api/1.0/main/workflow/${props.entityWorkflowId}/${step}?` + params.toString();
 
-    <div class="list-group my-3">
-        <label class="list-group-item">
-            <input class="form-check-input me-1" type="checkbox" value="">
-            {{ $t('subscribe_final') }}
-        </label>
-        <label class="list-group-item">
-            <input class="form-check-input me-1" type="checkbox" value="">
-            {{ $t('subscribe_all_steps') }}
-        </label>
-    </div>
+        makeFetch('POST', url).then(response => {
+            emit('subscriptionUpdated', response);
+        });
+    }
 
-    <div class="btn-group-vertical my-3" role="group">
-        <button type="button" class="btn btn-outline-primary">
-            <i class="fa fa-check fa-fw"></i>
-            {{ $t('subscribe_final') }}
-        </button>
-        <button type="button" class="btn btn-outline-primary">
-            <i class="fa fa-check fa-fw"></i>
-            {{ $t('subscribe_all_steps') }}
-        </button>
-    </div>
-*/
+    // emit
+    const emit = defineEmits(['subscriptionUpdated'])
 </script>
 
 <style scoped></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
index d321f8e0d..c7f56887b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
@@ -64,7 +64,7 @@
    </div>
 </template>
 
-<script setup lang="ts">
+<script setup>
 import Popover from 'bootstrap/js/src/popover';
 import { onMounted } from 'vue';
 import { trans, SEE, BY_USER, WORKFLOW_AT, WORKFLOW_YOU_SUBSCRIBED_TO_ALL_STEPS, WORKFLOW_YOU_SUBSCRIBED_TO_FINAL_STEP } from '../../../../../../../../../../../assets/translator'
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index e2589cfcb..d484bfb79 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -28,7 +28,7 @@
    </transition>
 </template>
 
-<script setup lang="ts">
+<script setup>
 /*
  *    This Modal component is a mix between Vue3 modal implementation
  *    [+] with 'v-if:showModal' directive:parameter, html scope is added/removed not just shown/hidden
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
index 2bd906d7d..dc8c6c8f6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
@@ -32,7 +32,7 @@
             type="button"
             class="btn btn-outline-primary"
             :href="showUrl"
-            :title="$t('action.show')"
+            :title="trans(SEE)"
             >
             <i class="fa fa-sm fa-comment-o"></i>
         </a>
@@ -40,10 +40,10 @@
     </div>
 </template>
 
-<script setup lang="ts">
+<script setup>
 import { ref, computed } from 'vue';
 import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods.ts';
-import { trans, NOTIFICATION_MARK_AS_READ, NOTIFICATION_MARK_AS_UNREAD } from '../../../../../../../../../../../assets/translator'
+import { trans, NOTIFICATION_MARK_AS_READ, NOTIFICATION_MARK_AS_UNREAD, SEE } from '../../../../../../../../../../../assets/translator'
 
 // Props
 const props = defineProps({
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue
index fa6bddab4..2b34d6071 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue
@@ -24,12 +24,6 @@
                   <span class="ms-auto me-3">
                      <span v-if="options.title">{{ options.title }}</span>
                   </span>
-                  <!--
-                  <a class="btn btn-outline-light">
-                     <i class="fa fa-save fa-fw"></i>
-                     {{ $t('save_and_quit') }}
-                  </a>
-                  -->
             </template>
 
             <template v-slot:body>
@@ -61,7 +55,7 @@
    </teleport>
 </template>
 
-<script setup lang="ts">
+<script setup>
 import { ref, computed } from 'vue';
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
 import logo from 'ChillMainAssets/chill/img/logo-chill-sans-slogan_white.png';

From d82a3af063540fe183b1892d9deff03a917ce5d5 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 1 Oct 2024 20:05:04 +0200
Subject: [PATCH 13/25] Adjust more translations in mainbundle create component

---
 .../vuejs/OnTheFly/components/Create.vue      | 102 +++++++++---------
 .../Resources/public/vuejs/OnTheFly/index.js  |   2 +
 .../translations/messages.fr.yml              |  21 +++-
 3 files changed, 74 insertions(+), 51 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
index 22b0181e5..24968e364 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
@@ -4,7 +4,7 @@
          <a class="nav-link" :class="{ active: isActive('person') }">
             <label for="person">
                <input type="radio" name="person" id="person" v-model="radioType" value="person">
-               {{ $t('onthefly.create.person') }}
+               {{ $trans('ONTHEFLY_CREATE_PERSON') }}
             </label>
          </a>
       </li>
@@ -37,59 +37,61 @@
    </div>
 </template>
 
-<script>
+<script setup>
+import { ref, computed, onMounted } from 'vue';
 import OnTheFlyPerson from 'ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue';
 import OnTheFlyThirdparty from 'ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdParty.vue';
 
-export default {
-   name: "OnTheFlyCreate",
-   props: ['action', 'allowedTypes', 'query'],
-   components: {
-      OnTheFlyPerson,
-      OnTheFlyThirdparty
-   },
-   data() {
-      return {
-         type: null
-      }
-   },
-   computed: {
-      radioType: {
-         set(type) {
-            this.type = type;
-            console.log('## type:', type, ', action:', this.action);
-         },
-         get() {
-            return this.type;
-         }
-      },
-   },
-   mounted() {
-      this.type = (this.allowedTypes.length === 1 && this.allowedTypes.includes('thirdparty')) ? 'thirdparty' : 'person'
-   },
-   methods: {
-      isActive(tab) {
-         return (this.type === tab) ? true : false;
-      },
-      castDataByType() {
-         switch (this.radioType) {
-            case 'person':
-               return this.$refs.castPerson.$data.person;
-            case 'thirdparty':
-               let data = this.$refs.castThirdparty.$data.thirdparty;
-               if (data.address !== undefined && data.address !== null) {
-                   data.address = { id: data.address.address_id }
-               } else {
-                   data.address = null;
-               }
+// Define props
+const props = defineProps(['action', 'allowedTypes', 'query']);
+
+// Create a ref for type
+const type = ref(null);
+
+// Computed
+const radioType = computed({
+    get: () => type.value,
+    set(value) {
+        type.value = value;
+        console.log('## type:', value, ', action:', props.action);
+    }
+});
+
+// Mounted
+onMounted(() => {
+    type.value = (props.allowedTypes.length === 1 && props.allowedTypes.includes('thirdparty'))
+        ? 'thirdparty'
+        : 'person';
+});
+
+// Methods
+const isActive = (tab) => {
+    return type.value === tab;
+};
+
+const castDataByType = () => {
+    switch (radioType.value) {
+        case 'person':
+            return $refs.castPerson.$data.person;
+        case 'thirdparty':
+            let data = $refs.castThirdparty.$data.thirdparty;
+            if (data.address !== undefined && data.address !== null) {
+                data.address = { id: data.address.address_id };
+            } else {
+                data.address = null;
+            }
+            return data;
+        default:
+            throw Error('Invalid type of entity');
+    }
+};
+
+// Register components
+defineExpose({
+    isActive,
+    castDataByType
+});
 
-               return data;
-            default:
-               throw Error('Invalid type of entity')
-         }
-      }
-   }
-}
 </script>
 
 <style lang="css" scoped>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js
index 87dc82114..b7c2096ab 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js
@@ -2,6 +2,7 @@ import { createApp } from "vue";
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n';
 import { ontheflyMessages } from './i18n.js';
 import App from "./App.vue";
+import TranslatorPlugin from '../translatorPlugin'
 
 const i18n = _createI18n( ontheflyMessages );
 
@@ -30,6 +31,7 @@ containers.forEach((container) => {
         }
     })
     .use(i18n)
+    .use(TranslatorPlugin)
     .component('app', App)
     .mount(container);
 
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 86440c503..e6f9791da 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -765,4 +765,23 @@ wopi:
     invalid_title: Format incompatible
     invalid_message: Désolé, ce format de document n'est pas éditable en ligne.
 
-
+onthefly:
+    show:
+        person: Détails de l'usager
+        thirdparty: Détails du tiers
+        file_person: Ouvrir la fiche de l'usager
+        file_thirdparty: Voir le Tiers
+    edit:
+        person: Modifier un usager
+        thirdparty: Modifier un tiers
+    create:
+        button: Créer {q}
+        title:
+            default: Création d'un nouvel usager ou d'un tiers professionnel
+            person: Création d'un nouvel usager
+            thirdparty: Création d'un nouveau tiers professionnel
+        person: un nouvel usager
+        thirdparty: un nouveau tiers professionnel
+    addContact:
+        title: Créer un contact pour {q}
+    resource_comment_title: Un commentaire est associé à cet interlocuteur

From 760f74b386f71ffa697d3d58d35f9a52764f8506 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 8 Oct 2024 13:25:09 +0200
Subject: [PATCH 14/25] Add translation keys from i18ns to yaml files

---
 .../translations/messages.fr.yml              | 25 +++++++++++++++++++
 .../translations/messages.fr.yml              | 10 ++++++++
 2 files changed, 35 insertions(+)

diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 7e72bc016..6bbdc123a 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -101,6 +101,31 @@ activity:
     Insert a document: Insérer un document
     Remove a document: Supprimer le document
     comment: Commentaire
+    errors: Le formulaire contient des erreurs
+    social_issues: Problématiques sociales
+    choose_other_social_issue: Ajouter une autre problématique sociale...
+    social_actions: Actions d'accompagnement
+    select_first_a_social_issue: Sélectionnez d'abord une problématique sociale
+    social_action_list_empty: Aucune action sociale disponible
+    add_persons: Ajouter des personnes concernées
+    bloc_persons: Usagers
+    bloc_persons_associated: Usagers du parcours
+    bloc_persons_not_associated: Tiers non-pro.
+    bloc_thirdparty: Tiers professionnels
+    bloc_users: T(M)S
+    location: Localisation
+    choose_location: Choisissez une localisation
+    choose_location_type: Choisissez un type de localisation
+    create_new_location: Créer une nouvelle localisation
+    location_fields:
+        name: Nom
+        type: Type
+        phonenumber1: Téléphone
+        phonenumber2: Autre téléphone
+        email: Adresse courriel
+    create_address: Créer une adresse
+    edit_address: Modifier l'adresse
+
 No documents: Aucun document
 
 # activity filter in list page
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index e6f9791da..28bd04474 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -785,3 +785,13 @@ onthefly:
     addContact:
         title: Créer un contact pour {q}
     resource_comment_title: Un commentaire est associé à cet interlocuteur
+
+
+multiselect:
+    placeholder: Choisir
+    tag_placeholder: Créer un nouvel élément
+    select_label: Entrée ou cliquez pour sélectionner
+    deselect_label: Entrée ou cliquez pour désélectionner
+    select_group_label: Appuyer sur "Entrée" pour sélectionner ce groupe
+    deselect_group_label: Appuyer sur "Entrée" pour désélectionner ce groupe
+    selected_label: Sélectionné'

From b0b1a28f50e89480a87961775676828c9ee4e997 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 8 Oct 2024 13:25:31 +0200
Subject: [PATCH 15/25] Implement trans() in activity vue components

---
 .../Activity/components/ConcernedGroups.vue   | 32 +++++++++++++---
 .../vuejs/Activity/components/Location.vue    | 28 +++++++++++---
 .../components/Location/NewLocation.vue       | 38 ++++++++++++++-----
 .../Activity/components/SocialIssuesAcc.vue   | 25 +++++++++---
 4 files changed, 98 insertions(+), 25 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
index 7ec62d07d..edd6434ca 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
@@ -22,8 +22,8 @@
       <ul class="record_actions">
          <li class="add-persons">
             <add-persons
-               buttonTitle="activity.add_persons"
-               modalTitle="activity.add_persons"
+               :buttonTitle="trans(ACTIVITY_ADD_PERSONS)"
+               :modalTitle="trans(ACTIVITY_ADD_PERSONS)"
                v-bind:key="addPersons.key"
                v-bind:options="addPersonsOptions"
                @addNewPersons="addNewPersons"
@@ -40,6 +40,20 @@ import { mapState, mapGetters } from 'vuex';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import PersonsBloc from './ConcernedGroups/PersonsBloc.vue';
 import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
+import {
+    ACTIVITY_BLOC_PERSONS,
+    ACTIVITY_BLOC_PERSONS_ASSOCIATED,
+    ACTIVITY_BLOC_PERSONS_NOT_ASSOCIATED,
+    ACTIVITY_BLOC_THIRDPARTY,
+    ACTIVITY_BLOC_USERS,
+    ACTIVITY_ADD_PERSONS,
+    ACTIVITY_LOCATION,
+    ACTIVITY_CHOOSE_LOCATION,
+    MULTISELECT_SELECT_LABEL,
+    MULTISELECT_DESELECT_LABEL,
+    MULTISELECT_SELECTED_LABEL,
+    trans,
+} from "../../../../../../../../../../../assets/translator";
 
 export default {
    name: "ConcernedGroups",
@@ -48,16 +62,22 @@ export default {
       PersonsBloc,
       PersonText
    },
+    setup() {
+        return {
+            trans,
+            ACTIVITY_ADD_PERSONS
+        };
+    },
    data() {
       return {
          personsBlocs: [
             {  key: 'persons',
-               title: 'activity.bloc_persons',
+               title: trans(ACTIVITY_BLOC_PERSONS),
                persons: [],
                included: false
             },
             {  key: 'personsAssociated',
-               title: 'activity.bloc_persons_associated',
+               title: trans(ACTIVITY_BLOC_PERSONS_ASSOCIATED),
                persons: [],
                included: window.activity ? window.activity.activityType.personsVisible !== 0 : true
             },
@@ -67,12 +87,12 @@ export default {
                included: window.activity ? window.activity.activityType.personsVisible !== 0 : true
             },
             {  key: 'thirdparty',
-               title: 'activity.bloc_thirdparty',
+               title: trans(ACTIVITY_BLOC_THIRDPARTY),
                persons: [],
                included: window.activity ? window.activity.activityType.thirdPartiesVisible !== 0 : true
             },
             {  key: 'users',
-               title: 'activity.bloc_users',
+               title: trans(ACTIVITY_BLOC_USERS),
                persons: [],
                included: window.activity ? window.activity.activityType.usersVisible !== 0 : true
             },
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
index 42a69e4c5..e591880bb 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -2,7 +2,7 @@
     <teleport to="#location">
         <div class="mb-3 row">
             <label :class="locationClassList">
-                {{ $t("activity.location") }}
+                {{ trans(ACTIVITY_LOCATION) }}
             </label>
             <div class="col-sm-8">
                 <VueMultiselect
@@ -13,11 +13,11 @@
                     open-direction="top"
                     :multiple="false"
                     :searchable="true"
-                    :placeholder="$t('activity.choose_location')"
+                    :placeholder="trans(ACTIVITY_CHOOSE_LOCATION)"
                     :custom-label="customLabel"
-                    :select-label="$t('multiselect.select_label')"
-                    :deselect-label="$t('multiselect.deselect_label')"
-                    :selected-label="$t('multiselect.selected_label')"
+                    :select-label="trans(MULTISELECT_SELECT_LABEL)"
+                    :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
+                    :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
                     :options="availableLocations"
                     group-values="locations"
                     group-label="locationGroup"
@@ -34,6 +34,14 @@
 import { mapState, mapGetters } from "vuex";
 import VueMultiselect from "vue-multiselect";
 import NewLocation from "./Location/NewLocation.vue";
+import {
+    trans,
+    ACTIVITY_LOCATION,
+    ACTIVITY_CHOOSE_LOCATION,
+    MULTISELECT_SELECT_LABEL,
+    MULTISELECT_DESELECT_LABEL,
+    MULTISELECT_SELECTED_LABEL
+} from '../../../../../../../../../../../assets/translator'
 
 export default {
     name: "Location",
@@ -41,6 +49,16 @@ export default {
         NewLocation,
         VueMultiselect,
     },
+    setup() {
+        return {
+            trans,
+            ACTIVITY_LOCATION,
+            ACTIVITY_CHOOSE_LOCATION,
+            MULTISELECT_SELECT_LABEL,
+            MULTISELECT_DESELECT_LABEL,
+            MULTISELECT_SELECTED_LABEL
+        };
+    },
     data() {
         return {
             locationClassList:
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
index 568c8747a..eaf7278fa 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -3,7 +3,7 @@
         <ul class="record_actions">
             <li>
                 <a class="btn btn-sm btn-create" @click="openModal">
-                    {{ $t('activity.create_new_location') }}
+                    {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
                 </a>
             </li>
         </ul>
@@ -14,7 +14,7 @@
                 @close="modal.showModal = false">
 
                 <template v-slot:header>
-                    <h3 class="modal-title">{{ $t('activity.create_new_location') }}</h3>
+                    <h3 class="modal-title">{{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}</h3>
                 </template>
                 <template v-slot:body>
                     <form>
@@ -26,17 +26,17 @@
 
                         <div class="form-floating mb-3">
                             <select class="form-select form-select-lg" id="type" required v-model="selectType">
-                                <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
+                                <option selected disabled value="">{{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}</option>
                                 <option v-for="t in locationTypes" :value="t" :key="t.id">
                                     {{ t.title.fr }}
                                 </option>
                             </select>
-                            <label>{{ $t('activity.location_fields.type') }}</label>
+                            <label>{{ trans(ACTIVITY_LOCATION_FIELDS_TYPE) }}</label>
                         </div>
 
                         <div class="form-floating mb-3">
                             <input class="form-control form-control-lg" id="name" v-model="inputName" placeholder />
-                            <label for="name">{{ $t('activity.location_fields.name') }}</label>
+                            <label for="name">{{ trans(ACTIVITY_LOCATION_FIELDS_NAME) }}</label>
                         </div>
 
                         <add-address
@@ -49,15 +49,15 @@
 
                         <div class="form-floating mb-3" v-if="showContactData">
                             <input class="form-control form-control-lg" id="phonenumber1" v-model="inputPhonenumber1" placeholder />
-                            <label for="phonenumber1">{{ $t('activity.location_fields.phonenumber1') }}</label>
+                            <label for="phonenumber1">{{ trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER1) }}</label>
                         </div>
                         <div class="form-floating mb-3" v-if="hasPhonenumber1">
                             <input class="form-control form-control-lg" id="phonenumber2" v-model="inputPhonenumber2" placeholder />
-                            <label for="phonenumber2">{{ $t('activity.location_fields.phonenumber2') }}</label>
+                            <label for="phonenumber2">{{ trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER2) }}</label>
                         </div>
                         <div class="form-floating mb-3" v-if="showContactData">
                             <input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
-                            <label for="email">{{ $t('activity.location_fields.email') }}</label>
+                            <label for="email">{{ trans(ACTIVITY_LOCATION_FIELDS_EMAIL) }}</label>
                         </div>
 
                     </form>
@@ -66,7 +66,7 @@
                     <button class="btn btn-save"
                         @click.prevent="saveNewLocation"
                     >
-                        {{ $t('action.save') }}
+                        {{ trans(SAVE) }}
                     </button>
                 </template>
 
@@ -81,6 +81,13 @@ import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue"
 import { mapState } from "vuex";
 import { getLocationTypes } from "../../api";
 import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
+import {
+    SAVE,
+    ACTIVITY_LOCATION_FIELDS_EMAIL, ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
+    ACTIVITY_LOCATION_FIELDS_PHONENUMBER2, ACTIVITY_LOCATION_FIELDS_NAME,
+    ACTIVITY_LOCATION_FIELDS_TYPE, ACTIVITY_CHOOSE_LOCATION_TYPE, ACTIVITY_CREATE_NEW_LOCATION,
+    trans
+} from "../../../../../../../../../../../../assets/translator";
 
 export default {
     name: "NewLocation",
@@ -88,6 +95,19 @@ export default {
         Modal,
         AddAddress,
     },
+    setup() {
+        return {
+            trans,
+            SAVE,
+            ACTIVITY_LOCATION_FIELDS_EMAIL,
+            ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
+            ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
+            ACTIVITY_LOCATION_FIELDS_NAME,
+            ACTIVITY_LOCATION_FIELDS_TYPE,
+            ACTIVITY_CHOOSE_LOCATION_TYPE,
+            ACTIVITY_CREATE_NEW_LOCATION,
+        };
+    },
     props: ['availableLocations'],
     data() {
         return {
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
index 4691a860a..02b642cf9 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -3,7 +3,7 @@
 
       <div class="mb-3 row">
          <div class="col-4">
-            <label :class="socialIssuesClassList">{{ $t('activity.social_issues') }}</label>
+            <label :class="socialIssuesClassList">{{ trans(ACTIVITY_SOCIAL_ISSUES) }}</label>
          </div>
          <div class="col-8">
 
@@ -31,7 +31,7 @@
                :allow-empty="true"
                :show-labels="false"
                :loading="issueIsLoading"
-               :placeholder="$t('activity.choose_other_social_issue')"
+               :placeholder="trans(ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE)"
                :options="socialIssuesOther"
                @select="addIssueInList">
             </VueMultiselect>
@@ -42,7 +42,7 @@
 
       <div class="mb-3 row">
          <div class="col-4">
-            <label :class="socialActionsClassList">{{ $t('activity.social_actions') }}</label>
+            <label :class="socialActionsClassList">{{ trans(ACTIVITY_SOCIAL_ACTIONS) }}</label>
          </div>
          <div class="col-8">
 
@@ -51,7 +51,7 @@
             </div>
 
             <span v-else-if="socialIssuesSelected.length === 0" class="inline-choice chill-no-data-statement mt-3">
-               {{ $t('activity.select_first_a_social_issue') }}
+               {{ trans(ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE) }}
             </span>
 
             <template v-else-if="socialActionsList.length > 0">
@@ -66,7 +66,7 @@
             </template>
 
             <span v-else-if="actionAreLoaded && socialActionsList.length === 0" class="inline-choice chill-no-data-statement mt-3">
-               {{ $t('activity.social_action_list_empty') }}
+               {{ trans(ACTIVITY_SOCIAL_ACTION_LIST_EMPTY) }}
             </span>
 
 
@@ -81,6 +81,11 @@ import VueMultiselect from 'vue-multiselect';
 import CheckSocialIssue from './SocialIssuesAcc/CheckSocialIssue.vue';
 import CheckSocialAction from './SocialIssuesAcc/CheckSocialAction.vue';
 import { getSocialIssues, getSocialActionByIssue } from '../api.js';
+import {
+    ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
+    ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE, ACTIVITY_SOCIAL_ACTIONS,
+    ACTIVITY_SOCIAL_ISSUES, ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE, trans
+} from "../../../../../../../../../../../assets/translator";
 
 export default {
    name: "SocialIssuesAcc",
@@ -89,6 +94,16 @@ export default {
       CheckSocialAction,
       VueMultiselect
    },
+    setup() {
+        return {
+            trans,
+            ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
+            ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
+            ACTIVITY_SOCIAL_ACTIONS,
+            ACTIVITY_SOCIAL_ISSUES,
+            ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE
+        };
+    },
    data() {
       return {
          issueIsLoading: false,

From 89fa10cede35b743112a2f2349d9d912b92dc3ed Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 18 Nov 2024 13:03:47 +0100
Subject: [PATCH 16/25] Change namespace for detect translation duplicate
 command

---
 .../Command/DetectTranslationDuplicatesCommand.php              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php b/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
index a2038a309..5cae72853 100644
--- a/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
@@ -23,7 +23,7 @@ use Symfony\Component\Console\Helper\Table;
 
 class DetectTranslationDuplicatesCommand extends Command
 {
-    protected static $defaultName = 'app:detect-duplicate-translations';
+    protected static $defaultName = 'chill:detect-duplicate-translations';
 
     public function __construct(private readonly TranslatorInterface $translator, private readonly KernelInterface $kernel)
     {

From 6ded75119cd7490e84c7effeab80fade9b20db1c Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 18 Nov 2024 13:04:27 +0100
Subject: [PATCH 17/25] Add developers documentation for the correct management
 of translation keys

---
 docs/source/development/translations.rst | 31 ++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 docs/source/development/translations.rst

diff --git a/docs/source/development/translations.rst b/docs/source/development/translations.rst
new file mode 100644
index 000000000..818e7bd4b
--- /dev/null
+++ b/docs/source/development/translations.rst
@@ -0,0 +1,31 @@
+Translations
+*************
+
+Translator-UX: one source of truth
+==================================
+
+The Translator-ux integration streamlines the process of managing and using translation keys dynamically in our views, whether they be in twig or vue components. The goal is to have one source of truth
+for all translations and avoid having to add translation keys in the YAML files as well as in i18ns files.
+
+To add new translation keys, you can define them in your translation YAML files. Running `symfony console cache:clear` will subsequently update the compiled translation keys which can then also be imported and
+used within any vue component. For use within a twig template they can be leveraged by using the |trans function.
+Within vue components you will have to import the translation keys you require and then they can be used in the template with the trans() function.
+
+It is advisable, before adding a translation key to do a search on the existing translation keys of the translation you require. An IDE will allow you to do so easily.
+However to avoid the creation of duplicate translation keys a command also exists to detect them. We also strongly advise you to use this command as explained below.
+
+Detect duplicates command
+=========================
+
+The DetectTranslationDuplicatesCommand `chill:detect-duplicate-translations` is a Symfony console command designed to identify duplicate translations across YAML files in a project.
+It checks for repeated translation values linked to different keys within a specified locale.
+The command accepts two main options:
+
+1. `--locale`: to specify the language locale to check (defaulting to 'en')
+2. `--exclude-namespaces`:  to list namespaces to ignore during the check.
+3. [optional] `--verify-hash`: can be used to ensure that the hash of current duplicates matches a given expected value,
+aiding in maintaining translation integrity.
+
+When duplicates are detected, they are displayed in a table format, listing the repeated translations alongside the keys where they are found.
+If a mismatch occurs between the computed and expected hash values, an error message is displayed to signal a potential issue in translation consistency.
+This command is useful for maintaining clean and consistent translations, avoiding redundancy in your YAML files.

From 52f06e2142791d4f4a08728ffa64539214a90875 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 18 Nov 2024 14:57:13 +0100
Subject: [PATCH 18/25] Translator dependencies added to chill-bundles

---
 composer.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/composer.json b/composer.json
index 026034121..65ece65d3 100644
--- a/composer.json
+++ b/composer.json
@@ -65,10 +65,12 @@
         "symfony/security-guard": "^5.4",
         "symfony/security-http": "^5.4",
         "symfony/serializer": "^5.4",
+        "symfony/stimulus-bundle": "^2.19",
         "symfony/string": "^5.4",
         "symfony/templating": "^5.4",
         "symfony/translation": "^5.4",
         "symfony/twig-bundle": "^5.4",
+        "symfony/ux-translator": "^2.19",
         "symfony/validator": "^5.4",
         "symfony/webpack-encore-bundle": "^1.11",
         "symfony/workflow": "^5.4",

From 1961bf36e284dee21754242a86c53ae9247b53c8 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 18 Nov 2024 15:06:46 +0100
Subject: [PATCH 19/25] Changie added

---
 .changes/unreleased/Feature-20241118-150627.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changes/unreleased/Feature-20241118-150627.yaml

diff --git a/.changes/unreleased/Feature-20241118-150627.yaml b/.changes/unreleased/Feature-20241118-150627.yaml
new file mode 100644
index 000000000..765d66f08
--- /dev/null
+++ b/.changes/unreleased/Feature-20241118-150627.yaml
@@ -0,0 +1,7 @@
+kind: Feature
+body: "Implementation of new translation management with one source of truth for both
+  twig and vue component templates using YAML files. \nDuplicate translation keys
+  can also be detected with new command."
+time: 2024-11-18T15:06:27.929549251+01:00
+custom:
+  Issue: ""

From 20d8cc2d1725fc5300bd829e3c759fe8f7b01977 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 25 Nov 2024 18:49:03 +0100
Subject: [PATCH 20/25] Add translation key and remove unused plugin

---
 .../ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js  | 1 -
 .../public/vuejs/_components/EntityWorkflow/ListWorkflow.vue  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js
index b7c2096ab..7afa88bae 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js
@@ -31,7 +31,6 @@ containers.forEach((container) => {
         }
     })
     .use(i18n)
-    .use(TranslatorPlugin)
     .component('app', App)
     .mount(container);
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
index da564a84c..67bad715e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
@@ -38,7 +38,7 @@
                   </span>
                </template>
             </div>
-            <span v-if="w.isOnHoldAtCurrentStep" class="badge bg-success rounded-pill">{{ $t('on_hold') }}</span>
+            <span v-if="w.isOnHoldAtCurrentStep" class="badge bg-success rounded-pill">{{ trans(WORKFLOW_ON_HOLD) }}</span>
          </div>
 
          <div class="item-row">
@@ -68,7 +68,7 @@
 <script setup>
 import Popover from 'bootstrap/js/src/popover';
 import { onMounted } from 'vue';
-import { trans, SEE, BY_USER, WORKFLOW_AT, WORKFLOW_YOU_SUBSCRIBED_TO_ALL_STEPS, WORKFLOW_YOU_SUBSCRIBED_TO_FINAL_STEP } from '../../../../../../../../../../../assets/translator'
+import { trans, SEE, BY_USER, WORKFLOW_AT, WORKFLOW_YOU_SUBSCRIBED_TO_ALL_STEPS, WORKFLOW_YOU_SUBSCRIBED_TO_FINAL_STEP, WORKFLOW_ON_HOLD } from '../../../../../../../../../../../assets/translator'
 
     // props
     const props = defineProps({

From 1f306a7270aac0cbe9c0b19321a6a6eb136f6f78 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 25 Nov 2024 18:49:32 +0100
Subject: [PATCH 21/25] Update bundles.php, symfony.lock and package.json file

---
 config/bundles.php |  2 ++
 package.json       |  4 ++++
 symfony.lock       | 24 ++++++++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/config/bundles.php b/config/bundles.php
index 815c3e62d..2b02f90a9 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -36,4 +36,6 @@ return [
     Chill\BudgetBundle\ChillBudgetBundle::class => ['all' => true],
     Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
+    Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true],
+    Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
 ];
diff --git a/package.json b/package.json
index d4537d59b..eb45c1388 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,9 @@
     "@ckeditor/ckeditor5-markdown-gfm": "^41.4.2",
     "@ckeditor/ckeditor5-theme-lark": "^41.4.2",
     "@ckeditor/ckeditor5-vue": "^5.1.0",
+    "@hotwired/stimulus": "^3.0.0",
+    "@symfony/stimulus-bridge": "^3.2.0",
+    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node14": "^1.0.1",
     "@types/dompurify": "^3.0.5",
@@ -21,6 +24,7 @@
     "chokidar": "^3.5.1",
     "dompurify": "^3.1.0",
     "fork-awesome": "^1.1.7",
+    "intl-messageformat": "^10.5.11",
     "jquery": "^3.6.0",
     "marked": "^12.0.1",
     "node-sass": "^8.0.0",
diff --git a/symfony.lock b/symfony.lock
index 984d0a726..b85802749 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -324,6 +324,15 @@
             "config/packages/security.yaml"
         ]
     },
+    "symfony/stimulus-bundle": {
+        "version": "2.21",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "2.8",
+            "ref": "9e33a8a3794b603fb4be6c04ee5ecab901ce549e"
+        }
+    },
     "symfony/translation": {
         "version": "5.4",
         "recipe": {
@@ -350,6 +359,21 @@
             "templates/base.html.twig"
         ]
     },
+    "symfony/ux-translator": {
+        "version": "2.21",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "2.9",
+            "ref": "bc396565cc4cab95692dd6df810553dc22e352e1"
+        },
+        "files": [
+            "assets/translator.js",
+            "config/packages/ux_translator.yaml",
+            "var/translations/configuration.js",
+            "var/translations/index.js"
+        ]
+    },
     "symfony/validator": {
         "version": "5.4",
         "recipe": {

From b9b5c4aa74894933d95966a10626d19530100814 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 25 Nov 2024 18:57:01 +0100
Subject: [PATCH 22/25] Remove unused import

---
 .../ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js
index 7afa88bae..87dc82114 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js
@@ -2,7 +2,6 @@ import { createApp } from "vue";
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n';
 import { ontheflyMessages } from './i18n.js';
 import App from "./App.vue";
-import TranslatorPlugin from '../translatorPlugin'
 
 const i18n = _createI18n( ontheflyMessages );
 

From e339623e2d4c3d0f5590b10fbb4dab333d87bb3b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 26 Nov 2024 13:17:24 +0100
Subject: [PATCH 23/25] Fix within ListWorkflow component + include
 ux_translator config file

---
 config/packages/ux_translator.yaml                             | 3 +++
 .../public/vuejs/_components/EntityWorkflow/ListWorkflow.vue   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 config/packages/ux_translator.yaml

diff --git a/config/packages/ux_translator.yaml b/config/packages/ux_translator.yaml
new file mode 100644
index 000000000..1c1c70608
--- /dev/null
+++ b/config/packages/ux_translator.yaml
@@ -0,0 +1,3 @@
+ux_translator:
+    # The directory where the JavaScript translations are dumped
+    dump_directory: '%kernel.project_dir%/var/translations'
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
index 67bad715e..5fdbbc7e3 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
@@ -91,7 +91,7 @@ import { trans, SEE, BY_USER, WORKFLOW_AT, WORKFLOW_YOU_SUBSCRIBED_TO_ALL_STEPS,
      if (step.transitionPrevious != null) {
         return `<ul class="small_in_title">
           <li><span class="item-key">{{ trans(BY_USER) }} : </span><b>${step.transitionPreviousBy.text}</b></li>
-          <li><span class="item-key">{{ trans(WORKFLOW_AT) }} : </span><b>${this.formatDate(step.transitionPreviousAt.datetime)}</b></li>
+          <li><span class="item-key">{{ trans(WORKFLOW_AT) }} : </span><b>${formatDate(step.transitionPreviousAt.datetime)}</b></li>
           </ul>`
         ;
      }

From 8f34c841f3bac3503a699c03c1435065fbc5b89f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 26 Nov 2024 14:42:04 +0100
Subject: [PATCH 24/25] Fix pipeline

---
 .../ChillActivityBundle/Entity/Activity.php   |  4 +-
 .../ChillCalendarBundle/Entity/Calendar.php   |  4 +-
 .../Context/ContextManager.php                |  2 +-
 .../Entity/StoredObject.php                   |  2 +-
 src/Bundle/ChillJobBundle/src/Entity/CV.php   |  4 +-
 .../src/Entity/ProjetProfessionnel.php        |  4 +-
 .../ChillJobBundle/src/Entity/Rome/Metier.php |  2 +-
 .../DetectTranslationDuplicatesCommand.php    | 57 ++++++++++---------
 src/Bundle/ChillMainBundle/Entity/User.php    |  6 +-
 .../Entity/Workflow/EntityWorkflow.php        |  2 +-
 .../Entity/Workflow/EntityWorkflowStep.php    |  2 +-
 .../Repository/UserRepository.php             |  2 +-
 .../Repository/UserRepositoryInterface.php    |  2 +-
 .../Resolver/CenterResolverDispatcher.php     |  2 +-
 .../Resolver/CenterResolverManager.php        |  2 +-
 .../Resolver/ScopeResolverDispatcher.php      |  2 +-
 .../Workflow/EntityWorkflowManager.php        |  2 +-
 .../ChillMainBundle/config/services.yaml      |  3 +
 .../Entity/AccompanyingPeriod.php             |  4 +-
 .../AccompanyingPeriodWork.php                |  2 +-
 .../Entity/Household/Household.php            |  4 +-
 .../ChillPersonBundle/Entity/Person.php       | 22 +++----
 .../Entity/SocialWork/Evaluation.php          |  2 +-
 23 files changed, 71 insertions(+), 67 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index 9f557f9b5..4701d2483 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -107,7 +107,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private ?Person $person = null;
 
     /**
-     * @var Collection<int, \Chill\PersonBundle\Entity\Person>
+     * @var Collection<int, Person>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: Person::class)]
@@ -132,7 +132,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private string $sentReceived = '';
 
     /**
-     * @var Collection<int, \Chill\PersonBundle\Entity\SocialWork\SocialAction>
+     * @var Collection<int, SocialAction>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: SocialAction::class)]
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index 05d75a9bc..dad302193 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -103,7 +103,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     private int $dateTimeVersion = 0;
 
     /**
-     * @var Collection<int, \Chill\CalendarBundle\Entity\CalendarDoc>
+     * @var Collection<int, CalendarDoc>
      */
     #[ORM\OneToMany(mappedBy: 'calendar', targetEntity: CalendarDoc::class, orphanRemoval: true)]
     private Collection $documents;
@@ -120,7 +120,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     private ?int $id = null;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\CalendarBundle\Entity\Invite>&Selectable
+     * @var Collection<int, Invite>&Selectable
      */
     #[Serializer\Groups(['read', 'docgen:read'])]
     #[ORM\OneToMany(mappedBy: 'calendar', targetEntity: Invite::class, cascade: ['persist', 'remove', 'merge', 'detach'], orphanRemoval: true)]
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php
index afcf6fab1..4aa6b042a 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php
@@ -17,7 +17,7 @@ use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 final readonly class ContextManager implements ContextManagerInterface
 {
     /**
-     * @param \Chill\DocGeneratorBundle\Context\DocGeneratorContextInterface[] $contexts
+     * @param DocGeneratorContextInterface[] $contexts
      */
     public function __construct(private iterable $contexts) {}
 
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index 06c2e5bd3..d13452f76 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -272,7 +272,7 @@ class StoredObject implements Document, TrackCreationInterface
      *
      * @param 'ASC'|'DESC' $order the sorting order, default is Order::Ascending
      *
-     * @return readableCollection&Selectable The ordered collection of versions
+     * @return ReadableCollection&Selectable The ordered collection of versions
      */
     public function getVersionsOrdered(string $order = 'ASC'): ReadableCollection&Selectable
     {
diff --git a/src/Bundle/ChillJobBundle/src/Entity/CV.php b/src/Bundle/ChillJobBundle/src/Entity/CV.php
index 257e4a0d0..12a57baca 100644
--- a/src/Bundle/ChillJobBundle/src/Entity/CV.php
+++ b/src/Bundle/ChillJobBundle/src/Entity/CV.php
@@ -73,7 +73,7 @@ class CV implements \Stringable
     /**
      * @Assert\Valid(traverse=true)
      *
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\JobBundle\Entity\CV\Formation>
+     * @var Collection<int, CV\Formation>
      */
     #[ORM\OneToMany(targetEntity: CV\Formation::class, mappedBy: 'CV', cascade: ['persist', 'remove', 'detach'], orphanRemoval: true)]
     //    #[ORM\OrderBy(['startDate' => Order::Descending, 'endDate' => 'DESC'])]
@@ -82,7 +82,7 @@ class CV implements \Stringable
     /**
      * @Assert\Valid(traverse=true)
      *
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\JobBundle\Entity\CV\Experience>
+     * @var Collection<int, CV\Experience>
      */
     #[ORM\OneToMany(targetEntity: CV\Experience::class, mappedBy: 'CV', cascade: ['persist', 'remove', 'detach'], orphanRemoval: true)]
     //    #[ORM\OrderBy(['startDate' => Order::Descending, 'endDate' => 'DESC'])]
diff --git a/src/Bundle/ChillJobBundle/src/Entity/ProjetProfessionnel.php b/src/Bundle/ChillJobBundle/src/Entity/ProjetProfessionnel.php
index 58a1fca41..6c808307e 100644
--- a/src/Bundle/ChillJobBundle/src/Entity/ProjetProfessionnel.php
+++ b/src/Bundle/ChillJobBundle/src/Entity/ProjetProfessionnel.php
@@ -45,7 +45,7 @@ class ProjetProfessionnel implements \Stringable
     private ?\DateTimeInterface $reportDate = null;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\JobBundle\Entity\Rome\Appellation>
+     * @var Collection<int, Appellation>
      */
     #[ORM\JoinTable(name: 'chill_job.projetprofessionnel_souhait')]
     #[ORM\ManyToMany(targetEntity: Appellation::class, cascade: ['persist'])]
@@ -94,7 +94,7 @@ class ProjetProfessionnel implements \Stringable
     private ?string $enCoursConstruction = null;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\JobBundle\Entity\Rome\Appellation>
+     * @var Collection<int, Appellation>
      */
     #[ORM\JoinTable(name: 'chill_job.projetprofessionnel_valide')]
     #[ORM\ManyToMany(targetEntity: Appellation::class)]
diff --git a/src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php b/src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php
index ce44a6acf..2df9ff3aa 100644
--- a/src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php
+++ b/src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php
@@ -33,7 +33,7 @@ class Metier
     private ?string $code = '';
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\JobBundle\Entity\Rome\Appellation>
+     * @var \Doctrine\Common\Collections\Collection<int, Appellation>
      */
     #[ORM\OneToMany(targetEntity: Appellation::class, mappedBy: 'metier')]
     private \Doctrine\Common\Collections\Collection $appellations;
diff --git a/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php b/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
index 5cae72853..a1b0c6be5 100644
--- a/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
@@ -17,15 +17,14 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\Translator;
 use Symfony\Component\Console\Helper\Table;
 
-
 class DetectTranslationDuplicatesCommand extends Command
 {
     protected static $defaultName = 'chill:detect-duplicate-translations';
 
-    public function __construct(private readonly TranslatorInterface $translator, private readonly KernelInterface $kernel)
+    public function __construct(private readonly Translator $translator, private readonly KernelInterface $kernel)
     {
         parent::__construct();
     }
@@ -50,8 +49,8 @@ class DetectTranslationDuplicatesCommand extends Command
             $bundlePath = $bundle->getPath();
             $translationDir = $this->getTranslationDirectory($bundle->getName(), $bundlePath);
 
-            if ($translationDir && is_dir($translationDir)) {
-                foreach (glob($translationDir . '/*.yaml') as $file) {
+            if (null !== $translationDir && is_dir($translationDir)) {
+                foreach (glob($translationDir.'/*.yaml') as $file) {
                     $this->translator->addResource('yaml', $file, $locale);
                 }
             }
@@ -64,45 +63,45 @@ class DetectTranslationDuplicatesCommand extends Command
         // Iterate through each domain in the catalogue
         foreach ($catalogue->all() as $domain => $translations) {
             foreach ($translations as $key => $value) {
-                if ($this->isExcludedNamespace("$domain.$key", $excludedNamespaces)) {
+                if ($this->isExcludedNamespace("{$domain}.{$key}", $excludedNamespaces)) {
                     continue;
                 }
                 if (is_array($value)) {
-                    $this->flattenTranslation($value, "$domain.$key", $allTranslations);
+                    $this->flattenTranslation($value, "{$domain}.{$key}", $allTranslations);
                 } else {
                     if (!isset($allTranslations[$value])) {
                         $allTranslations[$value] = [];
                     }
-                    $allTranslations[$value][] = "$domain.$key";
+                    $allTranslations[$value][] = "{$domain}.{$key}";
                 }
             }
         }
 
         // Detect values that appear in more than one key
-        $duplicates = array_filter($allTranslations, function ($keys) {
-            return count($keys) > 1;
-        });
+        $duplicates = array_filter($allTranslations, fn($keys) => count($keys) > 1);
 
         $duplicatesHash = $this->generateDuplicatesHash($duplicates);
 
-        if ($expectedHash) {
+        if ('' !== $expectedHash) {
             if ($duplicatesHash === $expectedHash) {
                 $output->writeln('<info>Translations are consistent with the expected hash.</info>');
 
-                $output->writeln("<info>Current duplicate hash: $duplicatesHash</info>");
-                return Command::SUCCESS;
-            } else {
-                $output->writeln('<error>Translation hash mismatch! Potential duplicate added.</error>');
-                $this->renderDuplicatesTable($output, $duplicates, $locale);
+                $output->writeln("<info>Current duplicate hash: {$duplicatesHash}</info>");
 
-                $output->writeln("<info>Current duplicate hash: $duplicatesHash</info>");
-                return Command::FAILURE;
+                return Command::SUCCESS;
             }
+            $output->writeln('<error>Translation hash mismatch! Potential duplicate added.</error>');
+            $this->renderDuplicatesTable($output, $duplicates, $locale);
+
+            $output->writeln("<info>Current duplicate hash: {$duplicatesHash}</info>");
+
+            return Command::FAILURE;
+
         }
 
         $this->renderDuplicatesTable($output, $duplicates, $locale);
 
-        $output->writeln("<info>Current duplicate hash: $duplicatesHash</info>");
+        $output->writeln("<info>Current duplicate hash: {$duplicatesHash}</info>");
 
         return Command::SUCCESS;
     }
@@ -110,7 +109,7 @@ class DetectTranslationDuplicatesCommand extends Command
     private function flattenTranslation(array $translations, string $prefix, array &$allTranslations): void
     {
         foreach ($translations as $key => $value) {
-            $fullKey = "$prefix.$key";
+            $fullKey = "{$prefix}.{$key}";
             if (is_array($value)) {
                 $this->flattenTranslation($value, $fullKey, $allTranslations);
             } else {
@@ -124,10 +123,10 @@ class DetectTranslationDuplicatesCommand extends Command
 
     private function getTranslationDirectory(string $bundleName, string $bundlePath): ?string
     {
-        $translationDir = $bundlePath . '/translations';
+        $translationDir = $bundlePath.'/translations';
 
-        if ($bundleName === 'ChillAsideActivityBundle') {
-            $translationDir = $bundlePath . '/src/translations';
+        if ('ChillAsideActivityBundle' === $bundleName) {
+            $translationDir = $bundlePath.'/src/translations';
         }
 
         return is_dir($translationDir) ? $translationDir : null;
@@ -141,10 +140,11 @@ class DetectTranslationDuplicatesCommand extends Command
     private function isExcludedNamespace(string $key, array $excludedNamespaces): bool
     {
         foreach ($excludedNamespaces as $namespace) {
-            if (str_starts_with($key, $namespace)) {
+            if (str_starts_with($key, (string) $namespace)) {
                 return true;
             }
         }
+
         return false;
     }
 
@@ -160,12 +160,13 @@ class DetectTranslationDuplicatesCommand extends Command
 
     private function renderDuplicatesTable(OutputInterface $output, array $duplicates, string $locale): void
     {
-        if (empty($duplicates)) {
-            $output->writeln("<info>No duplicate translations found for locale '$locale'.</info>");
+        if ([] === $duplicates) {
+            $output->writeln("<info>No duplicate translations found for locale '{$locale}'.</info>");
+
             return;
         }
 
-        $output->writeln("<comment>Duplicate translations found for locale '$locale':</comment>");
+        $output->writeln("<comment>Duplicate translations found for locale '{$locale}':</comment>");
         $table = new Table($output);
         $table->setHeaders(['Translation', 'Used in Keys']);
 
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 0c8c87553..448efbdd1 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -64,7 +64,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
     private bool $enabled = true;
 
     /**
-     * @var Collection<int, \Chill\MainBundle\Entity\GroupCenter>
+     * @var Collection<int, GroupCenter>
      */
     #[ORM\ManyToMany(targetEntity: GroupCenter::class, inversedBy: 'users')]
     #[ORM\Cache(usage: 'NONSTRICT_READ_WRITE')]
@@ -83,7 +83,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
     private ?Location $mainLocation = null;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\MainBundle\Entity\User\UserScopeHistory>&Selectable
+     * @var Collection<int, UserScopeHistory>&Selectable
      */
     #[ORM\OneToMany(mappedBy: 'user', targetEntity: UserScopeHistory::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
     private Collection&Selectable $scopeHistories;
@@ -98,7 +98,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
     private ?string $salt = null;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\MainBundle\Entity\User\UserJobHistory>&Selectable
+     * @var Collection<int, UserJobHistory>&Selectable
      */
     #[ORM\OneToMany(mappedBy: 'user', targetEntity: UserJobHistory::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
     private Collection&Selectable $jobHistories;
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
index d5a51af16..1c4413294 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
@@ -36,7 +36,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
     use TrackUpdateTrait;
 
     /**
-     * @var Collection<int, \Chill\MainBundle\Entity\Workflow\EntityWorkflowComment>
+     * @var Collection<int, EntityWorkflowComment>
      */
     #[ORM\OneToMany(mappedBy: 'entityWorkflow', targetEntity: EntityWorkflowComment::class, orphanRemoval: true)]
     private Collection $comments;
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
index 40a7bc1a2..f9556c33a 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
@@ -107,7 +107,7 @@ class EntityWorkflowStep
     private ?string $transitionByEmail = null;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\MainBundle\Entity\Workflow\EntityWorkflowStepHold>
+     * @var Collection<int, EntityWorkflowStepHold>
      */
     #[ORM\OneToMany(mappedBy: 'step', targetEntity: EntityWorkflowStepHold::class)]
     private Collection $holdsOnStep;
diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
index 3ee0828a7..9ac8af9ee 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
@@ -261,7 +261,7 @@ final readonly class UserRepository implements UserRepositoryInterface
      * allows to make a first search amongst users based on role and center
      * and, then filter those users having some flags.
      *
-     * @param \Chill\MainBundle\Entity\User[] $amongstUsers
+     * @param User[] $amongstUsers
      */
     public function findUsersHavingFlags($flag, array $amongstUsers = []): array
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
index b7a20f315..f6c74b7dd 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
@@ -71,7 +71,7 @@ interface UserRepositoryInterface extends ObjectRepository
      * allows to make a first search amongst users based on role and center
      * and, then filter those users having some flags.
      *
-     * @param \Chill\MainBundle\Entity\User[] $amongstUsers
+     * @param User[] $amongstUsers
      */
     public function findUsersHavingFlags(mixed $flag, array $amongstUsers = []): array;
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
index 903b8c5c5..fcf774505 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
@@ -14,7 +14,7 @@ namespace Chill\MainBundle\Security\Resolver;
 final readonly class CenterResolverDispatcher implements CenterResolverDispatcherInterface
 {
     /**
-     * @param \Chill\MainBundle\Security\Resolver\CenterResolverInterface[] $resolvers
+     * @param CenterResolverInterface[] $resolvers
      */
     public function __construct(private iterable $resolvers = []) {}
 
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
index 813ab1526..b75e1c634 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
@@ -16,7 +16,7 @@ use Chill\MainBundle\Entity\Center;
 final readonly class CenterResolverManager implements CenterResolverManagerInterface
 {
     /**
-     * @param \Chill\MainBundle\Security\Resolver\CenterResolverInterface[] $resolvers
+     * @param CenterResolverInterface[] $resolvers
      */
     public function __construct(private iterable $resolvers = [])
     {
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
index 387bc724e..50cca33d5 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
@@ -17,7 +17,7 @@ use Doctrine\Common\Collections\Collection;
 final readonly class ScopeResolverDispatcher
 {
     /**
-     * @param \Chill\MainBundle\Security\Resolver\ScopeResolverInterface[] $resolvers
+     * @param ScopeResolverInterface[] $resolvers
      */
     public function __construct(private iterable $resolvers) {}
 
diff --git a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowManager.php b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowManager.php
index bfe41f559..50719f4ae 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowManager.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowManager.php
@@ -30,7 +30,7 @@ use Symfony\Component\Workflow\Registry;
 class EntityWorkflowManager
 {
     /**
-     * @param \Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface[] $handlers
+     * @param EntityWorkflowHandlerInterface[] $handlers
      */
     public function __construct(private readonly iterable $handlers, private readonly Registry $registry) {}
 
diff --git a/src/Bundle/ChillMainBundle/config/services.yaml b/src/Bundle/ChillMainBundle/config/services.yaml
index 86f15097b..a4aa3057b 100644
--- a/src/Bundle/ChillMainBundle/config/services.yaml
+++ b/src/Bundle/ChillMainBundle/config/services.yaml
@@ -114,3 +114,6 @@ services:
     Chill\MainBundle\Service\EntityInfo\ViewEntityInfoManager:
         arguments:
             $vienEntityInfoProviders: !tagged_iterator chill_main.entity_info_provider
+
+    Symfony\Component\Translation\Translator:
+        alias: translator.default
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index 85b80faf8..91c8714bb 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -135,7 +135,7 @@ class AccompanyingPeriod implements
     private ?Location $administrativeLocation = null;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\CalendarBundle\Entity\Calendar>&Selectable
+     * @var Collection<int, Calendar>&Selectable
      */
     #[ORM\OneToMany(mappedBy: 'accompanyingPeriod', targetEntity: Calendar::class)]
     private Collection&Selectable $calendars;
@@ -153,7 +153,7 @@ class AccompanyingPeriod implements
     private ?ClosingMotive $closingMotive = null;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\PersonBundle\Entity\AccompanyingPeriod\Comment>
+     * @var Collection<int, Comment>
      */
     #[Assert\NotBlank(groups: [AccompanyingPeriod::STEP_DRAFT])]
     #[ORM\OneToMany(mappedBy: 'accompanyingPeriod', targetEntity: Comment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index af012c5ff..9152c96be 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -112,7 +112,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     private Collection $referrersHistory;
 
     /**
-     * @var Collection<int, \Chill\PersonBundle\Entity\SocialWork\Result>
+     * @var Collection<int, Result>
      */
     #[Serializer\Groups(['read', 'docgen:read', 'accompanying_period_work:edit'])]
     #[ORM\ManyToMany(targetEntity: Result::class, inversedBy: 'accompanyingPeriodWorks')]
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
index 6ecc0366d..dc67f6b93 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@@ -36,7 +36,7 @@ class Household implements HasCentersInterface
     /**
      * Addresses.
      *
-     * @var Collection<int, \Chill\MainBundle\Entity\Address>
+     * @var Collection<int, Address>
      */
     #[Serializer\Groups(['write'])]
     #[ORM\ManyToMany(targetEntity: Address::class, cascade: ['persist', 'remove', 'merge', 'detach'])]
@@ -48,7 +48,7 @@ class Household implements HasCentersInterface
     private CommentEmbeddable $commentMembers;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\PersonBundle\Entity\Household\HouseholdComposition>&Selectable
+     * @var Collection<int, HouseholdComposition>&Selectable
      */
     #[Assert\Valid(groups: ['household_composition'], traverse: true)]
     #[ORM\OneToMany(mappedBy: 'household', targetEntity: HouseholdComposition::class, cascade: ['persist'], orphanRemoval: true)]
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 4a0664652..74b4a2ef5 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -83,7 +83,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's accompanying periods (when the person was accompanied by the center).
      *
-     * @var Collection<int, \Chill\PersonBundle\Entity\AccompanyingPeriodParticipation>
+     * @var Collection<int, AccompanyingPeriodParticipation>
      */
     #[ORM\OneToMany(targetEntity: AccompanyingPeriodParticipation::class, mappedBy: 'person', cascade: ['persist', 'remove', 'merge', 'detach'])]
     #[ORM\OrderBy(['startDate' => Criteria::DESC])]
@@ -92,7 +92,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The accompanying period requested by the Person.
      *
-     * @var Collection<int, \Chill\PersonBundle\Entity\AccompanyingPeriod>
+     * @var Collection<int, AccompanyingPeriod>
      */
     #[ORM\OneToMany(targetEntity: AccompanyingPeriod::class, mappedBy: 'requestorPerson')]
     private Collection $accompanyingPeriodRequested;
@@ -100,7 +100,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Addresses.
      *
-     * @var Collection<int, \Chill\MainBundle\Entity\Address>
+     * @var Collection<int, Address>
      */
     #[ORM\ManyToMany(targetEntity: Address::class, cascade: ['persist', 'remove', 'merge', 'detach'])]
     #[ORM\JoinTable(name: 'chill_person_persons_to_addresses')]
@@ -108,7 +108,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private Collection $addresses;
 
     /**
-     * @var Collection<int, \Chill\PersonBundle\Entity\PersonAltName>
+     * @var Collection<int, PersonAltName>
      */
     #[ORM\OneToMany(targetEntity: PersonAltName::class, mappedBy: 'person', cascade: ['persist', 'remove', 'merge', 'detach'], orphanRemoval: true)]
     private Collection $altNames;
@@ -121,7 +121,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private ?\DateTime $birthdate = null;
 
     /**
-     * @var Collection<int, \Chill\BudgetBundle\Entity\Charge>
+     * @var Collection<int, Charge>
      */
     #[ORM\OneToMany(targetEntity: Charge::class, mappedBy: 'person')]
     private Collection $budgetCharges;
@@ -150,7 +150,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private ?PersonCenterCurrent $centerCurrent = null;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\PersonBundle\Entity\Person\PersonCenterHistory>&Selectable
+     * @var Collection<int, PersonCenterHistory>&Selectable
      */
     #[ORM\OneToMany(mappedBy: 'person', targetEntity: PersonCenterHistory::class, cascade: ['persist', 'remove'])]
     private Collection&Selectable $centerHistory;
@@ -252,13 +252,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Read-only field, computed by the database.
      *
-     * @var Collection<int, \Chill\PersonBundle\Entity\Household\PersonHouseholdAddress>
+     * @var Collection<int, PersonHouseholdAddress>
      */
     #[ORM\OneToMany(targetEntity: PersonHouseholdAddress::class, mappedBy: 'person')]
     private Collection $householdAddresses;
 
     /**
-     * @var Collection<int, \Chill\PersonBundle\Entity\Household\HouseholdMember>
+     * @var Collection<int, HouseholdMember>
      */
     #[ORM\OneToMany(targetEntity: HouseholdMember::class, mappedBy: 'person')]
     private Collection $householdParticipations;
@@ -325,14 +325,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private ?int $numberOfChildren = null;
 
     /**
-     * @var Collection<int, \Chill\PersonBundle\Entity\PersonPhone>
+     * @var Collection<int, PersonPhone>
      */
     #[Assert\Valid(traverse: true)]
     #[ORM\OneToMany(targetEntity: PersonPhone::class, mappedBy: 'person', cascade: ['persist', 'remove', 'merge', 'detach'], orphanRemoval: true)]
     private Collection $otherPhoneNumbers;
 
     /**
-     * @var Collection<int, \Chill\PersonBundle\Entity\AccompanyingPeriod>
+     * @var Collection<int, AccompanyingPeriod>
      */
     #[ORM\OneToMany(targetEntity: AccompanyingPeriod::class, mappedBy: 'personLocation')]
     private Collection $periodLocatedOn;
@@ -356,7 +356,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
     private bool $proxyAccompanyingPeriodOpenState = false; // TO-DELETE ?
     /**
-     * @var Collection<int, \Chill\PersonBundle\Entity\Person\PersonResource>
+     * @var Collection<int, PersonResource>
      */
     #[ORM\OneToMany(targetEntity: PersonResource::class, mappedBy: 'personOwner')]
     private Collection $resources;
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
index 8a1fc1c9b..757dd9354 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
@@ -39,7 +39,7 @@ class Evaluation
     private ?\DateInterval $notificationDelay = null;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\PersonBundle\Entity\SocialWork\SocialAction>
+     * @var Collection<int, SocialAction>
      */
     #[ORM\ManyToMany(targetEntity: SocialAction::class, mappedBy: 'evaluations')]
     private Collection $socialActions;

From 0382f5ef61b9c5ec80af761898a49b66d9c077d4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 26 Nov 2024 15:33:16 +0100
Subject: [PATCH 25/25] Fix php cs fixer

---
 .../Command/DetectTranslationDuplicatesCommand.php              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php b/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
index a1b0c6be5..0305ea700 100644
--- a/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php
@@ -78,7 +78,7 @@ class DetectTranslationDuplicatesCommand extends Command
         }
 
         // Detect values that appear in more than one key
-        $duplicates = array_filter($allTranslations, fn($keys) => count($keys) > 1);
+        $duplicates = array_filter($allTranslations, fn ($keys) => count($keys) > 1);
 
         $duplicatesHash = $this->generateDuplicatesHash($duplicates);