From f66d69653731c977d477f3f65f5ed2eb0bc787c9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 14 Mar 2024 16:55:50 +0100
Subject: [PATCH 01/40] Make i18n for page titles.

---
 presenter/locales/extractLocale.ts   | 18 ++++++++++++++++++
 presenter/locales/index.ts           |  2 ++
 presenter/locales/locales.ts         |  2 ++
 presenter/renderer/+onBeforeRoute.ts | 19 +++++++++++++++++++
 presenter/src/pages/_error/+title.ts |  5 +++++
 presenter/src/pages/optin/+title.ts  | 12 +++++++++++-
 6 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 presenter/locales/extractLocale.ts
 create mode 100644 presenter/locales/index.ts
 create mode 100644 presenter/locales/locales.ts
 create mode 100644 presenter/renderer/+onBeforeRoute.ts

diff --git a/presenter/locales/extractLocale.ts b/presenter/locales/extractLocale.ts
new file mode 100644
index 0000000000..b61effd9ad
--- /dev/null
+++ b/presenter/locales/extractLocale.ts
@@ -0,0 +1,18 @@
+import { locales, localeDefault } from './locales'
+
+export function extractLocale(url: string) {
+  const urlPaths = url.split('/')
+  let locale
+  let urlWithoutLocale
+  // We remove the URL locale, for example `/de-DE/about` => `/about`
+  const firstPath = urlPaths[1]
+  if (locales.filter((locale) => locale !== localeDefault).includes(firstPath)) {
+    locale = firstPath
+    urlWithoutLocale = '/' + urlPaths.slice(2).join('/')
+  } else {
+    locale = localeDefault
+    urlWithoutLocale = url
+  }
+
+  return { locale, urlWithoutLocale }
+}
diff --git a/presenter/locales/index.ts b/presenter/locales/index.ts
new file mode 100644
index 0000000000..1a7100b67e
--- /dev/null
+++ b/presenter/locales/index.ts
@@ -0,0 +1,2 @@
+export { extractLocale } from './extractLocale'
+export { locales, localeDefault } from './locales'
diff --git a/presenter/locales/locales.ts b/presenter/locales/locales.ts
new file mode 100644
index 0000000000..0f43c38f37
--- /dev/null
+++ b/presenter/locales/locales.ts
@@ -0,0 +1,2 @@
+export const locales = ['de', 'en']
+export const localeDefault = locales[0]
diff --git a/presenter/renderer/+onBeforeRoute.ts b/presenter/renderer/+onBeforeRoute.ts
new file mode 100644
index 0000000000..91bbc4f2c3
--- /dev/null
+++ b/presenter/renderer/+onBeforeRoute.ts
@@ -0,0 +1,19 @@
+import { PageContext } from 'vike/types'
+
+import { extractLocale } from '#root/locales/extractLocale'
+
+export function onBeforeRoute(pageContext: PageContext) {
+  const { urlWithoutLocale, locale } = extractLocale(pageContext.urlPathname)
+  // eslint-disable-next-line no-console
+  console.log('urlWithoutLocale', urlWithoutLocale)
+  // eslint-disable-next-line no-console
+  console.log('locale', locale)
+  return {
+    pageContext: {
+      // Make `locale` available as `pageContext.locale`
+      locale,
+      // Vike's router will use pageContext.urlLogical instead of pageContext.urlOriginal
+      urlLogical: urlWithoutLocale,
+    },
+  }
+}
diff --git a/presenter/src/pages/_error/+title.ts b/presenter/src/pages/_error/+title.ts
index 17faffcf02..73f4ec1aa8 100644
--- a/presenter/src/pages/_error/+title.ts
+++ b/presenter/src/pages/_error/+title.ts
@@ -1 +1,6 @@
+// import { usePageContext } from '#context/usePageContext'
+
+// const pageContext = usePageContext()
+
+// export const title = pageContext.locale === 'de-DE' ? 'DreamMall | Fehler' : ''
 export const title = 'DreamMall | Fehler'
diff --git a/presenter/src/pages/optin/+title.ts b/presenter/src/pages/optin/+title.ts
index 0260dfd2c5..8f783fc8ee 100644
--- a/presenter/src/pages/optin/+title.ts
+++ b/presenter/src/pages/optin/+title.ts
@@ -1 +1,11 @@
-export const title = 'DreamMall | Newsletter'
+import { PageContext } from 'vike/types'
+
+// export const title = 'DreamMall | Newsletter'
+
+export function title(pageContext: PageContext) {
+  //   const title = pageContext.locale === 'de' ? 'DreamMall | Newsletter' : 'DreamMall | Newsletter'
+  // eslint-disable-next-line no-console
+  console.log('pageContext', pageContext)
+  const title = 'DreamMall | Newsletter'
+  return title
+}

From e33dd421ac99e3ed027457449726885edbf786b6 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 16 Mar 2024 09:46:33 +0100
Subject: [PATCH 02/40] Locale in i18n.global.locale.value is 'de' or 'en' for
 testing set fixe default.

---
 presenter/locales/locales.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presenter/locales/locales.ts b/presenter/locales/locales.ts
index 0f43c38f37..056d414e46 100644
--- a/presenter/locales/locales.ts
+++ b/presenter/locales/locales.ts
@@ -1,2 +1,2 @@
 export const locales = ['de', 'en']
-export const localeDefault = locales[0]
+export const localeDefault = 'de'

From a4e9ccfa93b1240f93fb5d8f17e97332b776e281 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 16 Mar 2024 09:47:07 +0100
Subject: [PATCH 03/40] Locale in i18n.global.locale.value is 'de' or 'en' for
 testing set fixe default.

---
 presenter/locales/extractLocale.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/presenter/locales/extractLocale.ts b/presenter/locales/extractLocale.ts
index b61effd9ad..eed67e11aa 100644
--- a/presenter/locales/extractLocale.ts
+++ b/presenter/locales/extractLocale.ts
@@ -2,12 +2,12 @@ import { locales, localeDefault } from './locales'
 
 export function extractLocale(url: string) {
   const urlPaths = url.split('/')
-  let locale
+  let locale: 'en' | 'de'
   let urlWithoutLocale
-  // We remove the URL locale, for example `/de-DE/about` => `/about`
+  // We remove the URL locale, for example `/de/about` => `/about`
   const firstPath = urlPaths[1]
   if (locales.filter((locale) => locale !== localeDefault).includes(firstPath)) {
-    locale = firstPath
+    locale = 'en'
     urlWithoutLocale = '/' + urlPaths.slice(2).join('/')
   } else {
     locale = localeDefault

From c2044a155775b8b4470950692bc23913f4710bd1 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 16 Mar 2024 09:47:50 +0100
Subject: [PATCH 04/40] We don't want to use 'de-DE' and use 'de' instead.

---
 presenter/src/pages/_error/+title.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presenter/src/pages/_error/+title.ts b/presenter/src/pages/_error/+title.ts
index 73f4ec1aa8..3d07e33baf 100644
--- a/presenter/src/pages/_error/+title.ts
+++ b/presenter/src/pages/_error/+title.ts
@@ -2,5 +2,5 @@
 
 // const pageContext = usePageContext()
 
-// export const title = pageContext.locale === 'de-DE' ? 'DreamMall | Fehler' : ''
+// export const title = pageContext.locale === 'de' ? 'DreamMall | Fehler' : ''
 export const title = 'DreamMall | Fehler'

From f547fe86903537097b41c5a3cd3b4ef1c59ece14 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 16 Mar 2024 09:48:35 +0100
Subject: [PATCH 05/40] Set i18n.global.locale.value to the value extracted out
 of the url.

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

diff --git a/presenter/renderer/+onBeforeRoute.ts b/presenter/renderer/+onBeforeRoute.ts
index 91bbc4f2c3..a9180e33fb 100644
--- a/presenter/renderer/+onBeforeRoute.ts
+++ b/presenter/renderer/+onBeforeRoute.ts
@@ -1,13 +1,17 @@
 import { PageContext } from 'vike/types'
 
+import i18n from '#plugins/i18n'
 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)
   // eslint-disable-next-line no-console
   console.log('urlWithoutLocale', urlWithoutLocale)
   // eslint-disable-next-line no-console
   console.log('locale', locale)
+  i18n.global.locale.value = locale
   return {
     pageContext: {
       // Make `locale` available as `pageContext.locale`

From a89eb31cf636caf6b01d2978620300fa785a46c1 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 16 Mar 2024 10:05:14 +0100
Subject: [PATCH 06/40] Change export function to export const title.

---
 presenter/src/pages/optin/+title.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/presenter/src/pages/optin/+title.ts b/presenter/src/pages/optin/+title.ts
index 8f783fc8ee..bddb594732 100644
--- a/presenter/src/pages/optin/+title.ts
+++ b/presenter/src/pages/optin/+title.ts
@@ -1,11 +1,11 @@
-import { PageContext } from 'vike/types'
+// const title = pageContext.locale === 'de' ? 'DreamMall | Newsletter' : 'DreamMall | Newsletter'
+export const title = 'DreamMall | Newsletter'
 
-// export const title = 'DreamMall | Newsletter'
-
-export function title(pageContext: PageContext) {
-  //   const title = pageContext.locale === 'de' ? 'DreamMall | Newsletter' : 'DreamMall | Newsletter'
-  // eslint-disable-next-line no-console
-  console.log('pageContext', pageContext)
-  const title = 'DreamMall | Newsletter'
-  return title
-}
+// import { PageContext } from 'vike/types'
+// export function title(pageContext: PageContext) {
+//   //   const title = pageContext.locale === 'de' ? 'DreamMall | Newsletter' : 'DreamMall | Newsletter'
+//   // eslint-disable-next-line no-console
+//   console.log('pageContext', pageContext)
+//   const title = 'DreamMall | Newsletter'
+//   return title
+// }

From e5ab2d7a529078da81986c09c81325f423d1d947 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 18 Mar 2024 10:23:59 +0100
Subject: [PATCH 07/40] Create localeStore.

---
 presenter/renderer/+onBeforeRoute.ts |  8 ++++----
 presenter/src/stores/localeStore.ts  | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 presenter/src/stores/localeStore.ts

diff --git a/presenter/renderer/+onBeforeRoute.ts b/presenter/renderer/+onBeforeRoute.ts
index a9180e33fb..5c31270b84 100644
--- a/presenter/renderer/+onBeforeRoute.ts
+++ b/presenter/renderer/+onBeforeRoute.ts
@@ -1,17 +1,17 @@
 import { PageContext } from 'vike/types'
 
-import i18n from '#plugins/i18n'
 import { extractLocale } from '#root/locales/extractLocale'
+import { useLocaleStore } from '#stores/localeStore'
 
 export function onBeforeRoute(pageContext: PageContext) {
-  if (pageContext.urlPathname.endsWith('.js'))
-    return { pageContext: { urlLogical: pageContext.urlPathname } }
+  if (pageContext.urlPathname.endsWith('.js')) return { pageContext: {} }
   const { urlWithoutLocale, locale } = extractLocale(pageContext.urlPathname)
   // eslint-disable-next-line no-console
   console.log('urlWithoutLocale', urlWithoutLocale)
   // eslint-disable-next-line no-console
   console.log('locale', locale)
-  i18n.global.locale.value = locale
+  const localeStore = useLocaleStore()
+  localeStore.save(locale)
   return {
     pageContext: {
       // Make `locale` available as `pageContext.locale`
diff --git a/presenter/src/stores/localeStore.ts b/presenter/src/stores/localeStore.ts
new file mode 100644
index 0000000000..fa9fa63165
--- /dev/null
+++ b/presenter/src/stores/localeStore.ts
@@ -0,0 +1,18 @@
+import { defineStore } from 'pinia'
+
+import i18n from '#plugins/i18n'
+
+export const useLocaleStore = defineStore('locale', {
+  state: () => ({ locale: 'de' }),
+  actions: {
+    save(l: 'de' | 'en') {
+      this.locale = l
+      i18n.global.locale.value = l
+    },
+    clear() {
+      this.locale = 'de'
+      i18n.global.locale.value = 'de'
+    },
+  },
+  persist: true,
+})

From 85a6817604274306b1b811a3db56c379f2b3ef95 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 18 Mar 2024 10:25:58 +0100
Subject: [PATCH 08/40] Remove changes on +title.ts

---
 presenter/src/pages/_error/+title.ts |  5 -----
 presenter/src/pages/optin/+title.ts  | 10 ----------
 2 files changed, 15 deletions(-)

diff --git a/presenter/src/pages/_error/+title.ts b/presenter/src/pages/_error/+title.ts
index 3d07e33baf..17faffcf02 100644
--- a/presenter/src/pages/_error/+title.ts
+++ b/presenter/src/pages/_error/+title.ts
@@ -1,6 +1 @@
-// import { usePageContext } from '#context/usePageContext'
-
-// const pageContext = usePageContext()
-
-// export const title = pageContext.locale === 'de' ? 'DreamMall | Fehler' : ''
 export const title = 'DreamMall | Fehler'
diff --git a/presenter/src/pages/optin/+title.ts b/presenter/src/pages/optin/+title.ts
index bddb594732..0260dfd2c5 100644
--- a/presenter/src/pages/optin/+title.ts
+++ b/presenter/src/pages/optin/+title.ts
@@ -1,11 +1 @@
-// const title = pageContext.locale === 'de' ? 'DreamMall | Newsletter' : 'DreamMall | Newsletter'
 export const title = 'DreamMall | Newsletter'
-
-// import { PageContext } from 'vike/types'
-// export function title(pageContext: PageContext) {
-//   //   const title = pageContext.locale === 'de' ? 'DreamMall | Newsletter' : 'DreamMall | Newsletter'
-//   // eslint-disable-next-line no-console
-//   console.log('pageContext', pageContext)
-//   const title = 'DreamMall | Newsletter'
-//   return title
-// }

From db89d5ee2ff95d5045bbf1ed265d6bd4ef57592f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 19 Mar 2024 11:24:29 +0100
Subject: [PATCH 09/40] Add locale to pageContext.

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

diff --git a/presenter/renderer/+onBeforeRoute.ts b/presenter/renderer/+onBeforeRoute.ts
index 5c31270b84..793b05d46d 100644
--- a/presenter/renderer/+onBeforeRoute.ts
+++ b/presenter/renderer/+onBeforeRoute.ts
@@ -15,7 +15,7 @@ export function onBeforeRoute(pageContext: PageContext) {
   return {
     pageContext: {
       // Make `locale` available as `pageContext.locale`
-      locale,
+      locale: locale,
       // Vike's router will use pageContext.urlLogical instead of pageContext.urlOriginal
       urlLogical: urlWithoutLocale,
     },

From d40547eda9cca89f221f8a613527b612ade73f60 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 19 Mar 2024 11:25:26 +0100
Subject: [PATCH 10/40] Change html lang to store value.

---
 presenter/renderer/+onRenderHtml.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/presenter/renderer/+onRenderHtml.ts b/presenter/renderer/+onRenderHtml.ts
index 531125a3c2..fdf223df3d 100644
--- a/presenter/renderer/+onRenderHtml.ts
+++ b/presenter/renderer/+onRenderHtml.ts
@@ -11,6 +11,7 @@ import { createApp } from './app'
 import { getDescription, getTitle } from './utils'
 
 import type { App } from 'vue'
+import { useLocaleStore } from '#stores/localeStore'
 
 // this fixes a warning which occurs when building
 // > "resolveComponent" is imported from external module "vue" but never used in ...
@@ -18,9 +19,10 @@ import type { App } from 'vue'
 resolveComponent('nothing')
 
 async function render(pageContext: PageContextServer & PageContext) {
-  const { app, i18n } = createApp(pageContext, false)
+  const { app /*, i18n */ } = createApp(pageContext, false)
 
-  const locale = i18n.global.locale.value
+  const localeStore = useLocaleStore()
+  const locale = localeStore.locale // i18n.global.locale.value
 
   const appHtml = await renderToString(app)
 

From 94c691548a479dad4ca6a98187744a7bf9ee28df Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 19 Mar 2024 11:27:38 +0100
Subject: [PATCH 11/40] Use localeStore as value of languageselector.

---
 presenter/src/components/language/LanguageSelector.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/presenter/src/components/language/LanguageSelector.vue b/presenter/src/components/language/LanguageSelector.vue
index 07fdbfb0cb..8201324ea9 100644
--- a/presenter/src/components/language/LanguageSelector.vue
+++ b/presenter/src/components/language/LanguageSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <v-select
-    v-model="$i18n.locale"
+    v-model="localeStore.locale"
     density="compact"
     name="language"
     :items="languages"
@@ -29,11 +29,14 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 
+import { useLocaleStore } from '#stores/localeStore';
+
 // TODO better place? maybe locales folder?
 const languages = ref([
   { locale: 'de', title: 'Deutsch' },
   { locale: 'en', title: 'English' },
 ])
+const localeStore = useLocaleStore()
 </script>
 
 <style lang="scss">

From d3172beb1f6bf199c4a426a954bd92083993f594 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 22 Mar 2024 11:45:13 +0100
Subject: [PATCH 12/40] Transfere locale to frontend.

---
 presenter/renderer/+config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presenter/renderer/+config.ts b/presenter/renderer/+config.ts
index ceabba4d10..8211b38b43 100644
--- a/presenter/renderer/+config.ts
+++ b/presenter/renderer/+config.ts
@@ -2,7 +2,7 @@
 export default {
   clientRouting: true,
   prefetchStaticAssets: 'viewport',
-  passToClient: ['pageProps', /* 'urlPathname', */ 'routeParams'],
+  passToClient: ['pageProps', /* 'urlPathname', */ 'routeParams', 'locale'],
   meta: {
     title: {
       // Make the value of `title` available on both the server- and client-side

From d34b5e81992611078c27c4018bf8f79cb8c70148 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 22 Mar 2024 11:47:08 +0100
Subject: [PATCH 13/40] Change pageContext.url to pageContext.urlLogical.

---
 presenter/renderer/+onBeforeRoute.ts | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/presenter/renderer/+onBeforeRoute.ts b/presenter/renderer/+onBeforeRoute.ts
index 793b05d46d..cf119802f2 100644
--- a/presenter/renderer/+onBeforeRoute.ts
+++ b/presenter/renderer/+onBeforeRoute.ts
@@ -1,21 +1,18 @@
 import { PageContext } from 'vike/types'
 
 import { extractLocale } from '#root/locales/extractLocale'
-import { useLocaleStore } from '#stores/localeStore'
 
 export function onBeforeRoute(pageContext: PageContext) {
-  if (pageContext.urlPathname.endsWith('.js')) return { pageContext: {} }
+  if (pageContext.urlPathname.endsWith('.js')) {
+    return { pageContext: { urlLogical: pageContext.urlPathname } }
+  }
+
   const { urlWithoutLocale, locale } = extractLocale(pageContext.urlPathname)
-  // eslint-disable-next-line no-console
-  console.log('urlWithoutLocale', urlWithoutLocale)
-  // eslint-disable-next-line no-console
-  console.log('locale', locale)
-  const localeStore = useLocaleStore()
-  localeStore.save(locale)
+
   return {
     pageContext: {
       // Make `locale` available as `pageContext.locale`
-      locale: locale,
+      locale,
       // Vike's router will use pageContext.urlLogical instead of pageContext.urlOriginal
       urlLogical: urlWithoutLocale,
     },

From 861eb450f766c06517d4ad929f521d2afcd5b74e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 22 Mar 2024 11:48:38 +0100
Subject: [PATCH 14/40] Remove LocaleStore.

---
 presenter/renderer/+onRenderHtml.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/presenter/renderer/+onRenderHtml.ts b/presenter/renderer/+onRenderHtml.ts
index fdf223df3d..531125a3c2 100644
--- a/presenter/renderer/+onRenderHtml.ts
+++ b/presenter/renderer/+onRenderHtml.ts
@@ -11,7 +11,6 @@ import { createApp } from './app'
 import { getDescription, getTitle } from './utils'
 
 import type { App } from 'vue'
-import { useLocaleStore } from '#stores/localeStore'
 
 // this fixes a warning which occurs when building
 // > "resolveComponent" is imported from external module "vue" but never used in ...
@@ -19,10 +18,9 @@ import { useLocaleStore } from '#stores/localeStore'
 resolveComponent('nothing')
 
 async function render(pageContext: PageContextServer & PageContext) {
-  const { app /*, i18n */ } = createApp(pageContext, false)
+  const { app, i18n } = createApp(pageContext, false)
 
-  const localeStore = useLocaleStore()
-  const locale = localeStore.locale // i18n.global.locale.value
+  const locale = i18n.global.locale.value
 
   const appHtml = await renderToString(app)
 

From 5de21573c457bd063ab0f8adca675afce77f9342 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 22 Mar 2024 11:50:49 +0100
Subject: [PATCH 15/40] Set locale to pageContext and add default i18n value.

---
 presenter/renderer/app.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/presenter/renderer/app.ts b/presenter/renderer/app.ts
index 49285585be..f83cfdf4a8 100644
--- a/presenter/renderer/app.ts
+++ b/presenter/renderer/app.ts
@@ -24,6 +24,7 @@ function createApp(pageContext: PageContext, isClient = true) {
     data: () => ({
       Page: markRaw(pageContext.Page),
       pageProps: markRaw(pageContext.pageProps || {}),
+      locale: markRaw(pageContext.locale || {}),
       isClient,
     }),
     created() {
@@ -57,6 +58,7 @@ function createApp(pageContext: PageContext, isClient = true) {
       Object.assign(pageContextReactive, pageContext)
       rootComponent.Page = markRaw(pageContext.Page)
       rootComponent.pageProps = markRaw(pageContext.pageProps || {})
+      rootComponent.locale = markRaw(pageContext.locale || {})
     },
   })
 
@@ -64,6 +66,10 @@ function createApp(pageContext: PageContext, isClient = true) {
 
   setPageContext(app, pageContextReactive)
 
+  if (pageContext.locale === 'de' || pageContext.locale === 'en') {
+    i18n.global.locale.value = pageContext.locale
+  }
+
   return { app, i18n }
 }
 

From 2251b907f678e318128cb5cfaa578fbb5c5bb1a4 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 22 Mar 2024 11:53:29 +0100
Subject: [PATCH 16/40] Set default locale to the locale given in pageContext.

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

diff --git a/presenter/src/components/language/LanguageSelector.vue b/presenter/src/components/language/LanguageSelector.vue
index 8201324ea9..5b324f66f4 100644
--- a/presenter/src/components/language/LanguageSelector.vue
+++ b/presenter/src/components/language/LanguageSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <v-select
-    v-model="localeStore.locale"
+    v-model="selectedLocale"
     density="compact"
     name="language"
     :items="languages"
@@ -12,6 +12,7 @@
     bg-color="transparent"
     hide-details="auto"
     flat
+    @update:model-value="updateLocale"
   >
     <template #selection="{ item }">
       <span>{{ item.raw.locale.toUpperCase() }}</span>
@@ -29,14 +30,28 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 
-import { useLocaleStore } from '#stores/localeStore';
+import { usePageContext } from '#context/usePageContext';
+import i18n from '#plugins/i18n'
 
 // TODO better place? maybe locales folder?
 const languages = ref([
   { locale: 'de', title: 'Deutsch' },
   { locale: 'en', title: 'English' },
 ])
-const localeStore = useLocaleStore()
+
+const pageContext = usePageContext()
+
+if (pageContext.locale === 'de' || pageContext.locale === 'en') {
+  i18n.global.locale.value = pageContext.locale
+}
+
+const selectedLocale = ref(i18n.global.locale.value)
+
+function updateLocale() {
+  if (selectedLocale.value === 'de' || selectedLocale.value === 'en') {
+    i18n.global.locale.value = selectedLocale.value
+  }
+}
 </script>
 
 <style lang="scss">

From 15ac759e2813ec6ec3211ff46d7b4c491fdea891 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 22 Mar 2024 11:53:51 +0100
Subject: [PATCH 17/40] Remove LocaleStorage.

---
 presenter/src/stores/localeStore.ts | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 presenter/src/stores/localeStore.ts

diff --git a/presenter/src/stores/localeStore.ts b/presenter/src/stores/localeStore.ts
deleted file mode 100644
index fa9fa63165..0000000000
--- a/presenter/src/stores/localeStore.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { defineStore } from 'pinia'
-
-import i18n from '#plugins/i18n'
-
-export const useLocaleStore = defineStore('locale', {
-  state: () => ({ locale: 'de' }),
-  actions: {
-    save(l: 'de' | 'en') {
-      this.locale = l
-      i18n.global.locale.value = l
-    },
-    clear() {
-      this.locale = 'de'
-      i18n.global.locale.value = 'de'
-    },
-  },
-  persist: true,
-})

From dc7cdc30c91df13141414f6fa2da9566c729ebf3 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 22 Mar 2024 11:54:38 +0100
Subject: [PATCH 18/40] Add locale to the pageContext

---
 presenter/types/PageContext.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/presenter/types/PageContext.d.ts b/presenter/types/PageContext.d.ts
index 0b93d963af..db1379050c 100644
--- a/presenter/types/PageContext.d.ts
+++ b/presenter/types/PageContext.d.ts
@@ -11,6 +11,7 @@ declare global {
       }
       Page: Page
       pageProps?: PageProps
+      locale?: string
     }
   }
 }

From 9a099de0858ba1fd589503751cc80794fee3c471 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 22 Mar 2024 11:55:38 +0100
Subject: [PATCH 19/40] Add non default locale to the
 prerenderContext.pageContexts.

---
 presenter/renderer/+onPrerenderStart.ts | 35 +++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 presenter/renderer/+onPrerenderStart.ts

diff --git a/presenter/renderer/+onPrerenderStart.ts b/presenter/renderer/+onPrerenderStart.ts
new file mode 100644
index 0000000000..f5c6d5b2db
--- /dev/null
+++ b/presenter/renderer/+onPrerenderStart.ts
@@ -0,0 +1,35 @@
+import { PageContextServer } from 'vike/types'
+
+export { onPrerenderStart }
+
+const locales = ['en', 'de']
+const localeDefault = 'de'
+
+function onPrerenderStart(prerenderContext: { pageContexts: PageContextServer[] }): {
+  prerenderContext: {
+    pageContexts: PageContextServer[]
+  }
+} {
+  const storePageContexts: PageContextServer[] = []
+  prerenderContext.pageContexts.forEach((pageContext) => {
+    // Duplicate pageContext for each locale
+    locales.forEach((locale) => {
+      // Localize URL
+      let { urlOriginal } = pageContext
+      if (locale !== localeDefault) {
+        urlOriginal = `/${locale}${urlOriginal}`
+      }
+      storePageContexts.push({
+        ...pageContext,
+        urlOriginal,
+        // Set pageContext.locale
+        locale,
+      })
+    })
+  })
+  return {
+    prerenderContext: {
+      pageContexts: storePageContexts,
+    },
+  }
+}

From a87ea62b4369f4c55e9ac524f9b9ed5078ce694a Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 22 Mar 2024 12:02:35 +0100
Subject: [PATCH 20/40] Correct linting.

---
 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 5b324f66f4..ab9fa395e5 100644
--- a/presenter/src/components/language/LanguageSelector.vue
+++ b/presenter/src/components/language/LanguageSelector.vue
@@ -30,7 +30,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 
-import { usePageContext } from '#context/usePageContext';
+import { usePageContext } from '#context/usePageContext'
 import i18n from '#plugins/i18n'
 
 // TODO better place? maybe locales folder?

From d43176ef0ace56698aeedad1c7033ab754f51717 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 23 Mar 2024 09:12:44 +0100
Subject: [PATCH 21/40] Define LocaleCode and give the type to array of
 locales.

---
 presenter/locales/locales.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/presenter/locales/locales.ts b/presenter/locales/locales.ts
index 056d414e46..f6ae3a1297 100644
--- a/presenter/locales/locales.ts
+++ b/presenter/locales/locales.ts
@@ -1,2 +1,3 @@
-export const locales = ['de', 'en']
+export type LocaleCode = 'de' | 'en'
+export const locales: LocaleCode[] = ['de', 'en']
 export const localeDefault = 'de'

From 88cadea081ffcb91b0c01896f19c1827949ddd68 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 23 Mar 2024 09:13:32 +0100
Subject: [PATCH 22/40] Make extractLocale more dynamic to locales changes.

---
 presenter/locales/extractLocale.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

From 70d50b033e47431c6e996f44aa9e314361650a04 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 23 Mar 2024 09:14:24 +0100
Subject: [PATCH 23/40] Use the defined locales and localeDefault.

---
 presenter/renderer/+onPrerenderStart.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/presenter/renderer/+onPrerenderStart.ts b/presenter/renderer/+onPrerenderStart.ts
index f5c6d5b2db..bdb0e4e277 100644
--- a/presenter/renderer/+onPrerenderStart.ts
+++ b/presenter/renderer/+onPrerenderStart.ts
@@ -1,9 +1,8 @@
 import { PageContextServer } from 'vike/types'
 
-export { onPrerenderStart }
+import { locales, localeDefault } from '#root/locales'
 
-const locales = ['en', 'de']
-const localeDefault = 'de'
+export { onPrerenderStart }
 
 function onPrerenderStart(prerenderContext: { pageContexts: PageContextServer[] }): {
   prerenderContext: {

From 5fc33b32aba39b1b1cd9f5b4864308c0f7544f34 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 23 Mar 2024 09:15:00 +0100
Subject: [PATCH 24/40] Make locales check more dynamic.

---
 presenter/renderer/app.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/presenter/renderer/app.ts b/presenter/renderer/app.ts
index 45f4358618..1d7f644019 100644
--- a/presenter/renderer/app.ts
+++ b/presenter/renderer/app.ts
@@ -9,6 +9,7 @@ import { createApolloClient } from '#plugins/apollo'
 import i18n from '#plugins/i18n'
 import pinia from '#plugins/pinia'
 import CreateVuetify from '#plugins/vuetify'
+import { locales } from '#root/locales'
 import AuthService from '#src/services/AuthService'
 import { useAuthStore } from '#stores/authStore'
 
@@ -73,7 +74,7 @@ function createApp(pageContext: PageContext, isClient = true) {
 
   setPageContext(app, pageContextReactive)
 
-  if (pageContext.locale === 'de' || pageContext.locale === 'en') {
+  if (pageContext.locale !== undefined && locales.includes(pageContext.locale)) {
     i18n.global.locale.value = pageContext.locale
   }
 

From 04f8c1c405fb56b236887305b276737eb864ee29 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 23 Mar 2024 09:15:47 +0100
Subject: [PATCH 25/40] Make PageContext.locale use the defined LocaleCode
 type.

---
 presenter/types/PageContext.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/presenter/types/PageContext.d.ts b/presenter/types/PageContext.d.ts
index db1379050c..2d8d0c7d2f 100644
--- a/presenter/types/PageContext.d.ts
+++ b/presenter/types/PageContext.d.ts
@@ -1,3 +1,4 @@
+import { LocaleCode } from '#root/locales/locales'
 import { Page } from '#types/Page'
 import { PageProps } from '#types/PageProps'
 
@@ -11,7 +12,7 @@ declare global {
       }
       Page: Page
       pageProps?: PageProps
-      locale?: string
+      locale?: LocaleCode
     }
   }
 }

From 022c869479e42a6c8f932a7a367cb0394a642454 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 23 Mar 2024 09:16:22 +0100
Subject: [PATCH 26/40] Make locales check more dynamic.

---
 presenter/src/components/language/LanguageSelector.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/presenter/src/components/language/LanguageSelector.vue b/presenter/src/components/language/LanguageSelector.vue
index ab9fa395e5..457c2f2575 100644
--- a/presenter/src/components/language/LanguageSelector.vue
+++ b/presenter/src/components/language/LanguageSelector.vue
@@ -32,6 +32,7 @@ import { ref } from 'vue'
 
 import { usePageContext } from '#context/usePageContext'
 import i18n from '#plugins/i18n'
+import { locales } from '#root/locales'
 
 // TODO better place? maybe locales folder?
 const languages = ref([
@@ -41,14 +42,14 @@ const languages = ref([
 
 const pageContext = usePageContext()
 
-if (pageContext.locale === 'de' || pageContext.locale === 'en') {
+if (pageContext.locale !== undefined && locales.includes(pageContext.locale)) {
   i18n.global.locale.value = pageContext.locale
 }
 
 const selectedLocale = ref(i18n.global.locale.value)
 
 function updateLocale() {
-  if (selectedLocale.value === 'de' || selectedLocale.value === 'en') {
+  if (locales.includes(selectedLocale.value)) {
     i18n.global.locale.value = selectedLocale.value
   }
 }

From d3bc59ad7829d887a115c7137b7b7babcc02d500 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 23 Mar 2024 09:26:40 +0100
Subject: [PATCH 27/40] Move localizedLocale to locales folder.

---
 presenter/locales/index.ts                             | 2 +-
 presenter/locales/locales.ts                           | 4 ++++
 presenter/src/components/language/LanguageSelector.vue | 8 ++------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/presenter/locales/index.ts b/presenter/locales/index.ts
index 1a7100b67e..115acdc477 100644
--- a/presenter/locales/index.ts
+++ b/presenter/locales/index.ts
@@ -1,2 +1,2 @@
 export { extractLocale } from './extractLocale'
-export { locales, localeDefault } from './locales'
+export { locales, localeDefault, localizedLocale } from './locales'
diff --git a/presenter/locales/locales.ts b/presenter/locales/locales.ts
index f6ae3a1297..e38bf25e0e 100644
--- a/presenter/locales/locales.ts
+++ b/presenter/locales/locales.ts
@@ -1,3 +1,7 @@
 export type LocaleCode = 'de' | 'en'
 export const locales: LocaleCode[] = ['de', 'en']
 export const localeDefault = 'de'
+export const localizedLocale = [
+  { locale: 'de', title: 'Deutsch' },
+  { locale: 'en', title: 'English' },
+]
diff --git a/presenter/src/components/language/LanguageSelector.vue b/presenter/src/components/language/LanguageSelector.vue
index 457c2f2575..8e8c099d0c 100644
--- a/presenter/src/components/language/LanguageSelector.vue
+++ b/presenter/src/components/language/LanguageSelector.vue
@@ -32,13 +32,9 @@ import { ref } from 'vue'
 
 import { usePageContext } from '#context/usePageContext'
 import i18n from '#plugins/i18n'
-import { locales } from '#root/locales'
+import { locales, localizedLocale } from '#root/locales'
 
-// TODO better place? maybe locales folder?
-const languages = ref([
-  { locale: 'de', title: 'Deutsch' },
-  { locale: 'en', title: 'English' },
-])
+const languages = ref(localizedLocale)
 
 const pageContext = usePageContext()
 

From 4bdcfa11c80515d4b0ee7906315d89646d78b129 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 25 Mar 2024 10:37:21 +0100
Subject: [PATCH 28/40] Add default locale to the mock pageContext.

---
 presenter/scripts/tests/mock.vikePageContext.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/presenter/scripts/tests/mock.vikePageContext.ts b/presenter/scripts/tests/mock.vikePageContext.ts
index c9592de8e0..b52d8932a8 100644
--- a/presenter/scripts/tests/mock.vikePageContext.ts
+++ b/presenter/scripts/tests/mock.vikePageContext.ts
@@ -9,5 +9,6 @@ config.global.provide = {
     routeParams: {
       code: 'my-code',
     },
+    locale: 'de',
   },
 }

From 79faef18473e9c535c88d08297264879c7d817aa Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 25 Mar 2024 10:38:24 +0100
Subject: [PATCH 29/40] Test if changing language switch the i18n value.

---
 .../components/language/LanguageSelector.test.ts   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/presenter/src/components/language/LanguageSelector.test.ts b/presenter/src/components/language/LanguageSelector.test.ts
index 5f1ca52848..1f84e67cc1 100644
--- a/presenter/src/components/language/LanguageSelector.test.ts
+++ b/presenter/src/components/language/LanguageSelector.test.ts
@@ -1,6 +1,8 @@
 import { mount } from '@vue/test-utils'
 import { describe, it, expect, beforeEach } from 'vitest'
 
+import i18n from '#plugins/i18n'
+
 import LanguageSelector from './LanguageSelector.vue'
 
 describe('LanguageSelector', () => {
@@ -10,12 +12,24 @@ describe('LanguageSelector', () => {
     })
   }
   let wrapper: ReturnType<typeof Wrapper>
+  let vSelect: ReturnType<typeof wrapper.findComponent>
 
   beforeEach(() => {
     wrapper = Wrapper()
+    vSelect = wrapper.findComponent({ name: 'v-select' })
   })
 
   it('renders', () => {
     expect(wrapper.element).toMatchSnapshot()
   })
+
+  describe('switch locale with existing locale', () => {
+    beforeEach(async () => {
+      await vSelect.setValue('en')
+    })
+
+    it('change locale', () => {
+      expect(i18n.global.locale.value).toBe('en')
+    })
+  })
 })

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 30/40] 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 8e8c099d0c..5010a5924a 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 31/40] 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 1d7f644019..c65279ac32 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 32/40] 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 dcd5e2c963..6c21d96dcb 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 33/40] 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 cf119802f2..3341bd3987 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 34/40] 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 5010a5924a..ae196e29ce 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 35/40] 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 3341bd3987..626930f25e 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 {

From d6a19806ba6ec61a18437274dd753c2e47b55cb7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Mar 2024 12:24:14 +0100
Subject: [PATCH 36/40] Change test description.

---
 presenter/src/components/language/LanguageSelector.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/presenter/src/components/language/LanguageSelector.test.ts b/presenter/src/components/language/LanguageSelector.test.ts
index 1f84e67cc1..788865856f 100644
--- a/presenter/src/components/language/LanguageSelector.test.ts
+++ b/presenter/src/components/language/LanguageSelector.test.ts
@@ -23,12 +23,12 @@ describe('LanguageSelector', () => {
     expect(wrapper.element).toMatchSnapshot()
   })
 
-  describe('switch locale with existing locale', () => {
+  describe('switch locale', () => {
     beforeEach(async () => {
       await vSelect.setValue('en')
     })
 
-    it('change locale', () => {
+    it('to en', () => {
       expect(i18n.global.locale.value).toBe('en')
     })
   })

From 67eebded175ad4e809318424adb304887593c534 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Mar 2024 12:38:26 +0100
Subject: [PATCH 37/40] Remove check on defaultLocale in prerenderStart

---
 presenter/renderer/+onPrerenderStart.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/presenter/renderer/+onPrerenderStart.ts b/presenter/renderer/+onPrerenderStart.ts
index bdb0e4e277..a7a4d596d6 100644
--- a/presenter/renderer/+onPrerenderStart.ts
+++ b/presenter/renderer/+onPrerenderStart.ts
@@ -15,9 +15,7 @@ function onPrerenderStart(prerenderContext: { pageContexts: PageContextServer[]
     locales.forEach((locale) => {
       // Localize URL
       let { urlOriginal } = pageContext
-      if (locale !== localeDefault) {
-        urlOriginal = `/${locale}${urlOriginal}`
-      }
+      urlOriginal = `/${locale}${urlOriginal}`
       storePageContexts.push({
         ...pageContext,
         urlOriginal,

From 805d515cc2cad1764ad7b9ef4caca1a2108acaa7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Mar 2024 12:56:50 +0100
Subject: [PATCH 38/40] Move /locales to /src/locales.

---
 presenter/locales/index.ts                             | 2 --
 presenter/renderer/+onBeforeRoute.ts                   | 2 +-
 presenter/renderer/+onPrerenderStart.ts                | 2 +-
 presenter/renderer/app.ts                              | 2 +-
 presenter/renderer/plugins/i18n.ts                     | 5 +++--
 presenter/src/components/language/LanguageSelector.vue | 3 ++-
 presenter/{ => src}/locales/extractLocale.ts           | 0
 presenter/{locales/locales.ts => src/locales/index.ts} | 2 ++
 presenter/types/PageContext.d.ts                       | 2 +-
 presenter/vite.config.ts                               | 2 +-
 10 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 presenter/locales/index.ts
 rename presenter/{ => src}/locales/extractLocale.ts (100%)
 rename presenter/{locales/locales.ts => src/locales/index.ts} (73%)

diff --git a/presenter/locales/index.ts b/presenter/locales/index.ts
deleted file mode 100644
index 115acdc477..0000000000
--- a/presenter/locales/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { extractLocale } from './extractLocale'
-export { locales, localeDefault, localizedLocale } from './locales'
diff --git a/presenter/renderer/+onBeforeRoute.ts b/presenter/renderer/+onBeforeRoute.ts
index 626930f25e..502f152c25 100644
--- a/presenter/renderer/+onBeforeRoute.ts
+++ b/presenter/renderer/+onBeforeRoute.ts
@@ -1,6 +1,6 @@
 import { PageContext } from 'vike/types'
 
-import { extractLocale } from '#root/locales/extractLocale'
+import { extractLocale } from '#src/locales/extractLocale'
 
 export function onBeforeRoute(pageContext: PageContext) {
   const { urlWithoutLocale, locale } = extractLocale(pageContext.urlPathname)
diff --git a/presenter/renderer/+onPrerenderStart.ts b/presenter/renderer/+onPrerenderStart.ts
index a7a4d596d6..869bb2a2e6 100644
--- a/presenter/renderer/+onPrerenderStart.ts
+++ b/presenter/renderer/+onPrerenderStart.ts
@@ -1,6 +1,6 @@
 import { PageContextServer } from 'vike/types'
 
-import { locales, localeDefault } from '#root/locales'
+import { locales } from '#src/locales'
 
 export { onPrerenderStart }
 
diff --git a/presenter/renderer/app.ts b/presenter/renderer/app.ts
index c65279ac32..e312f4bdd8 100644
--- a/presenter/renderer/app.ts
+++ b/presenter/renderer/app.ts
@@ -9,7 +9,7 @@ import { createApolloClient } from '#plugins/apollo'
 import i18n from '#plugins/i18n'
 import pinia from '#plugins/pinia'
 import CreateVuetify from '#plugins/vuetify'
-import { locales } from '#root/locales'
+import { locales } from '#src/locales'
 import AuthService from '#src/services/AuthService'
 import { useAuthStore } from '#stores/authStore'
 
diff --git a/presenter/renderer/plugins/i18n.ts b/presenter/renderer/plugins/i18n.ts
index e929463d13..2a70d255eb 100644
--- a/presenter/renderer/plugins/i18n.ts
+++ b/presenter/renderer/plugins/i18n.ts
@@ -1,14 +1,15 @@
 import { createI18n } from 'vue-i18n'
 import { de as vuetifyDe, en as vuetifyEn } from 'vuetify/locale'
 
+import { localeDefault, fallbackLocale } from '#src/locales'
 import de from '#src/locales/de.json'
 import en from '#src/locales/en.json'
 
 export default createI18n({
   legacy: false, // Vuetify does not support the legacy mode of vue-i18n
   globalInjection: true,
-  locale: 'de',
-  fallbackLocale: 'en',
+  locale: localeDefault,
+  fallbackLocale,
   messages: {
     de: {
       $vuetify: vuetifyDe,
diff --git a/presenter/src/components/language/LanguageSelector.vue b/presenter/src/components/language/LanguageSelector.vue
index ae196e29ce..736114a713 100644
--- a/presenter/src/components/language/LanguageSelector.vue
+++ b/presenter/src/components/language/LanguageSelector.vue
@@ -29,7 +29,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 
-import { localizedLocale } from '#root/locales'
+import { localizedLocale } from '#src/locales'
 
 const languages = ref(localizedLocale)
 </script>
@@ -93,3 +93,4 @@ const languages = ref(localizedLocale)
   }
 }
 </style>
+#src/locales
\ No newline at end of file
diff --git a/presenter/locales/extractLocale.ts b/presenter/src/locales/extractLocale.ts
similarity index 100%
rename from presenter/locales/extractLocale.ts
rename to presenter/src/locales/extractLocale.ts
diff --git a/presenter/locales/locales.ts b/presenter/src/locales/index.ts
similarity index 73%
rename from presenter/locales/locales.ts
rename to presenter/src/locales/index.ts
index e38bf25e0e..62266d0033 100644
--- a/presenter/locales/locales.ts
+++ b/presenter/src/locales/index.ts
@@ -1,6 +1,8 @@
+export { extractLocale } from './extractLocale'
 export type LocaleCode = 'de' | 'en'
 export const locales: LocaleCode[] = ['de', 'en']
 export const localeDefault = 'de'
+export const fallbackLocale = 'en'
 export const localizedLocale = [
   { locale: 'de', title: 'Deutsch' },
   { locale: 'en', title: 'English' },
diff --git a/presenter/types/PageContext.d.ts b/presenter/types/PageContext.d.ts
index 2d8d0c7d2f..1f1000ed75 100644
--- a/presenter/types/PageContext.d.ts
+++ b/presenter/types/PageContext.d.ts
@@ -1,4 +1,4 @@
-import { LocaleCode } from '#root/locales/locales'
+import { LocaleCode } from '#src/locales'
 import { Page } from '#types/Page'
 import { PageProps } from '#types/PageProps'
 
diff --git a/presenter/vite.config.ts b/presenter/vite.config.ts
index 884124879b..748f2712c3 100644
--- a/presenter/vite.config.ts
+++ b/presenter/vite.config.ts
@@ -17,7 +17,7 @@ const config: UserConfig = {
     !isStorybook() && vike({ prerender: true }), // SSR only when storybook is not running
     vueI18n({
       ssr: true,
-      include: path.resolve(__dirname, './src/locales/**'),
+      include: path.resolve(__dirname, './src/locales/**.json'),
       jitCompilation: false,
     }),
     checker({

From 91f5b0b7b9300e0f8721a98c9f518cd6e8167a3f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Mar 2024 13:04:34 +0100
Subject: [PATCH 39/40] Move src/locales/*.ts to src/locales/index.ts and
 change import.

---
 presenter/renderer/+onBeforeRoute.ts   |  2 +-
 presenter/src/locales/extractLocale.ts | 18 ------------------
 presenter/src/locales/index.ts         | 18 +++++++++++++++++-
 3 files changed, 18 insertions(+), 20 deletions(-)
 delete mode 100644 presenter/src/locales/extractLocale.ts

diff --git a/presenter/renderer/+onBeforeRoute.ts b/presenter/renderer/+onBeforeRoute.ts
index 502f152c25..ee2308d4fe 100644
--- a/presenter/renderer/+onBeforeRoute.ts
+++ b/presenter/renderer/+onBeforeRoute.ts
@@ -1,6 +1,6 @@
 import { PageContext } from 'vike/types'
 
-import { extractLocale } from '#src/locales/extractLocale'
+import { extractLocale } from '#src/locales'
 
 export function onBeforeRoute(pageContext: PageContext) {
   const { urlWithoutLocale, locale } = extractLocale(pageContext.urlPathname)
diff --git a/presenter/src/locales/extractLocale.ts b/presenter/src/locales/extractLocale.ts
deleted file mode 100644
index 6c21d96dcb..0000000000
--- a/presenter/src/locales/extractLocale.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { locales, localeDefault, LocaleCode } from './locales'
-
-export function extractLocale(url: string) {
-  const urlPaths = url.split('/')
-  let locale: LocaleCode
-  let urlWithoutLocale
-  // We remove the URL locale, for example `/de/about` => `/about`
-  const firstPath = urlPaths[1] as LocaleCode
-  if (locales.includes(firstPath)) {
-    locale = firstPath
-    urlWithoutLocale = '/' + urlPaths.slice(2).join('/')
-  } else {
-    locale = localeDefault
-    urlWithoutLocale = url
-  }
-
-  return { locale, urlWithoutLocale }
-}
diff --git a/presenter/src/locales/index.ts b/presenter/src/locales/index.ts
index 62266d0033..dd3bdb3434 100644
--- a/presenter/src/locales/index.ts
+++ b/presenter/src/locales/index.ts
@@ -1,4 +1,3 @@
-export { extractLocale } from './extractLocale'
 export type LocaleCode = 'de' | 'en'
 export const locales: LocaleCode[] = ['de', 'en']
 export const localeDefault = 'de'
@@ -7,3 +6,20 @@ export const localizedLocale = [
   { locale: 'de', title: 'Deutsch' },
   { locale: 'en', title: 'English' },
 ]
+
+export function extractLocale(url: string) {
+  const urlPaths = url.split('/')
+  let locale: LocaleCode
+  let urlWithoutLocale
+  // We remove the URL locale, for example `/de/about` => `/about`
+  const firstPath = urlPaths[1] as LocaleCode
+  if (locales.includes(firstPath)) {
+    locale = firstPath
+    urlWithoutLocale = '/' + urlPaths.slice(2).join('/')
+  } else {
+    locale = localeDefault
+    urlWithoutLocale = url
+  }
+
+  return { locale, urlWithoutLocale }
+}

From a80a6edbcac891e7a02d3a6747e0a7f7a1950304 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Mar 2024 13:08:59 +0100
Subject: [PATCH 40/40] Remove text in LanguageSelector.

---
 presenter/src/components/language/LanguageSelector.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/presenter/src/components/language/LanguageSelector.vue b/presenter/src/components/language/LanguageSelector.vue
index 736114a713..557aa671de 100644
--- a/presenter/src/components/language/LanguageSelector.vue
+++ b/presenter/src/components/language/LanguageSelector.vue
@@ -93,4 +93,3 @@ const languages = ref(localizedLocale)
   }
 }
 </style>
-#src/locales
\ No newline at end of file