From 7cc591b4e0e7063a9d0f0ecab4718e02cd8f8021 Mon Sep 17 00:00:00 2001
From: DarkSky <darksky2048@gmail.com>
Date: Wed, 1 Apr 2026 15:03:21 +0800
Subject: [PATCH 1/2] fix: translation switch

---
 .../frontend/core/src/desktop/dialogs/setting/index.tsx  | 9 +++++++--
 packages/frontend/i18n/src/react.ts                      | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/core/src/desktop/dialogs/setting/index.tsx b/packages/frontend/core/src/desktop/dialogs/setting/index.tsx
index 419ac312e6b0f..55e692d2cc261 100644
--- a/packages/frontend/core/src/desktop/dialogs/setting/index.tsx
+++ b/packages/frontend/core/src/desktop/dialogs/setting/index.tsx
@@ -15,7 +15,7 @@ import type {
 import { GlobalContextService } from '@affine/core/modules/global-context';
 import { createIsland, type Island } from '@affine/core/utils/island';
 import { ServerDeploymentType } from '@affine/graphql';
-import { Trans } from '@affine/i18n';
+import { Trans, useTranslation } from '@affine/i18n';
 import { ContactWithUsIcon } from '@blocksuite/icons/rc';
 import { FrameworkScope, useLiveData, useService } from '@toeverything/infra';
 import { debounce } from 'lodash-es';
@@ -72,10 +72,12 @@ const SettingModalInner = ({
     scrollAnchor: initialScrollAnchor,
   });
   const globalContextService = useService(GlobalContextService);
+  const { i18n } = useTranslation('translation');
 
   const currentServerId = useLiveData(
     globalContextService.globalContext.serverId.$
   );
+  const currentLanguageKey = i18n.resolvedLanguage ?? i18n.language;
   const serversService = useService(ServersService);
   const defaultServerService = useService(DefaultServerService);
   const currentServer =
@@ -193,7 +195,10 @@ const SettingModalInner = ({
     modalContentWrapperRef.current?.scrollTo({ top: 0 });
   }, [settingState]);
   return (
-    <FrameworkScope scope={currentServer.scope}>
+    <FrameworkScope
+      key={`settings-language-${currentLanguageKey}`}
+      scope={currentServer.scope}
+    >
       <SettingSidebar
         activeTab={settingState.activeTab}
         onTabChange={onTabChange}
diff --git a/packages/frontend/i18n/src/react.ts b/packages/frontend/i18n/src/react.ts
index 3cfe628f31aea..2408443279d51 100644
--- a/packages/frontend/i18n/src/react.ts
+++ b/packages/frontend/i18n/src/react.ts
@@ -9,4 +9,4 @@ export const useI18n = () => {
   return useMemo(() => createI18nWrapper(() => i18n), [i18n]);
 };
 
-export { I18nextProvider, Trans } from 'react-i18next';
+export { I18nextProvider, Trans, useTranslation } from 'react-i18next';

From 50972b4c62c6e5a6ae6c8516ffef0a9463b840ce Mon Sep 17 00:00:00 2001
From: DarkSky <darksky2048@gmail.com>
Date: Fri, 3 Apr 2026 00:22:09 +0800
Subject: [PATCH 2/2] fix: lint

---
 packages/frontend/core/src/desktop/dialogs/setting/index.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/frontend/core/src/desktop/dialogs/setting/index.tsx b/packages/frontend/core/src/desktop/dialogs/setting/index.tsx
index 55e692d2cc261..661835333eecd 100644
--- a/packages/frontend/core/src/desktop/dialogs/setting/index.tsx
+++ b/packages/frontend/core/src/desktop/dialogs/setting/index.tsx
@@ -195,10 +195,7 @@ const SettingModalInner = ({
     modalContentWrapperRef.current?.scrollTo({ top: 0 });
   }, [settingState]);
   return (
-    <FrameworkScope
-      key={`settings-language-${currentLanguageKey}`}
-      scope={currentServer.scope}
-    >
+    <FrameworkScope scope={currentServer.scope}>
       <SettingSidebar
         activeTab={settingState.activeTab}
         onTabChange={onTabChange}