chore: resolve merge conflicts

This commit is contained in:
2026-07-25 13:42:04 +02:00
parent 35f9a7363d
commit 443967d314
+10 -5
View File
@@ -18,7 +18,7 @@ import { createApp } from 'vue'
import { createPinia } from 'pinia'; import { createPinia } from 'pinia';
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'; import piniaPluginPersistedstate from 'pinia-plugin-persistedstate';
import App from './App.vue' import App from './App.vue'
import { i18n, loadLanguage } from './i18n'; import { i18n, loadLanguage, fallbackLocale } from './i18n';
import getCurrentLanguage from './utils/currentLanguage'; import getCurrentLanguage from './utils/currentLanguage';
import router from './router' import router from './router'
import './styles/common.css' import './styles/common.css'
@@ -28,11 +28,16 @@ import './styles/variables/dimensions.css';
import './styles/common.css'; import './styles/common.css';
import './styles/variables/colors.css'; import './styles/variables/colors.css';
const pinia = createPinia(); (async () => {
pinia.use(piniaPluginPersistedstate); await loadLanguage(fallbackLocale);
await loadLanguage(getCurrentLanguage());
createApp(App) const pinia = createPinia();
pinia.use(piniaPluginPersistedstate);
createApp(App)
.use(router) .use(router)
.use(i18n) .use(i18n)
.use(pinia) .use(pinia)
.mount('#app') .mount('#app');
})();