From d5fc1e3092669147bcdc0168b0c38a15acc6fd3d Mon Sep 17 00:00:00 2001
From: Yann Bertrand <5855339+yannbertrand@users.noreply.github.com>
Date: Mon, 9 Jan 2023 16:19:10 +0100
Subject: [PATCH 1/6] sr: migrate from 'lang' to 'localeCode' in language
 switcher config

---
 components/LanguageSwitcher/LanguageSwitcher.vue       | 10 +++++-----
 .../LanguageSwitcher/LanguageSwitcherSubMenu.vue       |  4 ++--
 config/language/pix-pro.js                             |  6 +++---
 config/language/pix-site.js                            |  8 ++++----
 tests/config/language/pix-pro.test.js                  |  6 +++---
 tests/config/language/pix-site.test.js                 |  8 ++++----
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/components/LanguageSwitcher/LanguageSwitcher.vue b/components/LanguageSwitcher/LanguageSwitcher.vue
index 252975424..65a8dbefd 100644
--- a/components/LanguageSwitcher/LanguageSwitcher.vue
+++ b/components/LanguageSwitcher/LanguageSwitcher.vue
@@ -25,7 +25,7 @@
         :key="`language-switcher-${index}`"
         :class="{
           'language-switcher__dropdown-menu--active':
-            option.lang === currentLocaleCode,
+            option.localeCode === currentLocaleCode,
         }"
       >
         <div class="language-switcher__lang">
@@ -81,7 +81,7 @@
             :class="{
               'language-switcher-burger-menu__lang': true,
               'language-switcher-burger-menu--active':
-                child.lang === currentLocaleCode,
+                child.localeCode === currentLocaleCode,
             }"
           >
             <pix-link :href="getIndexUrl(child)">
@@ -95,7 +95,7 @@
             :class="{
               'language-switcher-burger-menu__lang': true,
               'language-switcher-burger-menu--active':
-                option.lang === currentLocaleCode,
+                option.localeCode === currentLocaleCode,
             }"
           >
             <pix-link :href="getIndexUrl(option)">
@@ -135,7 +135,7 @@ export default {
     selectedMenu() {
       return this.languages.menu
         .flatMap((menuItem) => menuItem.children ?? menuItem)
-        .find((locale) => locale.lang === this.currentLocaleCode)
+        .find((locale) => locale.localeCode === this.currentLocaleCode)
     },
   },
   mounted() {
@@ -160,7 +160,7 @@ export default {
     },
     getIndexUrl(menuItem) {
       const locale = language.locales.find(
-        (locale) => locale.code === menuItem.lang
+        (locale) => locale.code === menuItem.localeCode
       )
       return getAbsoluteUrlIfSwitchWebsite({
         relativeTarget: locale.code === 'fr-fr' ? '/' : `/${locale.code}`,
diff --git a/components/LanguageSwitcher/LanguageSwitcherSubMenu.vue b/components/LanguageSwitcher/LanguageSwitcherSubMenu.vue
index ec32a18e0..6a6ed2448 100644
--- a/components/LanguageSwitcher/LanguageSwitcherSubMenu.vue
+++ b/components/LanguageSwitcher/LanguageSwitcherSubMenu.vue
@@ -5,7 +5,7 @@
       :key="availableLanguage.key"
       :class="{
         'language-switcher__dropdown-menu--active':
-          availableLanguage.lang === currentLocaleCode,
+          availableLanguage.localeCode === currentLocaleCode,
       }"
     >
       <div class="language-switcher__lang">
@@ -44,7 +44,7 @@ export default {
   methods: {
     getIndexUrl(menuItem) {
       const locale = language.locales.find(
-        (locale) => locale.code === menuItem.lang
+        (locale) => locale.code === menuItem.localeCode
       )
       return getAbsoluteUrlIfSwitchWebsite({
         relativeTarget: `/${locale.code}`,
diff --git a/config/language/pix-pro.js b/config/language/pix-pro.js
index 7a12a74d4..9ec57fe14 100644
--- a/config/language/pix-pro.js
+++ b/config/language/pix-pro.js
@@ -26,13 +26,13 @@ export const language = {
       children: [
         {
           name: 'french',
-          lang: 'fr',
+          localeCode: 'fr',
           icon: 'icon',
           subtitle: null,
         },
         {
           name: 'english',
-          lang: 'en-gb',
+          localeCode: 'en-gb',
           icon: 'icon',
           subtitle: null,
         },
@@ -40,7 +40,7 @@ export const language = {
     },
     {
       name: 'france',
-      lang: 'fr-fr',
+      localeCode: 'fr-fr',
       icon: 'flag-fr.svg',
       subtitle: null,
     },
diff --git a/config/language/pix-site.js b/config/language/pix-site.js
index 300e9fa41..d66fc08e5 100644
--- a/config/language/pix-site.js
+++ b/config/language/pix-site.js
@@ -40,13 +40,13 @@ export const language = {
       children: [
         {
           name: 'french',
-          lang: 'fr',
+          localeCode: 'fr',
           icon: 'icon',
           subtitle: null,
         },
         {
           name: 'english',
-          lang: 'en-gb',
+          localeCode: 'en-gb',
           icon: 'icon',
           subtitle: null,
         },
@@ -54,13 +54,13 @@ export const language = {
     },
     {
       name: 'france',
-      lang: 'fr-fr',
+      localeCode: 'fr-fr',
       icon: 'flag-fr.svg',
       subtitle: null,
     },
     {
       name: 'fwb-acronym',
-      lang: 'fr-be',
+      localeCode: 'fr-be',
       icon: 'flag-be.svg',
       subtitle: 'fwb',
     },
diff --git a/tests/config/language/pix-pro.test.js b/tests/config/language/pix-pro.test.js
index 046522ab8..354b68b73 100644
--- a/tests/config/language/pix-pro.test.js
+++ b/tests/config/language/pix-pro.test.js
@@ -60,13 +60,13 @@ describe('#language', () => {
         children: [
           {
             name: 'french',
-            lang: 'fr',
+            localeCode: 'fr',
             icon: 'icon',
             subtitle: null,
           },
           {
             name: 'english',
-            lang: 'en-gb',
+            localeCode: 'en-gb',
             icon: 'icon',
             subtitle: null,
           },
@@ -74,7 +74,7 @@ describe('#language', () => {
       },
       {
         name: 'france',
-        lang: 'fr-fr',
+        localeCode: 'fr-fr',
         icon: 'flag-fr.svg',
         subtitle: null,
       },
diff --git a/tests/config/language/pix-site.test.js b/tests/config/language/pix-site.test.js
index 6ff1eaaa5..9eb5ffde5 100644
--- a/tests/config/language/pix-site.test.js
+++ b/tests/config/language/pix-site.test.js
@@ -59,13 +59,13 @@ describe('#language', () => {
         children: [
           {
             name: 'french',
-            lang: 'fr',
+            localeCode: 'fr',
             icon: 'icon',
             subtitle: null,
           },
           {
             name: 'english',
-            lang: 'en-gb',
+            localeCode: 'en-gb',
             icon: 'icon',
             subtitle: null,
           },
@@ -73,13 +73,13 @@ describe('#language', () => {
       },
       {
         name: 'france',
-        lang: 'fr-fr',
+        localeCode: 'fr-fr',
         icon: 'flag-fr.svg',
         subtitle: null,
       },
       {
         name: 'fwb-acronym',
-        lang: 'fr-be',
+        localeCode: 'fr-be',
         icon: 'flag-be.svg',
         subtitle: 'fwb',
       },

From 672c5075d6119db517c9b2727b1195164e8a0d49 Mon Sep 17 00:00:00 2001
From: Yann Bertrand <5855339+yannbertrand@users.noreply.github.com>
Date: Mon, 9 Jan 2023 16:32:02 +0100
Subject: [PATCH 2/6] sr: rename language-switcher component as locale-switcher

---
 components/BurgerMenuNav.vue                  |  2 +-
 .../LocaleSwitcher.vue}                       | 64 +++++++-------
 .../LocaleSwitcherSubMenu.vue}                |  8 +-
 components/slices/ActionsZone.vue             |  2 +-
 lang/en-gb.js                                 |  2 +-
 lang/fr-be.js                                 |  2 +-
 lang/fr-fr.js                                 |  2 +-
 lang/fr.js                                    |  2 +-
 tests/components/BurgerMenuNav.test.js        |  6 +-
 ...witcher.test.js => LocaleSwitcher.test.js} | 36 ++++----
 ...st.js.snap => LocaleSwitcher.test.js.snap} | 84 +++++++++----------
 tests/components/slices/ActionsZone.test.js   |  6 +-
 12 files changed, 108 insertions(+), 108 deletions(-)
 rename components/{LanguageSwitcher/LanguageSwitcher.vue => LocaleSwitcher/LocaleSwitcher.vue} (84%)
 rename components/{LanguageSwitcher/LanguageSwitcherSubMenu.vue => LocaleSwitcher/LocaleSwitcherSubMenu.vue} (84%)
 rename tests/components/{LanguageSwitcher.test.js => LocaleSwitcher.test.js} (56%)
 rename tests/components/__snapshots__/{LanguageSwitcher.test.js.snap => LocaleSwitcher.test.js.snap} (65%)

diff --git a/components/BurgerMenuNav.vue b/components/BurgerMenuNav.vue
index 8962c62ef..c1d4e1e99 100644
--- a/components/BurgerMenuNav.vue
+++ b/components/BurgerMenuNav.vue
@@ -2,7 +2,7 @@
   <div class="burger-menu-nav">
     <burger-menu-nav-items :items="items.navigationZone" />
     <burger-menu-nav-items :items="items.actionsZone" :is-action="true" />
-    <language-switcher type="only-text" />
+    <locale-switcher type="only-text" />
   </div>
 </template>
 
diff --git a/components/LanguageSwitcher/LanguageSwitcher.vue b/components/LocaleSwitcher/LocaleSwitcher.vue
similarity index 84%
rename from components/LanguageSwitcher/LanguageSwitcher.vue
rename to components/LocaleSwitcher/LocaleSwitcher.vue
index 65a8dbefd..1d3e52621 100644
--- a/components/LanguageSwitcher/LanguageSwitcher.vue
+++ b/components/LocaleSwitcher/LocaleSwitcher.vue
@@ -1,12 +1,12 @@
 <template>
   <div
     v-if="type === 'with-dropdown'"
-    class="language-switcher"
+    class="locale-switcher"
     @keydown.esc="hideMenu"
   >
     <button
-      class="language-switcher__button"
-      :aria-label="$t('language-switcher-label')"
+      class="locale-switcher__button"
+      :aria-label="$t('locale-switcher-label')"
       aria-haspopup="true"
       :aria-expanded="showMenu.toString()"
       @click.stop.prevent="toggleMenu()"
@@ -15,38 +15,38 @@
       <fa
         v-if="showMenu"
         icon="angle-up"
-        class="language-switcher-button__angle"
+        class="locale-switcher-button__angle"
       />
-      <fa v-else icon="angle-down" class="language-switcher-button__angle" />
+      <fa v-else icon="angle-down" class="locale-switcher-button__angle" />
     </button>
-    <ul v-if="showMenu" class="language-switcher__dropdown-menu">
+    <ul v-if="showMenu" class="locale-switcher__dropdown-menu">
       <li
         v-for="(option, index) in languages.menu"
-        :key="`language-switcher-${index}`"
+        :key="`locale-switcher-${index}`"
         :class="{
-          'language-switcher__dropdown-menu--active':
+          'locale-switcher__dropdown-menu--active':
             option.localeCode === currentLocaleCode,
         }"
       >
-        <div class="language-switcher__lang">
+        <div class="locale-switcher__locale">
           <template v-if="option.children">
             <button
               v-if="option.children"
-              class="language-switcher-sub-menu-button"
+              class="locale-switcher-sub-menu-button"
               @click.stop.prevent="toggleSubMenu()"
             >
               <img
-                class="language-switcher__img"
+                class="locale-switcher__img"
                 :src="'/images/' + option.icon"
                 alt=""
               />
-              <div class="lang__text">{{ $t(option.name) }}</div>
+              <div class="locale__text">{{ $t(option.name) }}</div>
               <fa
                 icon="angle-right"
-                class="language-switcher__icon language-switcher-button__angle"
+                class="locale-switcher__icon locale-switcher-button__angle"
               />
             </button>
-            <language-switcher-sub-menu
+            <locale-switcher-sub-menu
               :show-sub-menu="showSubMenu"
               :available-languages="option.children"
               :current-locale-code="currentLocaleCode"
@@ -55,13 +55,13 @@
           </template>
           <pix-link v-else-if="!option.children" :href="getIndexUrl(option)">
             <img
-              class="language-switcher__img"
+              class="locale-switcher__img"
               :src="'/images/' + option.icon"
               alt=""
             />
-            <div class="lang__text">
+            <div class="locale__text">
               <div>{{ $t(option.name) }}</div>
-              <div v-if="option.subtitle" class="language-switcher__subtitle">
+              <div v-if="option.subtitle" class="locale-switcher__subtitle">
                 {{ $t(option.subtitle) }}
               </div>
             </div>
@@ -72,15 +72,15 @@
     <span class="separator" />
   </div>
   <div v-else-if="type === 'only-text'">
-    <ul class="language-switcher-burger-menu">
+    <ul class="locale-switcher-burger-menu">
       <li v-for="option in languages.menu" :key="option.key">
         <template v-if="option.children">
           <span
             v-for="child in option.children"
             :key="child.name"
             :class="{
-              'language-switcher-burger-menu__lang': true,
-              'language-switcher-burger-menu--active':
+              'locale-switcher-burger-menu__locale': true,
+              'locale-switcher-burger-menu--active':
                 child.localeCode === currentLocaleCode,
             }"
           >
@@ -93,8 +93,8 @@
         <template v-if="!option.children">
           <span
             :class="{
-              'language-switcher-burger-menu__lang': true,
-              'language-switcher-burger-menu--active':
+              'locale-switcher-burger-menu__locale': true,
+              'locale-switcher-burger-menu--active':
                 option.localeCode === currentLocaleCode,
             }"
           >
@@ -113,7 +113,7 @@ import { language } from '~/config/language'
 import { getAbsoluteUrlIfSwitchWebsite } from '~/services/get-absolute-url-if-switch-website'
 
 export default {
-  name: 'LanguageSwitcher',
+  name: 'LocaleSwitcher',
   props: {
     type: {
       type: String,
@@ -172,11 +172,11 @@ export default {
 </script>
 
 <style lang="scss">
-.language-switcher {
+.locale-switcher {
   display: none;
 }
 @include device-is('large-screen') {
-  .language-switcher {
+  .locale-switcher {
     display: flex;
 
     .separator {
@@ -230,7 +230,7 @@ export default {
         box-shadow: 0 0;
         display: block;
         min-height: 25px;
-        .language-switcher__lang > a {
+        .locale-switcher__locale > a {
           line-height: 23px;
         }
       }
@@ -275,7 +275,7 @@ export default {
         }
       }
     }
-    &__lang {
+    &__locale {
       min-height: 25px;
       a,
       span,
@@ -294,7 +294,7 @@ export default {
           color: $blue;
           background: $grey-10;
         }
-        .lang {
+        .locale {
           &__text {
             flex: 1;
           }
@@ -308,7 +308,7 @@ export default {
           color: $blue;
           background: $grey-10;
         }
-        .lang {
+        .locale {
           &__text {
             flex: 1;
             text-align: left;
@@ -329,14 +329,14 @@ export default {
       width: 23px;
     }
   }
-  .language-switcher-button {
+  .locale-switcher-button {
     &__angle {
       margin-left: 8px;
     }
   }
 }
 
-.language-switcher-burger-menu {
+.locale-switcher-burger-menu {
   margin: 0 0 50px 0;
   font-size: 1rem;
   line-height: 1.5rem;
@@ -353,7 +353,7 @@ export default {
     content: '';
     margin: 0;
   }
-  &__lang {
+  &__locale {
     a {
       color: $grey-80;
       &:visited,
diff --git a/components/LanguageSwitcher/LanguageSwitcherSubMenu.vue b/components/LocaleSwitcher/LocaleSwitcherSubMenu.vue
similarity index 84%
rename from components/LanguageSwitcher/LanguageSwitcherSubMenu.vue
rename to components/LocaleSwitcher/LocaleSwitcherSubMenu.vue
index 6a6ed2448..86a924b65 100644
--- a/components/LanguageSwitcher/LanguageSwitcherSubMenu.vue
+++ b/components/LocaleSwitcher/LocaleSwitcherSubMenu.vue
@@ -1,14 +1,14 @@
 <template>
-  <ul v-if="showSubMenu" class="language-switcher__dropdown-menu child">
+  <ul v-if="showSubMenu" class="locale-switcher__dropdown-menu child">
     <li
       v-for="availableLanguage in availableLanguages"
       :key="availableLanguage.key"
       :class="{
-        'language-switcher__dropdown-menu--active':
+        'locale-switcher__dropdown-menu--active':
           availableLanguage.localeCode === currentLocaleCode,
       }"
     >
-      <div class="language-switcher__lang">
+      <div class="locale-switcher__locale">
         <pix-link :href="getIndexUrl(availableLanguage)">
           {{ $t(availableLanguage.name) }}
         </pix-link>
@@ -22,7 +22,7 @@ import { getAbsoluteUrlIfSwitchWebsite } from '~/services/get-absolute-url-if-sw
 import { language } from '~/config/language'
 
 export default {
-  name: 'LanguageSwitcherSubMenu',
+  name: 'LocaleSwitcherSubMenu',
   props: {
     showSubMenu: {
       type: Boolean,
diff --git a/components/slices/ActionsZone.vue b/components/slices/ActionsZone.vue
index dca89854e..19e4ff831 100644
--- a/components/slices/ActionsZone.vue
+++ b/components/slices/ActionsZone.vue
@@ -1,6 +1,6 @@
 <template>
   <nav class="actions-zone">
-    <language-switcher type="with-dropdown" />
+    <locale-switcher type="with-dropdown" />
     <ul>
       <li v-for="(menuItem, index) in slice.items" :key="`item-${index}`">
         <pix-prismic-link
diff --git a/lang/en-gb.js b/lang/en-gb.js
index c71a72ed0..38785866a 100644
--- a/lang/en-gb.js
+++ b/lang/en-gb.js
@@ -42,7 +42,7 @@ export default {
     'not-supported':
       'Your browser does not support iframes. The contact form cannot be displayed. Please use another contact method (phone, fax etc)',
   },
-  'language-switcher-label': 'Languages',
+  'locale-switcher-label': 'Languages',
   'page-titles': {
     'contact-digital-mediation': 'Request for information | Pix',
     'higher-education-establishment-registration':
diff --git a/lang/fr-be.js b/lang/fr-be.js
index 2ca3de411..cabf400d9 100644
--- a/lang/fr-be.js
+++ b/lang/fr-be.js
@@ -42,7 +42,7 @@ export default {
     'not-supported':
       "Votre navigateur ne supporte pas les iframes. Le formulaire de contact ne peut pas être affiché. Merci d'utiliser une autre méthode de contact (téléphone, fax, etc.)",
   },
-  'language-switcher-label': 'Langues',
+  'locale-switcher-label': 'Langues',
   'page-titles': {
     'contact-digital-mediation': "Demande d'information | Pix",
     'higher-education-establishment-registration':
diff --git a/lang/fr-fr.js b/lang/fr-fr.js
index cc6c21db7..91ff88c56 100644
--- a/lang/fr-fr.js
+++ b/lang/fr-fr.js
@@ -42,7 +42,7 @@ export default {
     'not-supported':
       "Votre navigateur ne supporte pas les iframes. Le formulaire de contact ne peut pas être affiché. Merci d'utiliser une autre méthode de contact (téléphone, fax, etc.)",
   },
-  'language-switcher-label': 'Langues',
+  'locale-switcher-label': 'Langues',
   'page-titles': {
     'contact-digital-mediation': "Demande d'information | Pix",
     'higher-education-establishment-registration':
diff --git a/lang/fr.js b/lang/fr.js
index d47f2fe94..425f1d5f3 100644
--- a/lang/fr.js
+++ b/lang/fr.js
@@ -38,7 +38,7 @@ export default {
   event: 'Événement',
   feature: 'Nouveauté',
   society: 'Société',
-  'language-switcher-label': 'Langues',
+  'locale-switcher-label': 'Langues',
   'page-titles': {
     'contact-digital-mediation': "Demande d'information | Pix",
     'higher-education-establishment-registration':
diff --git a/tests/components/BurgerMenuNav.test.js b/tests/components/BurgerMenuNav.test.js
index 8ac80898b..bce39f41d 100644
--- a/tests/components/BurgerMenuNav.test.js
+++ b/tests/components/BurgerMenuNav.test.js
@@ -4,11 +4,11 @@ import BurgerMenuNav from '~/components/BurgerMenuNav'
 describe('Component: Burger Menu Nav', () => {
   let component
 
-  it('it should display the language switcher', () => {
+  it('it should display the locale switcher', () => {
     // given
     component = shallowMount(BurgerMenuNav, {
       stubs: {
-        'language-switcher': true,
+        'locale-switcher': true,
         'burger-menu-nav-items': true,
       },
       propsData: {
@@ -20,6 +20,6 @@ describe('Component: Burger Menu Nav', () => {
     const result = component.html()
 
     // then
-    expect(result).toContain('<language-switcher-stub')
+    expect(result).toContain('<locale-switcher-stub')
   })
 })
diff --git a/tests/components/LanguageSwitcher.test.js b/tests/components/LocaleSwitcher.test.js
similarity index 56%
rename from tests/components/LanguageSwitcher.test.js
rename to tests/components/LocaleSwitcher.test.js
index a68fa5dda..3b4316542 100644
--- a/tests/components/LanguageSwitcher.test.js
+++ b/tests/components/LocaleSwitcher.test.js
@@ -1,8 +1,8 @@
 import { shallowMount, mount } from '@vue/test-utils'
 import { config } from '~/config/environment'
 import PixLink from '~/components/PixLink'
-import LanguageSwitcher from '~/components/LanguageSwitcher/LanguageSwitcher'
-import LanguageSwitcherSubMenu from '~/components/LanguageSwitcher/LanguageSwitcherSubMenu.vue'
+import LocaleSwitcher from '~/components/LocaleSwitcher/LocaleSwitcher.vue'
+import LocaleSwitcherSubMenu from '~/components/LocaleSwitcher/LocaleSwitcherSubMenu.vue'
 
 jest.mock('~/config/environment', () => ({
   config: {
@@ -15,51 +15,51 @@ jest.mock('~/config/environment', () => ({
   },
 }))
 
-LanguageSwitcherSubMenu.components = { 'pix-link': PixLink }
+LocaleSwitcherSubMenu.components = { 'pix-link': PixLink }
 
-describe('Component: LanguageSwitcher', () => {
+describe('Component: LocaleSwitcher', () => {
   describe('when site is pix-pro', () => {
     beforeEach(() => {
       config.site = 'pix-pro'
       config.isPixSite = false
     })
 
-    it('should render the language switcher', () => {
+    it('should render the locale switcher', () => {
       // given
       const $t = () => {}
       const $i18n = { locale: 'fr-fr' }
 
       // when
-      const wrapper = shallowMount(LanguageSwitcher, {
+      const wrapper = shallowMount(LocaleSwitcher, {
         stubs: {
-          LanguageSwitcherSubMenu: true,
+          LocaleSwitcherSubMenu: true,
           fa: true,
         },
         propsData: {
           type: 'with-dropdown',
         },
-        data: LanguageSwitcher.data,
-        computed: LanguageSwitcher.computed,
+        data: LocaleSwitcher.data,
+        computed: LocaleSwitcher.computed,
         mocks: { $t, $i18n },
       })
 
       // then
-      expect(wrapper.find('.language-switcher__button').exists()).toBe(true)
+      expect(wrapper.find('.locale-switcher__button').exists()).toBe(true)
     })
 
-    it('should render the language switcher correctly for pix-pro', async () => {
+    it('should render the locale switcher correctly for pix-pro', async () => {
       // given
       const $t = () => {}
       const $i18n = { locale: 'fr-fr' }
 
       // when
-      const wrapper = mount(LanguageSwitcher, {
-        components: { LanguageSwitcherSubMenu, PixLink },
+      const wrapper = mount(LocaleSwitcher, {
+        components: { LocaleSwitcherSubMenu, PixLink },
         mocks: { $t, $i18n },
         stubs: { fa: true },
       })
       await wrapper.find('button').trigger('click')
-      await wrapper.find('.language-switcher-sub-menu-button').trigger('click')
+      await wrapper.find('.locale-switcher-sub-menu-button').trigger('click')
 
       // then
       expect(wrapper.element).toMatchSnapshot()
@@ -72,19 +72,19 @@ describe('Component: LanguageSwitcher', () => {
       config.isPixSite = true
     })
 
-    it('should render the language switcher correctly for pix-site', async () => {
+    it('should render the locale switcher correctly for pix-site', async () => {
       // given
       const $t = () => {}
       const $i18n = { locale: 'fr-fr' }
 
       // when
-      const wrapper = mount(LanguageSwitcher, {
-        components: { LanguageSwitcherSubMenu, PixLink },
+      const wrapper = mount(LocaleSwitcher, {
+        components: { LocaleSwitcherSubMenu, PixLink },
         mocks: { $t, $i18n },
         stubs: { fa: true },
       })
       await wrapper.find('button').trigger('click')
-      await wrapper.find('.language-switcher-sub-menu-button').trigger('click')
+      await wrapper.find('.locale-switcher-sub-menu-button').trigger('click')
 
       // then
       expect(wrapper.element).toMatchSnapshot()
diff --git a/tests/components/__snapshots__/LanguageSwitcher.test.js.snap b/tests/components/__snapshots__/LocaleSwitcher.test.js.snap
similarity index 65%
rename from tests/components/__snapshots__/LanguageSwitcher.test.js.snap
rename to tests/components/__snapshots__/LocaleSwitcher.test.js.snap
index d794146ad..f5924ef0f 100644
--- a/tests/components/__snapshots__/LanguageSwitcher.test.js.snap
+++ b/tests/components/__snapshots__/LocaleSwitcher.test.js.snap
@@ -1,61 +1,61 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Component: LanguageSwitcher when site is pix-pro should render the language switcher correctly for pix-pro 1`] = `
+exports[`Component: LocaleSwitcher when site is pix-pro should render the locale switcher correctly for pix-pro 1`] = `
 <div
-  class="language-switcher"
+  class="locale-switcher"
 >
   <button
     aria-expanded="true"
     aria-haspopup="true"
-    class="language-switcher__button"
+    class="locale-switcher__button"
   >
     
     
     
     <fa-stub
-      class="language-switcher-button__angle"
+      class="locale-switcher-button__angle"
       icon="angle-up"
     />
   </button>
    
   <ul
-    class="language-switcher__dropdown-menu"
+    class="locale-switcher__dropdown-menu"
   >
     <li
       class=""
     >
       <div
-        class="language-switcher__lang"
+        class="locale-switcher__locale"
       >
         <button
-          class="language-switcher-sub-menu-button"
+          class="locale-switcher-sub-menu-button"
         >
           <img
             alt=""
-            class="language-switcher__img"
+            class="locale-switcher__img"
             src="/images/globe-europe.svg"
           />
            
           <div
-            class="lang__text"
+            class="locale__text"
           >
             
           </div>
            
           <fa-stub
-            class="language-switcher__icon language-switcher-button__angle"
+            class="locale-switcher__icon locale-switcher-button__angle"
             icon="angle-right"
           />
         </button>
          
         <ul
-          class="language-switcher__dropdown-menu child"
+          class="locale-switcher__dropdown-menu child"
         >
           <li
             class=""
           >
             <div
-              class="language-switcher__lang"
+              class="locale-switcher__locale"
             >
               <a
                 href="http://example.org/fr"
@@ -70,7 +70,7 @@ exports[`Component: LanguageSwitcher when site is pix-pro should render the lang
             class=""
           >
             <div
-              class="language-switcher__lang"
+              class="locale-switcher__locale"
             >
               <a
                 href="http://example.org/en-gb"
@@ -85,22 +85,22 @@ exports[`Component: LanguageSwitcher when site is pix-pro should render the lang
       </div>
     </li>
     <li
-      class="language-switcher__dropdown-menu--active"
+      class="locale-switcher__dropdown-menu--active"
     >
       <div
-        class="language-switcher__lang"
+        class="locale-switcher__locale"
       >
         <a
           href="http://example.fr/"
         >
           <img
             alt=""
-            class="language-switcher__img"
+            class="locale-switcher__img"
             src="/images/flag-fr.svg"
           />
            
           <div
-            class="lang__text"
+            class="locale__text"
           >
             <div>
               
@@ -115,26 +115,26 @@ exports[`Component: LanguageSwitcher when site is pix-pro should render the lang
       class=""
     >
       <div
-        class="language-switcher__lang"
+        class="locale-switcher__locale"
       >
         <a
           href="http://example.org/fr-be"
         >
           <img
             alt=""
-            class="language-switcher__img"
+            class="locale-switcher__img"
             src="/images/flag-be.svg"
           />
            
           <div
-            class="lang__text"
+            class="locale__text"
           >
             <div>
               
             </div>
              
             <div
-              class="language-switcher__subtitle"
+              class="locale-switcher__subtitle"
             >
               
               
@@ -152,62 +152,62 @@ exports[`Component: LanguageSwitcher when site is pix-pro should render the lang
 </div>
 `;
 
-exports[`Component: LanguageSwitcher when site is pix-site should render the language switcher correctly for pix-site 1`] = `
+exports[`Component: LocaleSwitcher when site is pix-site should render the locale switcher correctly for pix-site 1`] = `
 <div
-  class="language-switcher"
+  class="locale-switcher"
 >
   <button
     aria-expanded="true"
     aria-haspopup="true"
-    class="language-switcher__button"
+    class="locale-switcher__button"
   >
     
     
     
     <fa-stub
-      class="language-switcher-button__angle"
+      class="locale-switcher-button__angle"
       icon="angle-up"
     />
   </button>
    
   <ul
-    class="language-switcher__dropdown-menu"
+    class="locale-switcher__dropdown-menu"
   >
     <li
       class=""
     >
       <div
-        class="language-switcher__lang"
+        class="locale-switcher__locale"
       >
         <button
-          class="language-switcher-sub-menu-button"
+          class="locale-switcher-sub-menu-button"
         >
           <img
             alt=""
-            class="language-switcher__img"
+            class="locale-switcher__img"
             src="/images/globe-europe.svg"
           />
            
           <div
-            class="lang__text"
+            class="locale__text"
           >
             
           </div>
            
           <fa-stub
-            class="language-switcher__icon language-switcher-button__angle"
+            class="locale-switcher__icon locale-switcher-button__angle"
             icon="angle-right"
           />
         </button>
          
         <ul
-          class="language-switcher__dropdown-menu child"
+          class="locale-switcher__dropdown-menu child"
         >
           <li
             class=""
           >
             <div
-              class="language-switcher__lang"
+              class="locale-switcher__locale"
             >
               <a
                 href="http://example.org/fr"
@@ -222,7 +222,7 @@ exports[`Component: LanguageSwitcher when site is pix-site should render the lan
             class=""
           >
             <div
-              class="language-switcher__lang"
+              class="locale-switcher__locale"
             >
               <a
                 href="http://example.org/en-gb"
@@ -237,22 +237,22 @@ exports[`Component: LanguageSwitcher when site is pix-site should render the lan
       </div>
     </li>
     <li
-      class="language-switcher__dropdown-menu--active"
+      class="locale-switcher__dropdown-menu--active"
     >
       <div
-        class="language-switcher__lang"
+        class="locale-switcher__locale"
       >
         <a
           href="http://example.fr/"
         >
           <img
             alt=""
-            class="language-switcher__img"
+            class="locale-switcher__img"
             src="/images/flag-fr.svg"
           />
            
           <div
-            class="lang__text"
+            class="locale__text"
           >
             <div>
               
@@ -267,26 +267,26 @@ exports[`Component: LanguageSwitcher when site is pix-site should render the lan
       class=""
     >
       <div
-        class="language-switcher__lang"
+        class="locale-switcher__locale"
       >
         <a
           href="http://example.org/fr-be"
         >
           <img
             alt=""
-            class="language-switcher__img"
+            class="locale-switcher__img"
             src="/images/flag-be.svg"
           />
            
           <div
-            class="lang__text"
+            class="locale__text"
           >
             <div>
               
             </div>
              
             <div
-              class="language-switcher__subtitle"
+              class="locale-switcher__subtitle"
             >
               
               
diff --git a/tests/components/slices/ActionsZone.test.js b/tests/components/slices/ActionsZone.test.js
index dbf793576..12bcf7a1e 100644
--- a/tests/components/slices/ActionsZone.test.js
+++ b/tests/components/slices/ActionsZone.test.js
@@ -4,11 +4,11 @@ import ActionsZone from '~/components/slices/ActionsZone'
 describe('Slice: Actions Zone', () => {
   let component
 
-  it('it should display the language switcher', () => {
+  it('it should display the locale switcher', () => {
     // given
     component = shallowMount(ActionsZone, {
       stubs: {
-        'language-switcher': true,
+        'locale-switcher': true,
         'pix-prismic-link': true,
       },
       propsData: {
@@ -22,6 +22,6 @@ describe('Slice: Actions Zone', () => {
     const result = component.html()
 
     // then
-    expect(result).toContain('<language-switcher-stub')
+    expect(result).toContain('<locale-switcher-stub')
   })
 })

From aac231e170a104def7fa8394ce0dfdd7f20b2bac Mon Sep 17 00:00:00 2001
From: Yann Bertrand <5855339+yannbertrand@users.noreply.github.com>
Date: Mon, 9 Jan 2023 16:35:32 +0100
Subject: [PATCH 3/6] sr: move lang folder to translations

---
 nuxt.config.js                  | 2 +-
 services/link-resolver.js       | 4 ++--
 {lang => translations}/en-gb.js | 0
 {lang => translations}/fr-be.js | 0
 {lang => translations}/fr-fr.js | 0
 {lang => translations}/fr.js    | 0
 {lang => translations}/index.js | 2 +-
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename {lang => translations}/en-gb.js (100%)
 rename {lang => translations}/fr-be.js (100%)
 rename {lang => translations}/fr-fr.js (100%)
 rename {lang => translations}/fr.js (100%)
 rename {lang => translations}/index.js (56%)

diff --git a/nuxt.config.js b/nuxt.config.js
index ed87bc7bf..86af32c36 100755
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -105,7 +105,7 @@ const nuxtConfig = {
     detectBrowserLanguage: false,
     locales: language.localesForCurrentSite,
     lazy: true,
-    langDir: 'lang/',
+    langDir: 'translations/',
     ...(config.isFrenchDomain
       ? i18nConfigurationForFrenchDomain
       : i18nConfigurationForInternationalDomain),
diff --git a/services/link-resolver.js b/services/link-resolver.js
index 0312d1e5c..aba5ff62a 100755
--- a/services/link-resolver.js
+++ b/services/link-resolver.js
@@ -1,11 +1,11 @@
-import { translation } from '../lang'
+import { translations } from '../translations'
 import { DOCUMENTS, TAGS } from './document-fetcher'
 
 export function linkResolver(doc) {
   const locale = doc.lang !== 'fr-fr' ? `/${doc.lang}` : ''
 
   if (doc.type === DOCUMENTS.NEWS_ITEM) {
-    return `${locale}/${translation[doc.lang]['news-page-prefix']}/${doc.uid}`
+    return `${locale}/${translations[doc.lang]['news-page-prefix']}/${doc.uid}`
   }
   if (doc.tags?.includes(TAGS.INDEX)) {
     return `${locale}/`
diff --git a/lang/en-gb.js b/translations/en-gb.js
similarity index 100%
rename from lang/en-gb.js
rename to translations/en-gb.js
diff --git a/lang/fr-be.js b/translations/fr-be.js
similarity index 100%
rename from lang/fr-be.js
rename to translations/fr-be.js
diff --git a/lang/fr-fr.js b/translations/fr-fr.js
similarity index 100%
rename from lang/fr-fr.js
rename to translations/fr-fr.js
diff --git a/lang/fr.js b/translations/fr.js
similarity index 100%
rename from lang/fr.js
rename to translations/fr.js
diff --git a/lang/index.js b/translations/index.js
similarity index 56%
rename from lang/index.js
rename to translations/index.js
index f2a6fd0a1..f879f62f7 100644
--- a/lang/index.js
+++ b/translations/index.js
@@ -3,4 +3,4 @@ import frFr from './fr-fr'
 import frBe from './fr-be'
 import enGb from './en-gb'
 
-export const translation = { fr, 'fr-fr': frFr, 'fr-be': frBe, 'en-gb': enGb }
+export const translations = { fr, 'fr-fr': frFr, 'fr-be': frBe, 'en-gb': enGb }

From 89e7d63ad92a3721b58fc158f6a00fb5187a9a10 Mon Sep 17 00:00:00 2001
From: Yann Bertrand <5855339+yannbertrand@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:00:37 +0100
Subject: [PATCH 4/6] sr: migrate from languages config to localization

---
 components/LocaleSwitcher/LocaleSwitcher.vue  | 15 +++---
 .../LocaleSwitcher/LocaleSwitcherSubMenu.vue  | 16 +++---
 config/language/index.js                      |  7 ---
 config/localization/index.js                  |  7 +++
 config/{language => localization}/pix-pro.js  |  2 +-
 config/{language => localization}/pix-site.js |  2 +-
 nuxt.config.js                                |  4 +-
 pages/pix-site/index.vue                      |  6 +--
 services/get-routes-to-generate.js            |  6 ++-
 tests/config/language/index.test.js           | 51 ------------------
 tests/config/localization/index.test.js       | 53 +++++++++++++++++++
 .../pix-pro.test.js                           |  9 ++--
 .../pix-site.test.js                          |  9 ++--
 tests/services/get-routes-to-generate.test.js |  6 +--
 14 files changed, 101 insertions(+), 92 deletions(-)
 delete mode 100644 config/language/index.js
 create mode 100644 config/localization/index.js
 rename config/{language => localization}/pix-pro.js (97%)
 rename config/{language => localization}/pix-site.js (98%)
 delete mode 100644 tests/config/language/index.test.js
 create mode 100644 tests/config/localization/index.test.js
 rename tests/config/{language => localization}/pix-pro.test.js (90%)
 rename tests/config/{language => localization}/pix-site.test.js (90%)

diff --git a/components/LocaleSwitcher/LocaleSwitcher.vue b/components/LocaleSwitcher/LocaleSwitcher.vue
index 1d3e52621..4731becff 100644
--- a/components/LocaleSwitcher/LocaleSwitcher.vue
+++ b/components/LocaleSwitcher/LocaleSwitcher.vue
@@ -21,7 +21,7 @@
     </button>
     <ul v-if="showMenu" class="locale-switcher__dropdown-menu">
       <li
-        v-for="(option, index) in languages.menu"
+        v-for="(option, index) in menu"
         :key="`locale-switcher-${index}`"
         :class="{
           'locale-switcher__dropdown-menu--active':
@@ -48,7 +48,7 @@
             </button>
             <locale-switcher-sub-menu
               :show-sub-menu="showSubMenu"
-              :available-languages="option.children"
+              :available-locales="option.children"
               :current-locale-code="currentLocaleCode"
               :selected-menu="selectedMenu"
             />
@@ -73,7 +73,7 @@
   </div>
   <div v-else-if="type === 'only-text'">
     <ul class="locale-switcher-burger-menu">
-      <li v-for="option in languages.menu" :key="option.key">
+      <li v-for="option in menu" :key="option.key">
         <template v-if="option.children">
           <span
             v-for="child in option.children"
@@ -109,7 +109,7 @@
 </template>
 
 <script>
-import { language } from '~/config/language'
+import { localization } from '~/config/localization'
 import { getAbsoluteUrlIfSwitchWebsite } from '~/services/get-absolute-url-if-switch-website'
 
 export default {
@@ -121,11 +121,10 @@ export default {
     },
   },
   data() {
-    const languages = language
     return {
       showMenu: false,
       showSubMenu: false,
-      languages,
+      menu: localization.menu,
     }
   },
   computed: {
@@ -133,7 +132,7 @@ export default {
       return this.$i18n.locale || this.$i18n.defaultLocale
     },
     selectedMenu() {
-      return this.languages.menu
+      return localization.menu
         .flatMap((menuItem) => menuItem.children ?? menuItem)
         .find((locale) => locale.localeCode === this.currentLocaleCode)
     },
@@ -159,7 +158,7 @@ export default {
       this.showSubMenu = false
     },
     getIndexUrl(menuItem) {
-      const locale = language.locales.find(
+      const locale = localization.locales.find(
         (locale) => locale.code === menuItem.localeCode
       )
       return getAbsoluteUrlIfSwitchWebsite({
diff --git a/components/LocaleSwitcher/LocaleSwitcherSubMenu.vue b/components/LocaleSwitcher/LocaleSwitcherSubMenu.vue
index 86a924b65..38ce3a9be 100644
--- a/components/LocaleSwitcher/LocaleSwitcherSubMenu.vue
+++ b/components/LocaleSwitcher/LocaleSwitcherSubMenu.vue
@@ -1,16 +1,16 @@
 <template>
   <ul v-if="showSubMenu" class="locale-switcher__dropdown-menu child">
     <li
-      v-for="availableLanguage in availableLanguages"
-      :key="availableLanguage.key"
+      v-for="availableLocale in availableLocales"
+      :key="availableLocale.key"
       :class="{
         'locale-switcher__dropdown-menu--active':
-          availableLanguage.localeCode === currentLocaleCode,
+          availableLocale.localeCode === currentLocaleCode,
       }"
     >
       <div class="locale-switcher__locale">
-        <pix-link :href="getIndexUrl(availableLanguage)">
-          {{ $t(availableLanguage.name) }}
+        <pix-link :href="getIndexUrl(availableLocale)">
+          {{ $t(availableLocale.name) }}
         </pix-link>
       </div>
     </li>
@@ -19,7 +19,7 @@
 
 <script>
 import { getAbsoluteUrlIfSwitchWebsite } from '~/services/get-absolute-url-if-switch-website'
-import { language } from '~/config/language'
+import { localization } from '~/config/localization'
 
 export default {
   name: 'LocaleSwitcherSubMenu',
@@ -28,7 +28,7 @@ export default {
       type: Boolean,
       default: false,
     },
-    availableLanguages: {
+    availableLocales: {
       type: Array,
       default: null,
     },
@@ -43,7 +43,7 @@ export default {
   },
   methods: {
     getIndexUrl(menuItem) {
-      const locale = language.locales.find(
+      const locale = localization.locales.find(
         (locale) => locale.code === menuItem.localeCode
       )
       return getAbsoluteUrlIfSwitchWebsite({
diff --git a/config/language/index.js b/config/language/index.js
deleted file mode 100644
index 283f39b3b..000000000
--- a/config/language/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { config } from '../environment'
-import { language as languageForPixSite } from '../language/pix-site'
-import { language as languageForPixPro } from '../language/pix-pro'
-
-export const language = config.isPixSite
-  ? languageForPixSite
-  : languageForPixPro
diff --git a/config/localization/index.js b/config/localization/index.js
new file mode 100644
index 000000000..a21fa762c
--- /dev/null
+++ b/config/localization/index.js
@@ -0,0 +1,7 @@
+import { config } from '../environment'
+import { localization as localizationForPixSite } from './pix-site'
+import { localization as localizationForPixPro } from './pix-pro'
+
+export const localization = config.isPixSite
+  ? localizationForPixSite
+  : localizationForPixPro
diff --git a/config/language/pix-pro.js b/config/localization/pix-pro.js
similarity index 97%
rename from config/language/pix-pro.js
rename to config/localization/pix-pro.js
index 9ec57fe14..016d757b7 100644
--- a/config/language/pix-pro.js
+++ b/config/localization/pix-pro.js
@@ -17,7 +17,7 @@ export const availableLocales = [
     domain: config.domain.french,
   },
 ]
-export const language = {
+export const localization = {
   menu: [
     {
       name: 'international',
diff --git a/config/language/pix-site.js b/config/localization/pix-site.js
similarity index 98%
rename from config/language/pix-site.js
rename to config/localization/pix-site.js
index d66fc08e5..947ed806a 100644
--- a/config/language/pix-site.js
+++ b/config/localization/pix-site.js
@@ -31,7 +31,7 @@ export const availableLocales = [
   },
 ]
 
-export const language = {
+export const localization = {
   menu: [
     {
       name: 'international',
diff --git a/nuxt.config.js b/nuxt.config.js
index 86af32c36..ff919d0b5 100755
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,7 +1,7 @@
 import { transports } from 'winston'
 import routes from './services/get-routes-to-generate'
 import { filterNuxtPages } from './services/filter-nuxt-pages'
-import { language } from './config/language'
+import { localization } from './config/localization'
 import { config } from './config/environment'
 import { SITES_PRISMIC_TAGS } from './services/available-sites'
 
@@ -103,7 +103,7 @@ const nuxtConfig = {
 
   i18n: {
     detectBrowserLanguage: false,
-    locales: language.localesForCurrentSite,
+    locales: localization.localesForCurrentSite,
     lazy: true,
     langDir: 'translations/',
     ...(config.isFrenchDomain
diff --git a/pages/pix-site/index.vue b/pages/pix-site/index.vue
index 73b8dbee3..756650de8 100644
--- a/pages/pix-site/index.vue
+++ b/pages/pix-site/index.vue
@@ -21,14 +21,14 @@
 </template>
 
 <script>
-import { language } from '~/config/language'
+import { localization } from '~/config/localization'
 
 export default {
   layout: 'empty',
   nuxtI18n: false,
   data() {
     return {
-      locales: language.locales,
+      locales: localization.locales,
       shouldDisplayLocaleChoice: false,
     }
   },
@@ -48,7 +48,7 @@ export default {
 
       const chosenLocale = localeCookie.split('=')[1]
 
-      const currentLocales = language.localesForCurrentSite.map(
+      const currentLocales = localization.localesForCurrentSite.map(
         ({ code }) => code
       )
       if (!currentLocales.includes(chosenLocale)) return null
diff --git a/services/get-routes-to-generate.js b/services/get-routes-to-generate.js
index c06689d07..53cbf16d1 100644
--- a/services/get-routes-to-generate.js
+++ b/services/get-routes-to-generate.js
@@ -1,5 +1,5 @@
 import Prismic from '@prismicio/client'
-import { language } from '../config/language'
+import { localization } from '../config/localization'
 import { config } from '../config/environment'
 import { linkResolver } from '../services/link-resolver'
 
@@ -30,7 +30,9 @@ async function getRoutesInPage(api, page) {
     }
   )
 
-  const localesToBuild = language.localesForCurrentSite.map(({ code }) => code)
+  const localesToBuild = localization.localesForCurrentSite.map(
+    ({ code }) => code
+  )
   const routes = results
     .filter(({ uid }) => Boolean(uid))
     .filter(({ lang }) => localesToBuild.includes(lang))
diff --git a/tests/config/language/index.test.js b/tests/config/language/index.test.js
deleted file mode 100644
index 4ca8841fa..000000000
--- a/tests/config/language/index.test.js
+++ /dev/null
@@ -1,51 +0,0 @@
-describe('#language', () => {
-  let config, languageForPixSite, languageForPixPro
-  beforeEach(() => {
-    jest.resetModules()
-    config = require('~/config/environment').config
-    languageForPixSite = require('~/config/language/pix-site').language
-    languageForPixPro = require('~/config/language/pix-pro').language
-
-    jest.mock('~/config/environment', () => {
-      return {
-        config: {
-          isPixSite: false,
-        },
-      }
-    })
-
-    jest.mock('~/config/language/pix-site', () => {
-      return { language: Symbol('pix-site language') }
-    })
-
-    jest.mock('~/config/language/pix-pro', () => {
-      return { language: Symbol('pix-pro language') }
-    })
-  })
-
-  describe('when it is pix site', () => {
-    it('should return language menu and locales dependant of site', () => {
-      // given
-      config.isPixSite = true
-
-      // when
-      const { language } = require('~/config/language')
-
-      // then
-      expect(language).toEqual(languageForPixSite)
-    })
-  })
-
-  describe('when it is pix pro', () => {
-    it('should return language menu and locales dependant of site', () => {
-      // given
-      config.isPixSite = false
-
-      // when
-      const { language } = require('~/config/language')
-
-      // then
-      expect(language).toEqual(languageForPixPro)
-    })
-  })
-})
diff --git a/tests/config/localization/index.test.js b/tests/config/localization/index.test.js
new file mode 100644
index 000000000..b2a651cf3
--- /dev/null
+++ b/tests/config/localization/index.test.js
@@ -0,0 +1,53 @@
+describe('#localization', () => {
+  let config, localizationForPixSite, localizationForPixPro
+  beforeEach(() => {
+    jest.resetModules()
+    config = require('~/config/environment').config
+    localizationForPixSite =
+      require('~/config/localization/pix-site').localization
+    localizationForPixPro =
+      require('~/config/localization/pix-pro').localization
+
+    jest.mock('~/config/environment', () => {
+      return {
+        config: {
+          isPixSite: false,
+        },
+      }
+    })
+
+    jest.mock('~/config/localization/pix-site', () => {
+      return { localization: Symbol('pix-site localization') }
+    })
+
+    jest.mock('~/config/localization/pix-pro', () => {
+      return { localization: Symbol('pix-pro localization') }
+    })
+  })
+
+  describe('when it is pix site', () => {
+    it('should return localization menu and locales dependant of site', () => {
+      // given
+      config.isPixSite = true
+
+      // when
+      const { localization } = require('~/config/localization')
+
+      // then
+      expect(localization).toEqual(localizationForPixSite)
+    })
+  })
+
+  describe('when it is pix pro', () => {
+    it('should return localization menu and locales dependant of site', () => {
+      // given
+      config.isPixSite = false
+
+      // when
+      const { localization } = require('~/config/localization')
+
+      // then
+      expect(localization).toEqual(localizationForPixPro)
+    })
+  })
+})
diff --git a/tests/config/language/pix-pro.test.js b/tests/config/localization/pix-pro.test.js
similarity index 90%
rename from tests/config/language/pix-pro.test.js
rename to tests/config/localization/pix-pro.test.js
index 354b68b73..c5ecea823 100644
--- a/tests/config/language/pix-pro.test.js
+++ b/tests/config/localization/pix-pro.test.js
@@ -1,4 +1,7 @@
-import { getLocalesForCurrentSite, language } from '~/config/language/pix-pro'
+import {
+  getLocalesForCurrentSite,
+  localization,
+} from '~/config/localization/pix-pro'
 import { config } from '~/config/environment'
 
 jest.mock('~/config/environment', () => {
@@ -49,7 +52,7 @@ describe('#getLocalesForCurrentSite', () => {
   })
 })
 
-describe('#language', () => {
+describe('#localization', () => {
   it('should return all menu entries for pix-pro', () => {
     // given
     const expectedResult = [
@@ -81,6 +84,6 @@ describe('#language', () => {
     ]
 
     // when & then
-    expect(language.menu).toEqual(expectedResult)
+    expect(localization.menu).toEqual(expectedResult)
   })
 })
diff --git a/tests/config/language/pix-site.test.js b/tests/config/localization/pix-site.test.js
similarity index 90%
rename from tests/config/language/pix-site.test.js
rename to tests/config/localization/pix-site.test.js
index 9eb5ffde5..48f1c03e4 100644
--- a/tests/config/language/pix-site.test.js
+++ b/tests/config/localization/pix-site.test.js
@@ -1,4 +1,7 @@
-import { getLocalesForCurrentSite, language } from '~/config/language/pix-site'
+import {
+  getLocalesForCurrentSite,
+  localization,
+} from '~/config/localization/pix-site'
 import { config } from '~/config/environment'
 
 jest.mock('~/config/environment', () => {
@@ -48,7 +51,7 @@ describe('#getLocalesForCurrentSite', () => {
   })
 })
 
-describe('#language', () => {
+describe('#localization', () => {
   it('should return all menu entries for pix-site', () => {
     // given
     const expectedResult = [
@@ -86,6 +89,6 @@ describe('#language', () => {
     ]
 
     // when & then
-    expect(language.menu).toEqual(expectedResult)
+    expect(localization.menu).toEqual(expectedResult)
   })
 })
diff --git a/tests/services/get-routes-to-generate.test.js b/tests/services/get-routes-to-generate.test.js
index 6f9f97f09..779c332ed 100644
--- a/tests/services/get-routes-to-generate.test.js
+++ b/tests/services/get-routes-to-generate.test.js
@@ -11,9 +11,9 @@ jest.mock('~/config/environment', () => {
     },
   }
 })
-jest.mock('~/config/language', () => {
+jest.mock('~/config/localization', () => {
   return {
-    language: {
+    localization: {
       localesForCurrentSite: [{ code: 'fr-fr' }],
     },
   }
@@ -116,7 +116,7 @@ describe('#getRoutesToGenerate', () => {
       expect(result).toEqual(expected)
     })
 
-    test('it should filter unhandled languages', async () => {
+    test('it should filter unhandled locales', async () => {
       // Given
       const expected = ['/route-to-generate']
       const prismicApi = {

From 19d00aae4f6aaabd8df51d7b61285a9c04401f42 Mon Sep 17 00:00:00 2001
From: Yann Bertrand <5855339+yannbertrand@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:05:10 +0100
Subject: [PATCH 5/6] sr: ensure that we manipulate 'locale' rather than 'lang'

---
 services/document-fetcher.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/services/document-fetcher.js b/services/document-fetcher.js
index 286a271bf..ad447ebde 100644
--- a/services/document-fetcher.js
+++ b/services/document-fetcher.js
@@ -18,13 +18,13 @@ export function documentFetcher(
   i18n = { defaultLocale: 'fr-fr' },
   req
 ) {
-  const lang = i18n.locale || i18n.defaultLocale
+  const locale = i18n.locale || i18n.defaultLocale
   return {
     get: getSingle,
     findHotNewsBanner: async () => {
       const documents = await prismic.api.query(
         prismic.predicates.at('document.type', DOCUMENTS.HOT_NEWS),
-        { lang }
+        { lang: locale }
       )
       return documents.results[0]
     },
@@ -37,7 +37,7 @@ export function documentFetcher(
             process.env.SITE
           ),
         ],
-        { lang }
+        { lang: locale }
       )
       return documents.results[0]
     },
@@ -50,13 +50,13 @@ export function documentFetcher(
             process.env.SITE
           ),
         ],
-        { lang }
+        { lang: locale }
       )
       return documents.results[0]
     },
     getEmployers: async () => {
       const document = await prismic.api.getSingle('employers', {
-        lang,
+        lang: locale,
         fetchLinks: [
           'distributor_item.description',
           'distributor_item.footer',
@@ -74,7 +74,7 @@ export function documentFetcher(
           page,
           pageSize,
           orderings: `[my.${DOCUMENTS.NEWS_ITEM}.date desc]`,
-          lang,
+          lang: locale,
         }
       )
       return documents.results
@@ -82,7 +82,7 @@ export function documentFetcher(
     getNewsItemByUid: async (slug) => {
       const document = await prismic.api.query(
         prismic.predicates.at(`my.${DOCUMENTS.NEWS_ITEM}.uid`, slug),
-        { lang }
+        { lang: locale }
       )
       return document.results[0]
     },
@@ -96,13 +96,13 @@ export function documentFetcher(
   }
 
   function getSingle(type) {
-    return prismic.api.getSingle(type, { lang })
+    return prismic.api.getSingle(type, { lang: locale })
   }
 
   async function getSimplePageByUid(uid) {
     const document = await prismic.api.query(
       prismic.predicates.at(`my.${DOCUMENTS.SIMPLE_PAGE}.uid`, uid),
-      { lang }
+      { lang: locale }
     )
     return document.results[0]
   }
@@ -110,7 +110,7 @@ export function documentFetcher(
   async function getFormPageByUid(uid) {
     const document = await prismic.api.query(
       prismic.predicates.at(`my.${DOCUMENTS.FORM_PAGE}.uid`, uid),
-      { lang }
+      { lang: locale }
     )
     return document.results[0]
   }
@@ -118,7 +118,7 @@ export function documentFetcher(
   async function getSlicesPageByUid(uid) {
     const document = await prismic.api.query(
       prismic.predicates.at(`my.${DOCUMENTS.SLICES_PAGE}.uid`, uid),
-      { lang }
+      { lang: locale }
     )
     return document.results[0]
   }

From 08147c53aa5f1feacc99d2362a6f779445c31158 Mon Sep 17 00:00:00 2001
From: Yann Bertrand <5855339+yannbertrand@users.noreply.github.com>
Date: Tue, 10 Jan 2023 09:42:42 +0100
Subject: [PATCH 6/6] sr: move translations to config/localization

---
 {translations => config/localization/translations}/en-gb.js | 0
 {translations => config/localization/translations}/fr-be.js | 0
 {translations => config/localization/translations}/fr-fr.js | 0
 {translations => config/localization/translations}/fr.js    | 0
 {translations => config/localization/translations}/index.js | 0
 nuxt.config.js                                              | 2 +-
 services/link-resolver.js                                   | 2 +-
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename {translations => config/localization/translations}/en-gb.js (100%)
 rename {translations => config/localization/translations}/fr-be.js (100%)
 rename {translations => config/localization/translations}/fr-fr.js (100%)
 rename {translations => config/localization/translations}/fr.js (100%)
 rename {translations => config/localization/translations}/index.js (100%)

diff --git a/translations/en-gb.js b/config/localization/translations/en-gb.js
similarity index 100%
rename from translations/en-gb.js
rename to config/localization/translations/en-gb.js
diff --git a/translations/fr-be.js b/config/localization/translations/fr-be.js
similarity index 100%
rename from translations/fr-be.js
rename to config/localization/translations/fr-be.js
diff --git a/translations/fr-fr.js b/config/localization/translations/fr-fr.js
similarity index 100%
rename from translations/fr-fr.js
rename to config/localization/translations/fr-fr.js
diff --git a/translations/fr.js b/config/localization/translations/fr.js
similarity index 100%
rename from translations/fr.js
rename to config/localization/translations/fr.js
diff --git a/translations/index.js b/config/localization/translations/index.js
similarity index 100%
rename from translations/index.js
rename to config/localization/translations/index.js
diff --git a/nuxt.config.js b/nuxt.config.js
index ff919d0b5..4ab18ec5a 100755
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -105,7 +105,7 @@ const nuxtConfig = {
     detectBrowserLanguage: false,
     locales: localization.localesForCurrentSite,
     lazy: true,
-    langDir: 'translations/',
+    langDir: 'config/localization/translations/',
     ...(config.isFrenchDomain
       ? i18nConfigurationForFrenchDomain
       : i18nConfigurationForInternationalDomain),
diff --git a/services/link-resolver.js b/services/link-resolver.js
index aba5ff62a..d1bce7948 100755
--- a/services/link-resolver.js
+++ b/services/link-resolver.js
@@ -1,4 +1,4 @@
-import { translations } from '../translations'
+import { translations } from '../config/localization/translations'
 import { DOCUMENTS, TAGS } from './document-fetcher'
 
 export function linkResolver(doc) {