From d516d87cf5789a72594093875eef1e1962407acb Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 26 Mar 2024 19:03:39 +0100
Subject: [PATCH] simplify things

---
 .../src/components/language/LanguageSelector.vue  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/presenter/src/components/language/LanguageSelector.vue b/presenter/src/components/language/LanguageSelector.vue
index 71a964971d..28a83d8ca6 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="selectedLocale"
     density="compact"
     name="language"
     :items="languages"
@@ -37,12 +37,15 @@ import { localizedLocale } from '#src/locales'
 const pageContext = usePageContext()
 const languages = ref(localizedLocale)
 
+const selectedLocale = ref(i18n.global.locale.value)
+
 const updateLanguage = () => {
-  const { locale } = pageContext
-  window.location.href = window.location.href.replace(
-    `/${locale}/`,
-    `/${i18n.global.locale.value}/`,
-  )
+  const { locale, urlOriginal } = pageContext
+
+  window.location.href = urlOriginal
+    // eslint-disable-next-line security/detect-non-literal-regexp
+    .replace(new RegExp(`/(${locale})?(.*)`, 'g'), `/${selectedLocale.value}/$2`)
+    .replace(/(\/(#|\?))?/g, '$2')
 }
 </script>