YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #475 from YunoHost/fix-locales

Browse source 
fix: wait for locales to be loaded before mounting the app
This commit is contained in:
Alexandre Aubin 2022-10-10 16:07:08 +02:00 committed by GitHub
commit 907ae94b6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/i18n/helpers.js
View file

@ -80,7 +80,7 @@ function initDefaultLocales () {
store.dispatch('UPDATE_LOCALE', locale) store.dispatch('UPDATE_LOCALE', locale)
store.dispatch('UPDATE_FALLBACKLOCALE', fallbackLocale || 'en') store.dispatch('UPDATE_FALLBACKLOCALE', fallbackLocale || 'en')
loadLocaleMessages('en') return loadLocaleMessages('en')
} }
export { export {

10
app/src/main.js
View file

@ -55,13 +55,13 @@ requireComponent.keys().forEach((fileName) => {
registerGlobalErrorHandlers() registerGlobalErrorHandlers()
// Load default locales translations files and setup store data // Load default locales translations files and setup store data
initDefaultLocales() initDefaultLocales().then(() => {
const app = new Vue({
const app = new Vue({
store, store,
router, router,
i18n, i18n,
render: h => h(App) render: h => h(App)
}) })
app.$mount('#app') app.$mount('#app')
})