From f2c724726a5f9f83dca2c72c410158a2f25dc6c9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 13 Dec 2021 14:16:01 +0100
Subject: [PATCH] household member editor: fix show other household warning +
 wording

---
 .../public/vuejs/HouseholdMembersEditor/api.js      |  2 +-
 .../HouseholdMembersEditor/components/Concerned.vue | 13 +++++++++----
 .../public/vuejs/HouseholdMembersEditor/js/i18n.js  |  5 ++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/api.js
index 7a91ec912..b42e57fe6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/api.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/api.js
@@ -33,7 +33,7 @@ const fetchHouseholdSuggestionByAccompanyingPeriod = (personId) => {
 
       throw Error ({m: 'Error while fetching household suggestion', status: response.status});
     }).then(data => Promise.resolve(data.results))
-    .catch(e => console.err(e));
+    .catch(e => console.error(e));
   ;
 };
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
index 43ac3bf5e..09359c6dd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
@@ -23,7 +23,8 @@
       <p>{{ $t('household_members_editor.concerned.persons_with_household') }}</p>
       <ul v-for="c in concernedPersonsWithHouseholds" :key=c.person.id>
         <li>
-          {{ $t('household_members_editor.concerned.person') }} {{c.person.text}} {{$t('household_members_editor.concerned.already_belongs_to_household') }}
+          {{ c.person.text }}
+          {{ $t('household_members_editor.concerned.already_belongs_to_household') }}
           <a target="_blank" :href="this.makeHouseholdLink(c.person.current_household_id)">{{c.person.current_household_id}}</a>.
         </li>
       </ul>
@@ -78,9 +79,13 @@ export default {
       return this.$store.getters.persons.length === 0;
     },
     concernedPersonsWithHouseholds () {
-      return this.$store.state.concerned.filter(c =>
-        c.person.current_household_id !== null && c.person.current_household_id !== this.$store.state.household.id
-      );
+      if (this.$store.state.household) {
+        return this.$store.state.concerned.filter(c =>
+          c.person.current_household_id !== null && c.person.current_household_id !== this.$store.state.household.id
+        )
+      } else {
+        return [];
+      }
     }
   },
   data() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index c9cdd496d..139e6462f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -46,9 +46,8 @@ const appMessages = {
         move_to: "Déplacer vers",
         persons_leaving: "Usagers quittant leurs ménages",
         no_person_in_position: "Aucun usager ne sera ajouté à cette position",
-        persons_with_household: "Attention, usagers avec ménages",
-        person: "L'usager",
-        already_belongs_to_household: "appartient déjà au ménage"
+        persons_with_household: "Les usagers suivants sont associés à ces ménages:",
+        already_belongs_to_household: "est associé au ménage"
       },
        positioning: {
          persons_to_positionnate: 'Usagers à positionner',