From 740e7a0fa076ee72e7ddb8040ee0786e44192b3c Mon Sep 17 00:00:00 2001 From: haitaoo Date: Wed, 7 Jun 2023 18:31:30 +0800 Subject: [PATCH] refactor: Standardisation of translation documents related to the user centre --- i18n/en_US.yaml | 9 +++++---- i18n/zh_CN.yaml | 5 +---- ui/.gitignore | 4 ++++ ui/src/pages/UserCenter/Auth/components/WeCom/index.tsx | 2 +- ui/src/pages/UserCenter/AuthFailed/components/WeCom.tsx | 2 +- .../Users/Settings/Account/components/MyLogins/index.tsx | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml index 09aa2e3b..dde026a6 100644 --- a/i18n/en_US.yaml +++ b/i18n/en_US.yaml @@ -882,6 +882,9 @@ ui: label: New Email msg: empty: Email cannot be empty. + oauth: + connect: Connect with {{ auth_name }} + remove: Remove {{ auth_name }} oauth_bind_email: subtitle: Add a recovery email to your account. btn_update: Update email address @@ -1317,13 +1320,11 @@ ui: plugins: Plugins installed_plugins: Installed Plugins website_welcome: Welcome to {{site_name}} - plugins: + user_center: login: Login qrcode_login_tip: Please use {{ agentName }} to scan the QR code and log in. login_failed_email_tip: Login failed, please allow this app to access your email information before try again. - oauth: - connect: Connect with {{ auth_name }} - remove: Remove {{ auth_name }} + admin: admin_header: diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml index 8bc80aee..f0fc22fd 100644 --- a/i18n/zh_CN.yaml +++ b/i18n/zh_CN.yaml @@ -1224,13 +1224,10 @@ ui: plugins: 插件 installed_plugins: 插件列表 website_welcome: 欢迎来到 {{site_name}} - plugins: + user_center: login: 登录 qrcode_login_tip: 请使用 {{ agentName }} 扫描二维码登录 login_failed_email_tip: 登录失败, 请允许该应用程序访问您的电子邮件信息,然后再试一次。 - oauth: - connect: 连接到 {{ auth_name }} - remove: 解绑 {{ auth_name }} admin: admin_header: title: 后台管理 diff --git a/ui/.gitignore b/ui/.gitignore index f5128c7c..4dd742b0 100644 --- a/ui/.gitignore +++ b/ui/.gitignore @@ -31,3 +31,7 @@ yarn.lock package-lock.json .eslintcache /.vscode/ + +/* !/src/plugins +/src/plugins/* +!/src/plugins/builtin diff --git a/ui/src/pages/UserCenter/Auth/components/WeCom/index.tsx b/ui/src/pages/UserCenter/Auth/components/WeCom/index.tsx index 70e4a018..07646953 100644 --- a/ui/src/pages/UserCenter/Auth/components/WeCom/index.tsx +++ b/ui/src/pages/UserCenter/Auth/components/WeCom/index.tsx @@ -13,7 +13,7 @@ import { getLoginConf, checkLoginResult } from './service'; let checkTimer: NodeJS.Timeout; const Index: FC = () => { - const { t } = useTranslation('translation', { keyPrefix: 'plugins' }); + const { t } = useTranslation('translation', { keyPrefix: 'user_center' }); const navigate = useNavigate(); const ucAgent = userCenterStore().agent; const agentName = ucAgent?.agent_info?.name || ''; diff --git a/ui/src/pages/UserCenter/AuthFailed/components/WeCom.tsx b/ui/src/pages/UserCenter/AuthFailed/components/WeCom.tsx index b69561b4..bea92758 100644 --- a/ui/src/pages/UserCenter/AuthFailed/components/WeCom.tsx +++ b/ui/src/pages/UserCenter/AuthFailed/components/WeCom.tsx @@ -28,7 +28,7 @@ const data = [ ]; const Index: FC = () => { - const { t } = useTranslation('translation', { keyPrefix: 'plugins' }); + const { t } = useTranslation('translation', { keyPrefix: 'user_center' }); const ucAgent = userCenterStore().agent; return ( diff --git a/ui/src/pages/Users/Settings/Account/components/MyLogins/index.tsx b/ui/src/pages/Users/Settings/Account/components/MyLogins/index.tsx index 816ee0bb..3b44354f 100644 --- a/ui/src/pages/Users/Settings/Account/components/MyLogins/index.tsx +++ b/ui/src/pages/Users/Settings/Account/components/MyLogins/index.tsx @@ -18,7 +18,7 @@ const Index = () => { }); const { t: t2 } = useTranslation('translation', { - keyPrefix: 'plugins.oauth', + keyPrefix: 'oauth', }); const deleteLogins = (e, item) => {