Merge pull request #585 from Adamant-im/feat/env-default-locale

feat(i18n): configure default locale using ENV
Adamant-im · Jan 15, 2024 · 010a3aa · 010a3aa
2 parents edd4e6f + c89146b
commit 010a3aa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,2 @@
-VUE_APP_I18N_LOCALE=en
-VUE_APP_I18N_FALLBACK_LOCALE=en
+VITE_I18N_LOCALE=en
+VITE_I18N_FALLBACK_LOCALE=en
diff --git a/src/i18n.js b/src/i18n.js
@@ -14,9 +14,12 @@ function loadLocaleMessages() {
   }
 }
 
+export const DEFAULT_LOCALE = import.meta.env.VITE_I18N_LOCALE || 'en'
+export const FALLBACK_LOCALE = import.meta.env.VUE_APP_I18N_FALLBACK_LOCALE || 'en'
+
 export const i18n = createI18n({
-  locale: import.meta.env.VUE_APP_I18N_LOCALE || 'en',
-  fallbackLocale: import.meta.env.VUE_APP_I18N_FALLBACK_LOCALE || 'en',
+  locale: DEFAULT_LOCALE,
+  fallbackLocale: FALLBACK_LOCALE,
   messages: loadLocaleMessages(),
   fallbackRoot: true,
   pluralizationRules: {

diff --git a/src/store/modules/language/index.js b/src/store/modules/language/index.js
@@ -1,10 +1,10 @@
 import dayjs from 'dayjs'
-import { i18n } from '@/i18n'
+import { i18n, DEFAULT_LOCALE } from '@/i18n'
 
 const locales = ['de', 'en', 'ru', 'zh']
 
 const state = () => ({
-  currentLocale: 'en'
+  currentLocale: DEFAULT_LOCALE
 })
 
 const mutations = {