Revert: Skip language change & font loading

src/App.vue

@@ -3,7 +3,10 @@
 </template>
 
 <script setup>
-const lang = this.$root.$i18n.locale
+import { useHead } from '@vueuse/head';
+import { detectLanguage } from '@/support'
+
+const lang = detectLanguage()
 
 useHead({
   htmlAttrs: {
@@ -19,7 +22,7 @@ useHead({
 
 @font-face {
   font-family: WorkSans;
-  src: url('/fonts/WorkSans-Regular.woff2') format('woff2');
+  // src: url('/fonts/WorkSans-Regular.woff2') format('woff2');
 }
 
 html, body, #app {

src/components/InfoScreen.vue

@@ -17,6 +17,9 @@
 <script>
 import Navigation from '@/components/Navigation.vue'
 import i18nStrings from '@/i18nStrings'
+import { detectLanguage } from '@/support'
+
+const lang = detectLanguage()
 
 export default {
   components: {
@@ -38,7 +41,7 @@ export default {
   },
   computed: {
     infoPage() {
-      return i18nStrings[this.$root.$i18n.locale].infoPages.filter((ip) => ip.id === this.page)[0] || {}
+      return i18nStrings[lang].infoPages.filter((ip) => ip.id === this.page)[0] || {}
     }
   }
 }

src/components/LanguageSwitcher.vue

@@ -4,15 +4,16 @@
     class="language-switcher"
     @click="switchLanguage"
     >
-    <span :aria-label="$t('switchLanguageAlt')">{{ $root.$i18n.locale }}</span>
+    <!-- <span :aria-label="$t('switchLanguageAlt')">{{ $root.$i18n.locale }}</span> -->
   </button>
 </template>
 
 <script>
+// Introduce vueuse
 export default {
   methods: {
     switchLanguage() {
-      this.$root.$i18n.locale = this.$root.$i18n.locale === 'de' ? 'en' : 'de'
+      // this.$root.$i18n.locale = this.$root.$i18n.locale === 'de' ? 'en' : 'de'
     },
   }
 }

src/components/Navigation.vue

@@ -17,6 +17,9 @@
 
 <script>
 import i18nStrings from '@/i18nStrings'
+import { detectLanguage } from '@/support'
+
+const lang = detectLanguage()
 
 export default {
   props: {
@@ -35,7 +38,7 @@ export default {
   },
   computed: {
     infoPages() {
-      return i18nStrings[this.$root.$i18n.locale].infoPages.filter((ip) => ip.linked !== false)
+      return i18nStrings[lang].infoPages.filter((ip) => ip.linked !== false)
     }
   }
 }

src/components/Party.vue

@@ -90,7 +90,7 @@
           @click="switchLanguage"
           v-if="controlsActive"
           >
-          <span :aria-label="$t('switchLanguageAlt')">{{ $root.$i18n.locale }}</span>
+          <!-- <span :aria-label="$t('switchLanguageAlt')">{{ $root.$i18n.locale }}</span> -->
         </button>
       </transition>
 
@@ -165,6 +165,10 @@ import Peer from "@/components/Peer.vue"
 
 import config from '@/config'
 
+// import { detectLanguage } from '@/support'
+
+// const lang = detectLanguage()
+
 export default {
   props: ["peers", "localPeer"],
   data() {
@@ -281,8 +285,8 @@ export default {
     },
     // Maybe vueuse has some language handling as well?
     switchLanguage() {
-      this.$root.$i18n.locale = this.$root.$i18n.locale === 'de' ? 'en' : 'de'
-      this.$refs.switchLanguage.blur()
+      // this.$root.$i18n.locale = this.$root.$i18n.locale === 'de' ? 'en' : 'de'
+      // this.$refs.switchLanguage.blur()
     },
     // TODO: Use vueuse here
     toggleMicrophone() {

src/main.js

@@ -11,6 +11,7 @@ import messages from './i18nStrings'
 import { detectLanguage } from './support'
 
 const language = detectLanguage()
+// Not sure if below is working as expected?
 const locale = language && language.startsWith('de') ? 'de' : config.defaultLocale
 
 const i18n = createI18n({

src/support.js

@@ -9,7 +9,8 @@ export function fancyNumber(n) {
 
 // Detect user's browser language
 export function detectLanguage() {
-  return navigator.languages ? navigator.languages[0] : (navigator.language || navigator.userLanguage)
+  return "de"
+  // return navigator.languages ? navigator.languages[0] : (navigator.language || navigator.userLanguage)
 }
 
 // Escapes a regex

src/views/Home.vue

@@ -102,6 +102,9 @@ import yyid from 'yyid'
 import { browserCanUseWebrtc } from '@/webrtc'
 import LanguageSwitcher from '@/components/LanguageSwitcher.vue'
 import i18nStrings from '@/i18nStrings'
+import { detectLanguage } from '@/support'
+
+const lang = detectLanguage()
 
 export default {
   components: {
@@ -117,7 +120,7 @@ export default {
       return browserCanUseWebrtc() && this.$route.query.supported !== "0"
     },
     infoPages() {
-      return i18nStrings[this.$root.$i18n.locale].infoPages.filter((ip) => ip.linked !== false)
+      return i18nStrings[lang].infoPages.filter((ip) => ip.linked !== false)
     }
   },
   mounted() {

src/views/InfoPage.vue

@@ -18,6 +18,9 @@ import LanguageSwitcher from '@/components/LanguageSwitcher.vue'
 import Logo from '@/components/Logo.vue'
 import Navigation from '@/components/Navigation.vue'
 import i18nStrings from '@/i18nStrings'
+import { detectLanguage } from '@/support'
+
+const lang = detectLanguage()
 
 export default {
   components: {
@@ -33,12 +36,7 @@ export default {
   },
   computed: {
     infoPage() {
-      return i18nStrings[this.$root.$i18n.locale].infoPages.filter((ip) => ip.id === this.page)[0] || {}
-    }
-  },
-  metaInfo() {
-    return {
-      title: this.infoPage.title,
+      return i18nStrings[lang].infoPages.filter((ip) => ip.id === this.page)[0] || {}
     }
   },
 }

src/views/Room.vue

@@ -28,7 +28,7 @@
 import { Session } from "palava-client"
 import config from "@/config"
 import logger from "@/logger"
-import { fancyNumber } from "@/support"
+// import { fancyNumber } from "@/support"
 
 import UserMediaConfigurator from "@/components/UserMediaConfigurator.vue"
 import ScreenMessage from "@/components/ScreenMessage.vue"
@@ -254,11 +254,11 @@ export default {
       this.infoPage = page
     }
   },
-  metaInfo() {
-    return {
-      title: `${fancyNumber(this.peers.length) || this.$t("room.emptyTitle")} | ${decodeURIComponent(this.$route.params.roomId)}`,
-    }
-  },
+  // metaInfo() {
+  //   return {
+  //     title: `${fancyNumber(this.peers.length) || this.$t("room.emptyTitle")} | ${decodeURIComponent(this.$route.params.roomId)}`,
+  //   }
+  // },
 }
 </script>