diff --git a/src/renderer/src/i18n/I18nProvider.tsx b/src/renderer/src/i18n/I18nProvider.tsx index ab32982b86e..54efe4dc6dc 100644 --- a/src/renderer/src/i18n/I18nProvider.tsx +++ b/src/renderer/src/i18n/I18nProvider.tsx @@ -1,6 +1,11 @@ import { useEffect, useRef, type ReactNode } from 'react' import { useAppStore } from '../store' -import { i18n, setRendererPluginLanguagePacks, loadRendererUiLanguage } from './i18n' +import { + i18n, + setRendererPluginLanguagePacks, + loadRendererUiLanguage, + RendererLanguageLoadError +} from './i18n' import { usePluginLanguagePacks } from '../store/plugins/localization/plugin-language-packs' import { isPluginUiLanguage } from '../../../shared/ui-language' import { initializeLanguageDetection, useLanguageReadiness } from './language-readiness' @@ -29,6 +34,15 @@ export function I18nProvider({ children }: { children: ReactNode }): React.JSX.E } const request = ++generation.current let cancelled = false + const applyLocale = async (locale: string, error: boolean): Promise => { + if (cancelled || request !== generation.current) { + return + } + await i18n.changeLanguage(locale) + if (!cancelled && request === generation.current) { + useLanguageReadiness.setState({ ready: true, error, loading: false }) + } + } useLanguageReadiness.setState({ loading: true }) void (async () => { const detection = initializeLanguageDetection() @@ -40,19 +54,16 @@ export function I18nProvider({ children }: { children: ReactNode }): React.JSX.E } } const [, locale] = await Promise.all([detection, loadRendererUiLanguage(uiLanguage)]) - if (cancelled || request !== generation.current) { - return - } - await i18n.changeLanguage(locale) - if (!cancelled && request === generation.current) { - useLanguageReadiness.setState({ ready: true, error: false, loading: false }) - } - } catch { + await applyLocale(locale, false) + } catch (error) { await detection - if (!cancelled && request === generation.current) { - await i18n.changeLanguage('en') - if (!cancelled && request === generation.current) { - useLanguageReadiness.setState({ ready: true, error: true, loading: false }) + await applyLocale('en', true) + if (error instanceof RendererLanguageLoadError) { + try { + // A slow startup must not leave a successfully loaded saved language on English. + await applyLocale(await error.completion, false) + } catch { + // A failed request stays on English until the user retries. } } } diff --git a/src/renderer/src/i18n/i18n.ts b/src/renderer/src/i18n/i18n.ts index 1bd1af443ee..5c61d343030 100644 --- a/src/renderer/src/i18n/i18n.ts +++ b/src/renderer/src/i18n/i18n.ts @@ -142,23 +142,32 @@ export function translate(key: string, fallback: string, options?: TOptions): st return value } +export class RendererLanguageLoadError extends Error { + constructor(readonly completion: Promise) { + super('Language catalog unavailable') + } +} + export async function loadRendererUiLanguage(language: UiLanguage): Promise { const locale = orcaI18n.resolveResourceLanguage(resolveUiLocale(language)) const request = i18n.hasResourceBundle(locale, 'translation') ? undefined : loadLocaleCatalog(locale) if (request) { - const catalog = await withTimeout(request, 5000, null) - if (catalog === null) { + const completion = request.then((catalog) => { + if (!i18n.hasResourceBundle(locale, 'translation')) { + // Freshly parsed and never mutated, so skip i18next's defensive deep copy. + i18n.addResourceBundle(locale, 'translation', catalog, false, false, { skipCopy: true }) + } + return locale + }) + const loadedLocale = await withTimeout(completion, 5000, null) + if (loadedLocale === null) { // A retry after a timeout must start a fresh request instead of joining the stalled one. if (catalogRequests.get(locale) === request) { catalogRequests.delete(locale) } - throw new Error('Language catalog unavailable') - } - if (!i18n.hasResourceBundle(locale, 'translation')) { - // Freshly parsed and never mutated, so skip i18next's defensive deep copy. - i18n.addResourceBundle(locale, 'translation', catalog, false, false, { skipCopy: true }) + throw new RendererLanguageLoadError(completion) } } return locale diff --git a/src/renderer/src/i18n/language-catalog-timeout.test.tsx b/src/renderer/src/i18n/language-catalog-timeout.test.tsx index eaca0d860bb..96d2aa1c73a 100644 --- a/src/renderer/src/i18n/language-catalog-timeout.test.tsx +++ b/src/renderer/src/i18n/language-catalog-timeout.test.tsx @@ -17,7 +17,7 @@ afterEach(() => { vi.unstubAllGlobals() }) -it('releases onboarding in English when a catalog stalls, ignores its late result, and can retry', async () => { +it('recovers a late startup catalog while preserving any newer saved preference', async () => { vi.useFakeTimers() vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true) Object.defineProperty(window, 'api', { configurable: true, value: {} }) @@ -25,15 +25,7 @@ it('releases onboarding in English when a catalog stalls, ignores its late resul const catalog = new Promise((resolve) => { finishCatalog = resolve }) - vi.stubGlobal( - 'fetch', - vi - .fn() - .mockReturnValueOnce(catalog) - .mockImplementation(() => - Promise.resolve(new Response(JSON.stringify({ menu: { file: 'Fichier' } }))) - ) - ) + vi.stubGlobal('fetch', () => catalog) usePluginLanguagePackStore.setState({ entries: [], loaded: true }) useAppStore.setState({ settings: { ...getDefaultSettings('/tmp'), uiLanguage: 'fr' } }) useLanguageReadiness.setState({ ready: false, error: false }) @@ -46,7 +38,6 @@ it('releases onboarding in English when a catalog stalls, ignores its late resul ) - expect(screen.getByRole('status').textContent).toContain('Loading language') await act(async () => { await vi.advanceTimersByTimeAsync(5000) @@ -57,21 +48,39 @@ it('releases onboarding in English when a catalog stalls, ignores its late resul expect(useAppStore.getState().settings?.uiLanguage).toBe('fr') expect(i18n.language).toBe('en') await act(async () => { - finishCatalog(new Response(JSON.stringify({ menu: { file: 'Fichier' } }))) + finishCatalog(new Response('{}')) await catalog await vi.advanceTimersByTimeAsync(0) }) - expect(i18n.language).toBe('en') - expect(useLanguageReadiness.getState().error).toBe(true) - - await act(async () => { - useLanguageReadiness.getState().retryLanguageLoad() - }) - await act(async () => { - await vi.waitFor(() => expect(i18n.language).toBe('fr')) - }) - expect(i18n.language).toBe('fr') expect(useLanguageReadiness.getState().error).toBe(false) - expect(i18n.t('menu.file')).toBe('Fichier') + expect(useAppStore.getState().settings?.uiLanguage).toBe('fr') + + let finishNextCatalog: (response: Response) => void = () => {} + const nextCatalog = new Promise((resolve) => { + finishNextCatalog = resolve + }) + vi.stubGlobal('fetch', () => nextCatalog) + usePluginLanguagePackStore.setState({ entries: [], loaded: true }) + await act(async () => { + useAppStore.setState({ settings: { ...getDefaultSettings('/tmp'), uiLanguage: 'ja' } }) + }) + + await act(async () => { + await vi.advanceTimersByTimeAsync(5000) + }) + expect(i18n.language).toBe('en') + + await act(async () => { + useAppStore.setState({ settings: { ...getDefaultSettings('/tmp'), uiLanguage: 'en' } }) + }) + await act(async () => { + finishNextCatalog(new Response('{}')) + await nextCatalog + await vi.advanceTimersByTimeAsync(0) + }) + + expect(i18n.language).toBe('en') + expect(useAppStore.getState().settings?.uiLanguage).toBe('en') + expect(useLanguageReadiness.getState().error).toBe(false) })