From 1cbc7bdb4295264d9ffc249ce61ddf77de04fba2 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Tue, 26 Mar 2024 10:47:05 +0100
Subject: [PATCH 1/6] Update
 presenter/src/components/language/LanguageSelector.vue

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 presenter/src/components/language/LanguageSelector.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presenter/src/components/language/LanguageSelector.vue b/presenter/src/components/language/LanguageSelector.vue
index 8e8c099d0..5010a5924 100644
--- a/presenter/src/components/language/LanguageSelector.vue
+++ b/presenter/src/components/language/LanguageSelector.vue
@@ -38,7 +38,7 @@ const languages = ref(localizedLocale)
 
 const pageContext = usePageContext()
 
-if (pageContext.locale !== undefined && locales.includes(pageContext.locale)) {
+if (pageContext.locale && locales.includes(pageContext.locale)) {
   i18n.global.locale.value = pageContext.locale
 }
 

From 4f88924701482322ff74015cd889de9b33f75d55 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Tue, 26 Mar 2024 10:47:18 +0100
Subject: [PATCH 2/6] Update presenter/renderer/app.ts

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 presenter/renderer/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presenter/renderer/app.ts b/presenter/renderer/app.ts
index 1d7f64401..c65279ac3 100644
--- a/presenter/renderer/app.ts
+++ b/presenter/renderer/app.ts
@@ -74,7 +74,7 @@ function createApp(pageContext: PageContext, isClient = true) {
 
   setPageContext(app, pageContextReactive)
 
-  if (pageContext.locale !== undefined && locales.includes(pageContext.locale)) {
+  if (pageContext.locale && locales.includes(pageContext.locale)) {
     i18n.global.locale.value = pageContext.locale
   }
 

From 0a101c72a3ec6eaf198cb79ef716cc7a1a361c40 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Tue, 26 Mar 2024 10:47:47 +0100
Subject: [PATCH 3/6] Update presenter/locales/extractLocale.ts

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 presenter/locales/extractLocale.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presenter/locales/extractLocale.ts b/presenter/locales/extractLocale.ts
index dcd5e2c96..6c21d96dc 100644
--- a/presenter/locales/extractLocale.ts
+++ b/presenter/locales/extractLocale.ts
@@ -6,7 +6,7 @@ export function extractLocale(url: string) {
   let urlWithoutLocale
   // We remove the URL locale, for example `/de/about` => `/about`
   const firstPath = urlPaths[1] as LocaleCode
-  if (locales.filter((locale) => locale !== localeDefault).includes(firstPath)) {
+  if (locales.includes(firstPath)) {
     locale = firstPath
     urlWithoutLocale = '/' + urlPaths.slice(2).join('/')
   } else {

From d61220e5f8b34af0a0b414cb2bd21d7f637f85f5 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Tue, 26 Mar 2024 10:52:56 +0100
Subject: [PATCH 4/6] Update presenter/renderer/+onBeforeRoute.ts

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 presenter/renderer/+onBeforeRoute.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/presenter/renderer/+onBeforeRoute.ts b/presenter/renderer/+onBeforeRoute.ts
index cf119802f..3341bd398 100644
--- a/presenter/renderer/+onBeforeRoute.ts
+++ b/presenter/renderer/+onBeforeRoute.ts
@@ -3,9 +3,6 @@ import { PageContext } from 'vike/types'
 import { extractLocale } from '#root/locales/extractLocale'
 
 export function onBeforeRoute(pageContext: PageContext) {
-  if (pageContext.urlPathname.endsWith('.js')) {
-    return { pageContext: { urlLogical: pageContext.urlPathname } }
-  }
 
   const { urlWithoutLocale, locale } = extractLocale(pageContext.urlPathname)
 

From fe90407623fb4a70e2ede4aab262f5266bbc9fcc Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Mar 2024 10:59:36 +0100
Subject: [PATCH 5/6] Remove changes to LanguageSelector since the locale is
 set somewhere else.

---
 .../components/language/LanguageSelector.vue  | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/presenter/src/components/language/LanguageSelector.vue b/presenter/src/components/language/LanguageSelector.vue
index 5010a5924..ae196e29c 100644
--- a/presenter/src/components/language/LanguageSelector.vue
+++ b/presenter/src/components/language/LanguageSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <v-select
-    v-model="selectedLocale"
+    v-model="$i18n.locale"
     density="compact"
     name="language"
     :items="languages"
@@ -12,7 +12,6 @@
     bg-color="transparent"
     hide-details="auto"
     flat
-    @update:model-value="updateLocale"
   >
     <template #selection="{ item }">
       <span>{{ item.raw.locale.toUpperCase() }}</span>
@@ -30,25 +29,9 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 
-import { usePageContext } from '#context/usePageContext'
-import i18n from '#plugins/i18n'
-import { locales, localizedLocale } from '#root/locales'
+import { localizedLocale } from '#root/locales'
 
 const languages = ref(localizedLocale)
-
-const pageContext = usePageContext()
-
-if (pageContext.locale && locales.includes(pageContext.locale)) {
-  i18n.global.locale.value = pageContext.locale
-}
-
-const selectedLocale = ref(i18n.global.locale.value)
-
-function updateLocale() {
-  if (locales.includes(selectedLocale.value)) {
-    i18n.global.locale.value = selectedLocale.value
-  }
-}
 </script>
 
 <style lang="scss">

From 82c94526e095ae0ee691ae073157e5de1314540c Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Mar 2024 11:04:39 +0100
Subject: [PATCH 6/6] Fix linting error.

---
 presenter/renderer/+onBeforeRoute.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/presenter/renderer/+onBeforeRoute.ts b/presenter/renderer/+onBeforeRoute.ts
index 3341bd398..626930f25 100644
--- a/presenter/renderer/+onBeforeRoute.ts
+++ b/presenter/renderer/+onBeforeRoute.ts
@@ -3,7 +3,6 @@ import { PageContext } from 'vike/types'
 import { extractLocale } from '#root/locales/extractLocale'
 
 export function onBeforeRoute(pageContext: PageContext) {
-
   const { urlWithoutLocale, locale } = extractLocale(pageContext.urlPathname)
 
   return {