From 5c833da34d9daf20416b5449391495a79efbdf22 Mon Sep 17 00:00:00 2001
From: wvffle <funkwhale@wvffle.net>
Date: Fri, 25 Nov 2022 18:22:17 +0000
Subject: [PATCH] Fix locale not being preserved

---
 front/src/components/common/UserMenu.vue |  2 +-
 front/src/init/locale.ts                 | 31 +++++++-----------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/front/src/components/common/UserMenu.vue b/front/src/components/common/UserMenu.vue
index a398f4e1d..218898c87 100644
--- a/front/src/components/common/UserMenu.vue
+++ b/front/src/components/common/UserMenu.vue
@@ -70,7 +70,7 @@ const labels = computed(() => ({
           @click="theme = th.key"
         >
           <i :class="th.icon" />
-          {{ t.name }}
+          {{ th.name }}
         </a>
       </div>
     </div>
diff --git a/front/src/init/locale.ts b/front/src/init/locale.ts
index 5eabfb15c..fb0485d72 100644
--- a/front/src/init/locale.ts
+++ b/front/src/init/locale.ts
@@ -1,17 +1,17 @@
 import type { InitModule } from '~/types'
 
 import { usePreferredLanguages } from '@vueuse/core'
-import { nextTick, watch } from 'vue'
 import { createI18n } from 'vue-i18n'
+import { nextTick } from 'vue'
 
 import locales from '~/locales.json'
 import store from '~/store'
 
 import useLogger from '~/composables/useLogger'
 
-import en from '../locales/en.json'
+import en from '../locales/en_US.json'
 
-const localeFactory = import.meta.glob('../locales/*.json')
+const localeFactory = import.meta.glob('../locales/*.json') as Record<string, () => Promise<{ default: typeof en }>>
 
 const logger = useLogger()
 
@@ -24,28 +24,20 @@ export const SUPPORTED_LOCALES = locales.reduce((map: Record<string, string>, lo
 export const i18n = createI18n<false>({
   formatFallbackMessages: true,
   globalInjection: true,
-  fallbackLocale: 'en',
+  fallbackLocale: 'en_US',
   legacy: false,
-  locale: 'en',
-  messages: { en }
+  locale: 'en_US',
+  messages: { en_US: en }
 })
 
 export const setI18nLanguage = async (locale: string) => {
-  console.debug(0)
-  if (locale === 'en') {
-    return
-  }
-
-  console.debug(1)
   if (!Object.keys(SUPPORTED_LOCALES).includes(locale)) {
     throw new Error(`Unsupported locale: ${locale}`)
   }
 
-  console.debug(2)
   // load locale messages
   if (!i18n.global.availableLocales.includes(locale)) {
     try {
-      console.debug(3)
       const { default: messages } = await localeFactory[`../locales/${locale}.json`]()
       i18n.global.setLocaleMessage(locale, messages)
       await nextTick()
@@ -58,6 +50,8 @@ export const setI18nLanguage = async (locale: string) => {
   // set locale
   i18n.global.locale.value = locale
   document.querySelector('html')?.setAttribute('lang', locale)
+  await store.dispatch('ui/currentLanguage', locale)
+  store.commit('ui/momentLocale', locale.replace(/_/g, '-'))
 }
 
 export const install: InitModule = async ({ store, app }) => {
@@ -84,12 +78,5 @@ export const install: InitModule = async ({ store, app }) => {
     await setI18nLanguage(language ?? defaultLanguage)
   }
 
-  // Handle language change
-  watch(() => store.state.ui.currentLanguage, async (locale) => {
-    console.debug(locale)
-    await store.dispatch('ui/currentLanguage', locale)
-    await setI18nLanguage(locale)
-    // TODO (wvffle): Set moment locale
-    // store.commit('ui/momentLocale', 'en')
-  }, { immediate: true })
+  setI18nLanguage(store.state.ui.currentLanguage)
 }