From 5a4bc14767d7d5e9331ba2e8fecc1d60daeb7ec6 Mon Sep 17 00:00:00 2001 From: Akmal Isomadinov Date: Wed, 24 Jul 2024 14:39:20 +0500 Subject: [PATCH] Doceditor: Fixed i18next --- packages/doceditor/src/hooks/useI18N.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/doceditor/src/hooks/useI18N.ts b/packages/doceditor/src/hooks/useI18N.ts index 42ceefdb1b..e3b7b62253 100644 --- a/packages/doceditor/src/hooks/useI18N.ts +++ b/packages/doceditor/src/hooks/useI18N.ts @@ -38,8 +38,11 @@ interface UseI18NProps { const useI18N = ({ settings, user }: UseI18NProps) => { const [i18n, setI18N] = React.useState( - getI18NInstance(user?.cultureName ?? "en", settings?.culture ?? "en") ?? - ({} as i18n), + () => + getI18NInstance( + user?.cultureName ?? settings?.culture ?? "en", + settings?.culture ?? "en", + ) ?? ({} as i18n), ); const isInit = React.useRef(false); @@ -53,7 +56,7 @@ const useI18N = ({ settings, user }: UseI18NProps) => { isInit.current = true; const instance = getI18NInstance( - user?.cultureName ?? "en", + user?.cultureName ?? settings?.culture ?? "en", settings?.culture ?? "en", );