Changie added

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.

.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: ""

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",

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.

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"
+               :buttonTitle="trans(ACTIVITY_ADD_PERSONS)"
-               modalTitle="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
             },

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')"
+                    :select-label="trans(MULTISELECT_SELECT_LABEL)"
-                    :deselect-label="$t('multiselect.deselect_label')"
+                    :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
-                    :selected-label="$t('multiselect.selected_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:

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 {

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,

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

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

src/Bundle/ChillMainBundle/Command/DetectTranslationDuplicatesCommand.php

@@ -0,0 +1,180 @@
+<?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\InputArgument;
+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\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)
+    {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setDescription('Detects duplicate translations in YAML files.')
+            ->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) {
+            $bundlePath = $bundle->getPath();
+            $translationDir = $this->getTranslationDirectory($bundle->getName(), $bundlePath);
+
+            if ($translationDir && is_dir($translationDir)) {
+                foreach (glob($translationDir . '/*.yaml') as $file) {
+                    $this->translator->addResource('yaml', $file, $locale);
+                }
+            }
+        }
+
+        $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 ($this->isExcludedNamespace("$domain.$key", $excludedNamespaces)) {
+                    continue;
+                }
+                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;
+        });
+
+        $duplicatesHash = $this->generateDuplicatesHash($duplicates);
+
+        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>");
+                return Command::FAILURE;
+            }
+        }
+
+        $this->renderDuplicatesTable($output, $duplicates, $locale);
+
+        $output->writeln("<info>Current duplicate hash: $duplicatesHash</info>");
+
+        return Command::SUCCESS;
+    }
+
+    private function flattenTranslation(array $translations, string $prefix, array &$allTranslations): void
+    {
+        foreach ($translations as $key => $value) {
+            $fullKey = "$prefix.$key";
+            if (is_array($value)) {
+                $this->flattenTranslation($value, $fullKey, $allTranslations);
+            } else {
+                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);
+    }
+
+    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();
+    }
+}

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',

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 {
+// Define props
-   name: "OnTheFlyCreate",
+const props = defineProps(['action', 'allowedTypes', 'query']);
-   props: ['action', 'allowedTypes', 'query'],
+
-   components: {
+// Create a ref for type
-      OnTheFlyPerson,
+const type = ref(null);
-      OnTheFlyThirdparty
+
-   },
+// Computed
-   data() {
+const radioType = computed({
-      return {
+    get: () => type.value,
-         type: null
+    set(value) {
-      }
+        type.value = value;
-   },
+        console.log('## type:', value, ', action:', props.action);
-   computed: {
+    }
-      radioType: {
+});
-         set(type) {
+
-            this.type = type;
+// Mounted
-            console.log('## type:', type, ', action:', this.action);
+onMounted(() => {
-         },
+    type.value = (props.allowedTypes.length === 1 && props.allowedTypes.includes('thirdparty'))
-         get() {
+        ? 'thirdparty'
-            return this.type;
+        : 'person';
-         }
+});
-      },
+
-   },
+// Methods
-   mounted() {
+const isActive = (tab) => {
-      this.type = (this.allowedTypes.length === 1 && this.allowedTypes.includes('thirdparty')) ? 'thirdparty' : 'person'
+    return type.value === tab;
-   },
+};
-   methods: {
+
-      isActive(tab) {
+const castDataByType = () => {
-         return (this.type === tab) ? true : false;
+    switch (radioType.value) {
-      },
+        case 'person':
-      castDataByType() {
+            return $refs.castPerson.$data.person;
-         switch (this.radioType) {
+        case 'thirdparty':
-            case 'person':
+            let data = $refs.castThirdparty.$data.thirdparty;
-               return this.$refs.castPerson.$data.person;
+            if (data.address !== undefined && data.address !== null) {
-            case 'thirdparty':
+                data.address = { id: data.address.address_id };
-               let data = this.$refs.castThirdparty.$data.thirdparty;
+            } else {
-               if (data.address !== undefined && data.address !== null) {
+                data.address = null;
-                   data.address = { id: data.address.address_id }
+            }
-               } else {
+            return data;
-                   data.address = null;
+        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>

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);
 

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-if="entity.kind === 'child'">{{ trans(THIRDPARTY_CONTACT_OF)}}</span>
-            <span v-else-if="entity.kind === 'company'">{{ $t('thirdparty.company')}}</span>
+            <span v-else-if="entity.kind === 'company'">{{ trans(THIRDPARTY_COMPANY)}}</span>
-            <span v-else>{{ $t('thirdparty.contact')}}</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>
+<script setup>
-export default {
+import {
-    name: "BadgeEntity",
+    trans,
-    props: ['options', 'entity'],
+    HOUSEHOLD,
-    i18n: {
+    ACCEPTED_USERS,
-        messages: {
+    THIRDPARTY_A_CONTACT,
-            fr: {
+    THIRDPARTY_COMPANY,
-                person: "Usager",
+    THIRDPARTY_CONTACT_OF,
-                thirdparty: {
+    PERSON, THIRDPARTY
-                    thirdparty: "Tiers",
+} from '../../../../../../../../../../assets/translator'
-                    child: "Personne de contact",
+
-                    company: "Personne morale",
+const props = defineProps({
-                    contact: "Personne physique",
+        options: Object,
-                },
+        entity: Object
-                user: 'TMS',
+    })
-                household: 'Ménage',
-            }
-        }
-    }
-}
 </script>

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue

@@ -9,23 +9,16 @@
     </div>
 </template>
 
-<script>
+<script setup>
-export default {
+import { ref } from 'vue';
-    name: "Confidential",
+
-    data() {
+const isBlurred = ref(true);
-        return {
+const toggleIcon = ref('fa-eye');
-            isBlurred: true,
+
-            toggleIcon: 'fa-eye',
+const toggleBlur = () => {
-        };
+    isBlurred.value = !isBlurred.value;
-    },
+    toggleIcon.value = isBlurred.value ? 'fa-eye' : 'fa-eye-slash';
-    methods : {
+};
-        toggleBlur() {
-            console.log(this.positionBtnFar);
-            this.isBlurred = !this.isBlurred;
-            this.toggleIcon = this.isBlurred ? 'fa-eye' : 'fa-eye-slash';
-        },
-    },
-}
 </script>
 
 <style scoped lang='scss'>

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 {
+// Props
-   name: 'AddressRenderBox',
+const props = defineProps({
-   components: {
+    address: {
-      Confidential,
+        type: Object,
-      AddressDetailsButton,
+    },
-   },
+    isMultiline: {
-   props: {
-      address: {
-         type: Object
-      },
-      isMultiline: {
-         default: true,
-         type: Boolean
-      },
-      useDatePane: {
-         default: false,
-         type: Boolean
-      },
-      showButtonDetails: {
         default: true,
-        type: Boolean
+        type: Boolean,
-      }
+    },
-   },
+    useDatePane: {
-   computed: {
+        default: false,
-      component() {
+        type: Boolean,
-         return this.isMultiline === true ? "div" : "span";
+    },
-      },
+    showButtonDetails: {
-      multiline() {
+        default: true,
-         return this.isMultiline === true ? "multiline" : "";
+        type: Boolean,
-      },
+    },
-      isConfidential() {
+});
-         return this.address.confidential;
+
-      }
+// 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 {

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue

@@ -5,9 +5,6 @@
 </span>
 </template>
 
-<script>
+<script setup>
-export default {
+    const props = defineProps(['user'])
-    name: "UserRenderBoxBadge",
-    props: ['user'],
-}
 </script>

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>
+<script setup>
-import {makeFetch} from 'ChillMainAssets/lib/api/apiMethods.ts';
+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 {
+    // props
-    name: "EntityWorkflowVueSubscriber",
+    const props = defineProps({
-    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: {
         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 => {
+        const url = `/api/1.0/main/workflow/${props.entityWorkflowId}/${step}?` + params.toString();
-                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>
 
-    <div class="list-group my-3">
+        makeFetch('POST', url).then(response => {
-        <label class="list-group-item">
+            emit('subscriptionUpdated', response);
-            <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>
 
-    <div class="btn-group-vertical my-3" role="group">
+    // emit
-        <button type="button" class="btn btn-outline-primary">
+    const emit = defineEmits(['subscriptionUpdated'])
-            <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>
-*/
 </script>
 
 <style scoped></style>

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>
 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 = {
+    // props
-   messages: {
+    const props = defineProps({
-      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: {
       workflows: {
          type: Array,
          required: true,
       }
-   },
+    })
-   methods: {
+
-      goToUrl(w) {
+    // methods
-         return `/fr/main/workflow/${w.id}/show`;
+    const goToUrl = (w) => `/fr/main/workflow/${w.id}/show`;
-      },
+    const getPopTitle = (step) => {
-      getPopTitle(step) {
+     if (step.transitionPrevious != null) {
-         if (step.transitionPrevious != null) {
+        //console.log(step.transitionPrevious.text);
-            //console.log(step.transitionPrevious.text);
+        let freezed = step.isFreezed ? `<i class="fa fa-snowflake-o fa-sm me-1"></i>` : ``;
-            let freezed = step.isFreezed ? `<i class="fa fa-snowflake-o fa-sm me-1"></i>` : ``;
+        return `${freezed}${step.transitionPrevious.text}`;
-            return `${freezed}${step.transitionPrevious.text}`;
+     }
-         }
+    }
-      },
+    const getPopContent = (step) => {
-      getPopContent(step) {
+     if (step.transitionPrevious != null) {
-         if (step.transitionPrevious != null) {
+        return `<ul class="small_in_title">
-            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">${i18n.messages.fr.by} : </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">${i18n.messages.fr.at} : </span><b>${this.formatDate(step.transitionPreviousAt.datetime)}</b></li>
+          </ul>`
-              </ul>`
+        ;
-            ;
+     }
-         }
+    }
-      },
+    const formatDate = (datetime) => datetime.split('T')[0] +' '+ datetime.split('T')[1].substring(0,5)
-      formatDate(datetime) {
+    const isUserSubscribedToStep = (w) => false;
-         return datetime.split('T')[0] +' '+ datetime.split('T')[1].substring(0,5)
+    const isUserSubscribedToFinal = (w) => false;
-      },
+
-      isUserSubscribedToStep(w) {
+    onMounted(() => {
-         // todo
-         return false;
-      },
-      isUserSubscribedToFinal(w) {
-         // todo
-         return false;
-      },
-   },
-   mounted() {
       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>

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-if="countWorkflows > 1">{{ trans(WORKFLOW_ASSOCIATED, { aw: 'other' }) }}</template>
-      <template v-else>{{ $t('workflow') }}</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 {
+// Define props
-   name: "ListWorkflowModal",
+const props = defineProps({
-   components: {
+    workflows: {
-      Modal,
+        type: Array,
-      PickWorkflow,
+        required: true,
-      ListWorkflowVue
+    },
-   },
+    allowCreate: {
-   emits: ['goToGenerateWorkflow'],
+        type: Boolean,
-   props: {
+        required: true,
-      workflows: {
+    },
-         type: Array,
+    relatedEntityClass: {
-         required: true,
+        type: String,
-      },
+        required: true,
-      allowCreate: {
+    },
-         type: Boolean,
+    relatedEntityId: {
-         required: true,
+        type: Number,
-      },
+        required: false,
-      relatedEntityClass: {
+    },
-         type: String,
+    workflowsAvailables: {
-         required: true,
+        type: Array,
-      },
+        required: true,
-      relatedEntityId: {
+    },
-         type: Number,
+    preventDefaultMoveToGenerate: {
-         required: false,
+        type: Boolean,
-      },
+        required: false,
-      workflowsAvailables: {
+        default: false,
-         type: Array,
+    },
-         required: true,
+    goToGenerateWorkflowPayload: {
-      },
+        required: false,
-      preventDefaultMoveToGenerate: {
+        default: () => ({}),
-          type: Boolean,
+    },
-          required: false,
+});
-          default: false,
+
-      },
+// Define emits
-      goToGenerateWorkflowPayload: {
+const emit = defineEmits(['goToGenerateWorkflow']);
-         required: false,
+
-         default: {}
+// Reactive data
-      },
+const modal = ref({
-   },
+    showModal: false,
-    data() {
+    modalDialogClass: "modal-dialog-scrollable modal-xl"
-      return {
+});
-         modal: {
+
-            showModal: false,
+// Computed properties
-            modalDialogClass: "modal-dialog-scrollable modal-xl"
+const countWorkflows = computed(() => props.workflows.length);
-         },
+const hasWorkflow = computed(() => countWorkflows.value > 0);
-      }
+
-   },
+// Methods
-   computed: {
+const openModal = () => modal.value.showModal = true;
-      countWorkflows() {
+
-         return this.workflows.length;
+const goToGenerateWorkflow = (data) => emit('goToGenerateWorkflow', data);
-      },
-      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",
-         }
-      }
-   }
-}
 </script>
 
 <style scoped></style>

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';
+// Define props
-
+const props = defineProps({
-export default {
+    relatedEntityClass: {
-    name: "PickWorkflow",
+        type: String,
-    props: {
+        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: {}
-        },
     },
-    emits: ['goToGenerateWorkflow'],
+    relatedEntityId: {
-    methods: {
+        type: Number,
-        makeLink(workflowName) {
+        required: false,
-            return buildLinkCreate(workflowName, this.relatedEntityClass, this.relatedEntityId);
+    },
-        },
+    workflowsAvailables: {
-        goToGenerateWorkflow(event, workflowName) {
+        type: Array,
-            console.log('goToGenerateWorkflow', event, workflowName);
+        required: true,
+    },
+    preventDefaultMoveToGenerate: {
+        type: Boolean,
+        required: false,
+        default: false,
+    },
+    goToGenerateWorkflowPayload: {
+        required: false,
+        default: () => ({}), // Use a function to return an object
+    },
+});
 
-            if (!this.$props.preventDefaultMoveToGenerate) {
+// Define emits
-                console.log('to go generate');
+const emit = defineEmits(['goToGenerateWorkflow']);
-                window.location.assign(this.makeLink(workflowName));
-            }
 
-            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>
 

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')">{{ trans(MODAL_ACTION_CLOSE) }}</button>
                 <slot name="footer"></slot>
               </div>
             </div>
@@ -28,8 +28,7 @@
    </transition>
 </template>
 
-<script lang="ts">
+<script setup>
-import {defineComponent} from "vue";
 /*
  *    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
@@ -39,22 +38,24 @@ import {defineComponent} from "vue";
  *    [+] using bootstrap css classes, the modal have a responsive behaviour,
  *    [+] modal design can be configured using css classes (size, scroll)
  */
-export default defineComponent({
+import { trans, MODAL_ACTION_CLOSE } from '../../../../../../../../../../assets/translator'
-   name: 'Modal',
+import { defineProps, defineEmits } from 'vue';
-   props: {
+
-      modalDialogClass: {
+// Define the props
-         type: Object,
+const props = defineProps({
-         required: false,
+    modalDialogClass: {
-         default: {},
+        type: Object,
-      },
+        required: false,
-      hideFooter: {
+        default: {},
-         type: Boolean,
+    },
-         required: false,
+    hideFooter: {
-         default: false
+        type: Boolean,
-      }
+        required: false,
-   },
+        default: false,
-   emits: ['close']
+    },
 });
+
+const emit = defineEmits(['close']);
 </script>
 
 <style lang="scss">

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>
 
@@ -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,71 +40,65 @@
     </div>
 </template>
 
-<script>
+<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, SEE } from '../../../../../../../../../../../assets/translator'
 
-export default {
+// Props
-    name: "NotificationReadToggle",
+const props = defineProps({
-    props: {
+    isRead: {
-        isRead: {
+        type: Boolean,
-            required: true,
+        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
-        }
     },
-    emits: ['markRead', 'markUnread'],
+    notificationId: {
-    computed: {
+        type: Number,
-        /// [Option] override default button appearance (btn-misc)
+        required: true,
-        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;
-        }
     },
-    methods: {
+    buttonClass: {
-        markAsUnread() {
+        type: String,
-           makeFetch('POST', `/api/1.0/main/notification/${this.notificationId}/mark/unread`, []).then(response => {
+        required: false,
-               this.$emit('markRead', { notificationId: this.notificationId });
+    },
-           })
+    buttonNoText: {
-        },
+        type: Boolean,
-        markAsRead() {
+        required: false,
-            makeFetch('POST', `/api/1.0/main/notification/${this.notificationId}/mark/read`, []).then(response => {
+    },
-                this.$emit('markUnread', { notificationId: this.notificationId });
+    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">

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue

@@ -4,216 +4,182 @@
          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">
                      <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>
                <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>
+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",
+// Props
-   components: {
+const props = defineProps({
-      Modal
+    wopiUrl: {
-   },
+        type: String,
-   props: {
+        required: true,
-      wopiUrl: {
+    },
-         type: String,
+    type: {
-         required: true
+        type: String,
-      },
+        required: true,
-      type: {
+    },
-         type: String,
+    options: {
-         required: true
+        type: Object,
-      },
+        required: false,
-      options: {
+    },
-         type: Object,
+});
-         required: false
+
-      }
+// data
-   },
+const modal = ref({
-   data() {
+    showModal: false,
-      return {
+    modalDialogClass: "modal-fullscreen",
-         modal: {
+});
-            showModal: false,
+const logoImg = logo;
-            modalDialogClass: "modal-fullscreen" //modal-dialog-scrollable
+const loading = ref(false);
-         },
+
-         logo: logo,
+// MIME types
-         loading: false,
+const mime = [
-         mime: [
+    // TODO temporary hardcoded. to be replaced by twig extension or a collabora server query
-            // TODO temporary hardcoded. to be replaced by twig extension or a collabora server query
+    'application/clarisworks',
-            'application/clarisworks',
+    'application/coreldraw',
-            'application/coreldraw',
+    'application/macwriteii',
-            'application/macwriteii',
+    'application/msword',
-            'application/msword',
+    'application/pdf',
-            'application/pdf',
+    'application/vnd.lotus-1-2-3',
-            'application/vnd.lotus-1-2-3',
+    'application/vnd.ms-excel',
-            'application/vnd.ms-excel',
+    'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-            'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+    'application/vnd.ms-excel.sheet.macroEnabled.12',
-            'application/vnd.ms-excel.sheet.macroEnabled.12',
+    'application/vnd.ms-excel.template.macroEnabled.12',
-            'application/vnd.ms-excel.template.macroEnabled.12',
+    'application/vnd.ms-powerpoint',
-            'application/vnd.ms-powerpoint',
+    'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
-            'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+    'application/vnd.ms-powerpoint.template.macroEnabled.12',
-            'application/vnd.ms-powerpoint.template.macroEnabled.12',
+    'application/vnd.ms-visio.drawing',
-            'application/vnd.ms-visio.drawing',
+    'application/vnd.ms-word.document.macroEnabled.12',
-            'application/vnd.ms-word.document.macroEnabled.12',
+    'application/vnd.ms-word.template.macroEnabled.12',
-            'application/vnd.ms-word.template.macroEnabled.12',
+    'application/vnd.ms-works',
-            'application/vnd.ms-works',
+    'application/vnd.oasis.opendocument.chart',
-            'application/vnd.oasis.opendocument.chart',
+    'application/vnd.oasis.opendocument.formula',
-            'application/vnd.oasis.opendocument.formula',
+    'application/vnd.oasis.opendocument.graphics',
-            'application/vnd.oasis.opendocument.graphics',
+    'application/vnd.oasis.opendocument.graphics-flat-xml',
-            'application/vnd.oasis.opendocument.graphics-flat-xml',
+    'application/vnd.oasis.opendocument.graphics-template',
-            'application/vnd.oasis.opendocument.graphics-template',
+    'application/vnd.oasis.opendocument.presentation',
-            'application/vnd.oasis.opendocument.presentation',
+    'application/vnd.oasis.opendocument.presentation-flat-xml',
-            'application/vnd.oasis.opendocument.presentation-flat-xml',
+    'application/vnd.oasis.opendocument.presentation-template',
-            'application/vnd.oasis.opendocument.presentation-template',
+    'application/vnd.oasis.opendocument.spreadsheet',
-            'application/vnd.oasis.opendocument.spreadsheet',
+    'application/vnd.oasis.opendocument.spreadsheet-flat-xml',
-            'application/vnd.oasis.opendocument.spreadsheet-flat-xml',
+    'application/vnd.oasis.opendocument.spreadsheet-template',
-            'application/vnd.oasis.opendocument.spreadsheet-template',
+    'application/vnd.oasis.opendocument.text',
-            'application/vnd.oasis.opendocument.text',
+    'application/vnd.oasis.opendocument.text-flat-xml',
-            'application/vnd.oasis.opendocument.text-flat-xml',
+    'application/vnd.oasis.opendocument.text-master',
-            'application/vnd.oasis.opendocument.text-master',
+    'application/vnd.oasis.opendocument.text-master-template',
-            'application/vnd.oasis.opendocument.text-master-template',
+    'application/vnd.oasis.opendocument.text-template',
-            'application/vnd.oasis.opendocument.text-template',
+    'application/vnd.oasis.opendocument.text-web',
-            'application/vnd.oasis.opendocument.text-web',
+    'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-            'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+    'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-            'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+    'application/vnd.openxmlformats-officedocument.presentationml.template',
-            'application/vnd.openxmlformats-officedocument.presentationml.template',
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+    'application/vnd.sun.xml.calc',
-            'application/vnd.sun.xml.calc',
+    'application/vnd.sun.xml.calc.template',
-            'application/vnd.sun.xml.calc.template',
+    'application/vnd.sun.xml.chart',
-            'application/vnd.sun.xml.chart',
+    'application/vnd.sun.xml.draw',
-            'application/vnd.sun.xml.draw',
+    'application/vnd.sun.xml.draw.template',
-            'application/vnd.sun.xml.draw.template',
+    'application/vnd.sun.xml.impress',
-            'application/vnd.sun.xml.impress',
+    'application/vnd.sun.xml.impress.template',
-            'application/vnd.sun.xml.impress.template',
+    'application/vnd.sun.xml.math',
-            'application/vnd.sun.xml.math',
+    'application/vnd.sun.xml.writer',
-            'application/vnd.sun.xml.writer',
+    'application/vnd.sun.xml.writer.global',
-            'application/vnd.sun.xml.writer.global',
+    'application/vnd.sun.xml.writer.template',
-            'application/vnd.sun.xml.writer.template',
+    'application/vnd.visio',
-            'application/vnd.visio',
+    'application/vnd.visio2013',
-            'application/vnd.visio2013',
+    'application/vnd.wordperfect',
-            'application/vnd.wordperfect',
+    'application/x-abiword',
-            'application/x-abiword',
+    'application/x-aportisdoc',
-            'application/x-aportisdoc',
+    'application/x-dbase',
-            'application/x-dbase',
+    'application/x-dif-document',
-            'application/x-dif-document',
+    'application/x-fictionbook+xml',
-            'application/x-fictionbook+xml',
+    'application/x-gnumeric',
-            'application/x-gnumeric',
+    'application/x-hwp',
-            'application/x-hwp',
+    'application/x-iwork-keynote-sffkey',
-            'application/x-iwork-keynote-sffkey',
+    'application/x-iwork-numbers-sffnumbers',
-            'application/x-iwork-numbers-sffnumbers',
+    'application/x-iwork-pages-sffpages',
-            'application/x-iwork-pages-sffpages',
+    'application/x-mspublisher',
-            'application/x-mspublisher',
+    'application/x-mswrite',
-            'application/x-mswrite',
+    'application/x-pagemaker',
-            'application/x-pagemaker',
+    'application/x-sony-bbeb',
-            'application/x-sony-bbeb',
+    'application/x-t602',
-            'application/x-t602',
+]
-         ]
+
-      }
+// Computed
-   },
+const isOpenDocument = computed(() => mime.includes(props.type));
-   computed: {
+
-      isOpenDocument() {
+const noText = computed(() => props.options?.noText === true);
-         if (this.mime.indexOf(this.type) !== -1) {
+
-            return true;
+const isChangeIcon = computed(() => !!props.options?.changeIcon);
-         }
+
-         return false;
+const isChangeClass = computed(() => !!props.options?.changeClass);
-      },
+
-      noText() {
+// Methods
-         if (typeof this.options.noText !== 'undefined') {
+const openModal = () => {
-            return this.options.noText === true;
+    loading.value = true;
-         }
+    modal.value.showModal = true;
-         return false;
+};
-      },
+
-      isChangeIcon() {
+const loaded = () => {
-         if (typeof this.options.changeIcon !== 'undefined') {
+    loading.value = false;
-            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.",
-         }
-      }
-   }
-}
 </script>
 
 <style lang="scss">

src/Bundle/ChillMainBundle/config/services/command.yaml

@@ -74,3 +74,7 @@ services:
     Chill\MainBundle\Command\SynchronizeEntityInfoViewsCommand:
         tags:
             - {name: console.command}
+
+    Chill\MainBundle\Command\DetectTranslationDuplicatesCommand:
+        tags:
+            - { name: console.command }

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: >-

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
@@ -102,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
@@ -474,6 +520,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
@@ -521,13 +569,17 @@ 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
     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
@@ -571,6 +623,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:
@@ -704,4 +758,40 @@ 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.
 
+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
+
+
+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é'