ami/tl-vikunja
1
0
Fork 0
Code Activity

Merge branch 'vue3' into feature/vue3-async-await

Browse Source 
# Conflicts:
#	src/i18n/index.js
#	src/store/modules/labels.js
#	src/store/modules/tasks.js
#	src/views/list/views/Kanban.vue
#	src/views/tasks/ShowTasks.vue
#	src/views/tasks/TaskDetailView.vue
This commit is contained in:
Dominik Pschenitschni
2021-10-17 16:06:58 +02:00
parent 0cc7166767 1c8e26bdc6
commit 2ac3d29c13
14 changed files with 223 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/i18n/index.js
View File

@ -21,7 +21,7 @@ export const availableLanguages = {
const loadedLanguages = ['en'] // our default language that is preloaded
const setI18nLanguage = lang => {
i18n.locale = lang
i18n.global.locale = lang
document.querySelector('html').setAttribute('lang', lang)
return lang
}
@ -29,7 +29,7 @@ const setI18nLanguage = lang => {
export const loadLanguageAsync = lang => {
if (
// If the same language
i18n.locale === lang ||
i18n.global.locale === lang ||
// If the language was already loaded
loadedLanguages.includes(lang)
) {
@ -39,7 +39,7 @@ export const loadLanguageAsync = lang => {
// If the language hasn't been loaded yet
return import(`./lang/${lang}.json`).then(
messages => {
i18n.setLocaleMessage(lang, messages.default)
i18n.global.setLocaleMessage(lang, messages.default)
loadedLanguages.push(lang)
return setI18nLanguage(lang)
},