From 1831560a62cb1801e708026043fb4efe761ed0a6 Mon Sep 17 00:00:00 2001 From: Darko Gjorgjijoski Date: Tue, 16 Apr 2024 02:58:44 +0200 Subject: [PATCH] Fix language switching. It now switches instantly --- resources/scripts/admin/stores/global.js | 6 ++++-- resources/scripts/admin/stores/user.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/scripts/admin/stores/global.js b/resources/scripts/admin/stores/global.js index 4c2d1b6f..a32f0304 100644 --- a/resources/scripts/admin/stores/global.js +++ b/resources/scripts/admin/stores/global.js @@ -79,8 +79,10 @@ export const useGlobalStore = (useWindow = false) => { companyStore.selectedCompanyCurrency = response.data.current_company_currency - global.locale.value = - response.data.current_user_settings.language || 'en' + if(typeof global.locale !== 'string') { + global.locale.value = + response.data.current_user_settings.language || 'en' + } this.isAppLoaded = true resolve(response) diff --git a/resources/scripts/admin/stores/user.js b/resources/scripts/admin/stores/user.js index d05c9623..942aa6b3 100644 --- a/resources/scripts/admin/stores/user.js +++ b/resources/scripts/admin/stores/user.js @@ -106,7 +106,7 @@ export const useUserStore = (useWindow = false) => { .then((response) => { if (data.settings.language) { this.currentUserSettings.language = data.settings.language - global.locale = data.settings.language + global.locale.value = data.settings.language } if (data.settings.default_estimate_template) { this.currentUserSettings.default_estimate_template =