mirror of
https://github.com/TandoorRecipes/recipes.git
synced 2026-01-01 04:10:06 -05:00
fixed using correct file for fallback locale
This commit is contained in:
@@ -7,9 +7,9 @@ import type {
|
|||||||
Composer,
|
Composer,
|
||||||
I18nMode
|
I18nMode
|
||||||
} from 'vue-i18n'
|
} from 'vue-i18n'
|
||||||
import de from "../../vue/src/locales/de.json";
|
|
||||||
import {createI18n} from "vue-i18n";
|
import {createI18n} from "vue-i18n";
|
||||||
import en from "../../vue/src/locales/en.json";
|
import en from "../../vue3/src/locales/en.json";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* lazy loading of translation, resources:
|
* lazy loading of translation, resources:
|
||||||
@@ -37,7 +37,7 @@ export function setupI18n() {
|
|||||||
fallbackLocale: 'en',
|
fallbackLocale: 'en',
|
||||||
messages: {
|
messages: {
|
||||||
en
|
en
|
||||||
}
|
},
|
||||||
}) as I18n
|
}) as I18n
|
||||||
|
|
||||||
// async load user locale into existing i18n instance
|
// async load user locale into existing i18n instance
|
||||||
@@ -58,13 +58,20 @@ export async function loadLocaleMessages(i18n: I18n, locale: Locale) {
|
|||||||
getResourceMessages
|
getResourceMessages
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// remove empty strings
|
||||||
|
|
||||||
|
Object.entries(messages).forEach(([key, value]) => {
|
||||||
|
if (value === '') {
|
||||||
|
delete messages[key]
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
// set messages for locale
|
// set messages for locale
|
||||||
i18n.global.setLocaleMessage(locale, messages)
|
i18n.global.setLocaleMessage(locale, messages)
|
||||||
|
|
||||||
// switch to given locale
|
// switch to given locale
|
||||||
setLocale(i18n, locale)
|
setLocale(i18n, locale)
|
||||||
|
|
||||||
console.log('loaded user locale')
|
|
||||||
|
|
||||||
return nextTick()
|
return nextTick()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user