From b5610a8bd5c32a626bccdf77dd29d2d6e5277fad Mon Sep 17 00:00:00 2001
From: Alexey Zinoviev <alexey.zinoviev@xored.com>
Date: Wed, 18 Sep 2024 15:37:54 +0400
Subject: [PATCH] ubefr-8162: fix default language (#6621)
Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
---
desktop/src/ui/platform.ts | 4 +++-
dev/prod/src/platform.ts | 4 +++-
packages/theme/src/index.ts | 16 ++++++++++------
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/desktop/src/ui/platform.ts b/desktop/src/ui/platform.ts
index 14128d4d75..6a2e061efa 100644
--- a/desktop/src/ui/platform.ts
+++ b/desktop/src/ui/platform.ts
@@ -102,7 +102,7 @@ import print, { printId } from '@hcengineering/print'
import sign from '@hcengineering/sign'
import analyticsCollector, { analyticsCollectorId } from '@hcengineering/analytics-collector'
-import { setDefaultLanguage } from '@hcengineering/theme'
+import { setDefaultLanguage, initThemeStore } from '@hcengineering/theme'
import { configureNotifications } from './notifications'
import { Config, IPCMainExposed, Branding } from './types'
@@ -316,6 +316,8 @@ export async function configurePlatform (): Promise<void> {
setMetadata(workbench.metadata.DefaultSpace, myBranding.defaultSpace ?? tracker.project.DefaultProject)
setMetadata(workbench.metadata.DefaultSpecial, myBranding.defaultSpecial ?? 'issues')
+ initThemeStore()
+
addEventListener(workbench.event.NotifyConnection, async (evt) => {
await ipcMain.setFrontCookie(
config.FRONT_URL,
diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts
index 74f9e4b9cb..6f8c48b418 100644
--- a/dev/prod/src/platform.ts
+++ b/dev/prod/src/platform.ts
@@ -110,7 +110,7 @@ import { coreId } from '@hcengineering/core'
import presentation, { loadServerConfig, parsePreviewConfig, presentationId } from '@hcengineering/presentation'
import { setMetadata } from '@hcengineering/platform'
-import { setDefaultLanguage } from '@hcengineering/theme'
+import { setDefaultLanguage, initThemeStore } from '@hcengineering/theme'
import { preferenceId } from '@hcengineering/preference'
import { uiId } from '@hcengineering/ui/src/plugin'
@@ -400,4 +400,6 @@ export async function configurePlatform() {
setMetadata(workbench.metadata.DefaultApplication, myBranding.defaultApplication ?? 'tracker')
setMetadata(workbench.metadata.DefaultSpace, myBranding.defaultSpace ?? tracker.project.DefaultProject)
setMetadata(workbench.metadata.DefaultSpecial, myBranding.defaultSpecial ?? 'issues')
+
+ initThemeStore()
}
diff --git a/packages/theme/src/index.ts b/packages/theme/src/index.ts
index cae09a2483..c99db4542e 100644
--- a/packages/theme/src/index.ts
+++ b/packages/theme/src/index.ts
@@ -67,10 +67,14 @@ export class ThemeOptions {
readonly language: string
) {}
}
-export const themeStore = writable<ThemeOptions>(
- new ThemeOptions(
- getCurrentFontSize() === 'normal-font' ? 16 : 14,
- isThemeDark(getCurrentTheme()),
- getCurrentLanguage()
+export const themeStore = writable<ThemeOptions>()
+
+export function initThemeStore (): void {
+ themeStore.set(
+ new ThemeOptions(
+ getCurrentFontSize() === 'normal-font' ? 16 : 14,
+ isThemeDark(getCurrentTheme()),
+ getCurrentLanguage()
+ )
)
-)
+}