diff --git a/web/src/App.tsx b/web/src/App.tsx index b3d0708c..1d298358 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -37,7 +37,7 @@ function App() { const { checkJump } = useUser(); useEffect(() => { const authToken = cookieUtils.get('authToken') - if (!authToken && !window.location.hash.includes('#/login') && !window.location.hash.includes('#/conversation/') && !window.location.hash.includes('#/jump')) { + if (!authToken && !window.location.hash.includes('#/login') && !window.location.hash.includes('#/conversation/') && !window.location.hash.includes('#/jump') && !window.location.hash.includes('#/invite-register')) { window.location.href = `/#/login`; } else { checkJump() diff --git a/web/src/i18n/en.ts b/web/src/i18n/en.ts index 1cac2648..8bfe8d41 100644 --- a/web/src/i18n/en.ts +++ b/web/src/i18n/en.ts @@ -256,10 +256,12 @@ export const en = { resetPasswordSuccess: 'Password reset successful', resetPasswordFailed: 'Password reset failed', enabled: 'Enabled', + enabledOpera: 'Activate', enabledConfirm: 'Are you sure to enable this user?', enabledConfirmSuccess: 'Enabled successfully', enabledConfirmFailed: 'Enabled failed', disabled: 'Disabled', + disabledOpera: 'Deactivate', disabledConfirm: 'Are you sure to disable this user?', disabledConfirmSuccess: 'Disabled successfully', disabledConfirmFailed: 'Disabled failed', diff --git a/web/src/i18n/zh.ts b/web/src/i18n/zh.ts index 4b5fe798..421d2d58 100644 --- a/web/src/i18n/zh.ts +++ b/web/src/i18n/zh.ts @@ -924,10 +924,12 @@ export const zh = { expiryDateDue: '有效期至', status: '状态', enabled: '已启用', + enabledOpera: '启用', enabledConfirm: '确定要启用此用户吗?', enabledConfirmSuccess: '启用成功', enabledConfirmFailed: '启用失败', disabled: '已停用', + disabledOpera: '停用', disabledConfirm: '确定要停用此用户吗?', disabledConfirmSuccess: '停用成功', disabledConfirmFailed: '停用失败', diff --git a/web/src/views/UserManagement/index.tsx b/web/src/views/UserManagement/index.tsx index 6948a244..9629639a 100644 --- a/web/src/views/UserManagement/index.tsx +++ b/web/src/views/UserManagement/index.tsx @@ -1,8 +1,8 @@ /* * @Author: ZhaoYing * @Date: 2026-02-03 17:51:08 - * @Last Modified by: ZhaoYing - * @Last Modified time: 2026-02-03 17:51:08 + * @Last Modified by: ZhaoYing + * @Last Modified time: 2026-02-25 15:44:54 */ /** * User Management Page @@ -127,7 +127,7 @@ const UserManagement: React.FC = () => { type="link" onClick={() => handleChangeStatus(record as User)} > - {t(`common.${record.is_active ? 'disabled' : 'enabled'}`)} + {t(`user.${record.is_active ? 'disabledOpera' : 'enabledOpera'}`)} ),