fix: load user language profile

arextest · Aug 1, 2024 · be3bd2c · be3bd2c
1 parent c5a17f4
commit be3bd2c
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 13 deletions.
diff --git a/packages/arex/package.json b/packages/arex/package.json
@@ -1,7 +1,7 @@
 {
   "name": "arex",
   "private": true,
-  "version": "0.7.1",
+  "version": "0.7.2",
   "author": "arextest",
   "main": "dist-electron/main",
   "files": [

diff --git a/packages/arex/src/i18n/locales/cn/components.json b/packages/arex/src/i18n/locales/cn/components.json
@@ -424,11 +424,18 @@
     "replayCallbackPlaceholder": "请输入回放回调地址",
     "startDownload": "下载即将开始...",
     "systemLogs": "系统日志",
-    "theme": "主题",
+    "theme": {
+      "dark": "黑暗",
+      "light": "明亮",
+      "system": "系统",
+      "theme": "主题"
+    },
     "userInfo": "用户信息",
     "userInterface": "用户界面",
     "version": "版本",
-    "zen": "禅模式"
+    "zen": "禅模式",
+    "zoomIn": "放大",
+    "zoomOut": "缩小"
   },
   "workSpace": {
     "accepted": "已接受",

diff --git a/packages/arex/src/i18n/locales/en/components.json b/packages/arex/src/i18n/locales/en/components.json
@@ -426,11 +426,18 @@
     "replayCallbackPlaceholder": "Please enter replay callback Url",
     "startDownload": "Download about to start...",
     "systemLogs": "System Logs",
-    "theme": "Theme",
+    "theme": {
+      "dark": "Dark",
+      "light": "Light",
+      "system": "System",
+      "theme": "Theme"
+    },
     "userInfo": "User Info",
     "userInterface": "User Interface",
     "version": "Version",
-    "zen": "Zen mode"
+    "zen": "Zen mode",
+    "zoomIn": "Zoom In",
+    "zoomOut": "Zoom Out"
   },
   "workSpace": {
     "accepted": "Accepted",

diff --git a/packages/arex/src/panes/SystemSetting/UserInterface/CompactSegmented.tsx b/packages/arex/src/panes/SystemSetting/UserInterface/CompactSegmented.tsx
@@ -1,16 +1,17 @@
-import { Segmented } from '@arextest/arex-core';
+import { Segmented, useTranslation } from '@arextest/arex-core';
 import { Tooltip } from 'antd';
 import React, { FC } from 'react';
 
 import { Icon } from '@/components';
 
 const CompactSegmented: FC = (props) => {
+  const { t } = useTranslation();
   return (
     <Segmented
       options={[
         {
           label: (
-            <Tooltip title={'ZoomOut'}>
+            <Tooltip title={t('components:systemSetting.zoomOut')}>
               <Icon name='ZoomOut' />
             </Tooltip>
           ),
@@ -19,7 +20,7 @@ const CompactSegmented: FC = (props) => {
         },
         {
           label: (
-            <Tooltip title={'ZoomIn'}>
+            <Tooltip title={t('components:systemSetting.zoomIn')}>
               <Icon name='ZoomIn' />
             </Tooltip>
           ),

diff --git a/packages/arex/src/panes/SystemSetting/UserInterface/ThemeSegmented.tsx b/packages/arex/src/panes/SystemSetting/UserInterface/ThemeSegmented.tsx
@@ -1,33 +1,34 @@
-import { Segmented } from '@arextest/arex-core';
+import { Segmented, useTranslation } from '@arextest/arex-core';
 import { Tooltip } from 'antd';
 import React, { FC } from 'react';
 
 import { Icon } from '@/components';
 import { Theme } from '@/constant';
 
 const ThemeSegmented: FC = (props) => {
+  const { t } = useTranslation();
   return (
     <Segmented
       options={[
         {
           label: (
-            <Tooltip title={'Light'}>
+            <Tooltip title={t('components:systemSetting.theme.light')}>
               <Icon name='Sun' />
             </Tooltip>
           ),
           value: Theme.light,
         },
         {
           label: (
-            <Tooltip title={'Dark'}>
+            <Tooltip title={t('components:systemSetting.theme.dark')}>
               <Icon name='MoonStar' />
             </Tooltip>
           ),
           value: Theme.dark,
         },
         {
           label: (
-            <Tooltip title={'System'}>
+            <Tooltip title={t('components:systemSetting.theme.system')}>
               <Icon name='Laptop' />
             </Tooltip>
           ),

diff --git a/packages/arex/src/panes/SystemSetting/UserInterface/index.tsx b/packages/arex/src/panes/SystemSetting/UserInterface/index.tsx
@@ -119,7 +119,7 @@ const UserInterface = () => {
           <CompactSegmented />
         </Form.Item>
 
-        <Form.Item label={t('systemSetting.theme')} name='theme'>
+        <Form.Item label={t('systemSetting.theme.theme')} name='theme'>
           <ThemeSegmented />
         </Form.Item>
 

diff --git a/packages/arex/src/store/useUserProfile.ts b/packages/arex/src/store/useUserProfile.ts
@@ -52,6 +52,7 @@ const useUserProfile = create<UserProfile & UserProfileAction>((set, get) => {
         window.message.error(e);
       }
     }
+    i18n.changeLanguage(profile?.language || 'en');
     window.__locale__ = profile?.language || 'en';
     profile && set(profile);
   }