Add per-user language preference with company default fallback

Existing accounts inherited the company language at creation time and there was no way to change UI language per user. Add a 'Default (Company Language)' entry to the language selector in UserGeneralView, persist the choice through userStore.updateUserSettings and reload the i18n bundle via window.loadLanguage. The 'default' sentinel keeps the user opted in to the company-wide setting.

Bootstrap (global.store) now syncs userForm from current_user data and resolves the active UI language as user > company > 'en'. RegisterController, InvitationRegistrationController and MemberService seed new users with language=default instead of copying the current company setting, so promoting/inviting members no longer leaks the inviter's frozen language.
This commit is contained in:
Darko Gjorgjijoski
2026-04-07 04:41:00 +02:00
parent c5c9677ffc
commit 78ed332d06
7 changed files with 63 additions and 10 deletions

View File

@@ -68,6 +68,17 @@ export const useGlobalStore = defineStore('global', () => {
userStore.currentUserSettings = response.current_user_settings
userStore.currentAbilities = response.current_user_abilities
// Sync user form with bootstrap data
if (response.current_user) {
userStore.userForm = {
name: response.current_user.name ?? '',
email: response.current_user.email ?? '',
password: '',
confirm_password: '',
language: response.current_user_settings?.language ?? '',
}
}
// company store
companyStore.companies = response.companies
@@ -89,6 +100,16 @@ export const useGlobalStore = defineStore('global', () => {
}
isAppLoaded.value = true
// Load UI language: user preference > company setting > English
// 'default' means "use company language"
const userLang = userStore.currentUserSettings.language
const uiLanguage =
(userLang && userLang !== 'default' ? userLang : '') ||
(response.current_company_settings as Record<string, string>)?.language ||
'en'
await (window as Record<string, unknown>).loadLanguage?.(uiLanguage)
return response
} catch (err: unknown) {
handleApiError(err)

View File

@@ -45,7 +45,7 @@ export const useUserStore = defineStore('user', () => {
email: response.data.email,
password: '',
confirm_password: '',
language: '',
language: currentUserSettings.value.language || '',
}
return response
} catch (err: unknown) {
@@ -63,7 +63,7 @@ export const useUserStore = defineStore('user', () => {
email: response.data.email,
password: '',
confirm_password: '',
language: '',
language: currentUserSettings.value.language || '',
}
const notificationStore = useNotificationStore()