diff --git a/.changeset/warm-eagles-warn.md b/.changeset/warm-eagles-warn.md new file mode 100644 index 0000000000..8a49d6f5ec --- /dev/null +++ b/.changeset/warm-eagles-warn.md @@ -0,0 +1,5 @@ +--- +"@scow/mis-web": patch +--- + +统一修改规范用户及账户状态 正常和封锁 为 Available, Blocked;操作 封锁和解封 为 Block,Unblock diff --git a/apps/mis-web/src/i18n/en.ts b/apps/mis-web/src/i18n/en.ts index 69f25bdac2..f1e4f2f8d7 100644 --- a/apps/mis-web/src/i18n/en.ts +++ b/apps/mis-web/src/i18n/en.ts @@ -225,7 +225,7 @@ export default { debtAccount: "Debt Accounts", blockedAccount: "Blocked Accounts", frozenAccount: "Frozen Accounts", - normalAccount: "Normal Accounts", + normalAccount: "Available Accounts", account: "Account", accountName: "Account Name", owner: "Owner", @@ -243,7 +243,7 @@ export default { + "platform administrator and cannot submit jobs through this account.", statusDebtTooltip: "Debt: The account balance is less than or equal to the blocking threshold, " + "and jobs cannot be submitted through this account.", - statusNormalTooltip: "Normal: The account status is not blocked or frozen, and the account " + statusNormalTooltip: "Available: The account status is not blocked or frozen, and the account " + "balance is greater than the blocking threshold; or the account is already in the whitelist.", mangerMember: "Manage Members", blocked: "Blocked", @@ -257,6 +257,7 @@ export default { unblockFail: "Account unblocking failed!", unblockError: "Account {} has insufficient balance. " + "You can add it to the whitelist or unblock by adding funds.", + block: "Block", unblock: "Unblock", blockConfirmTitle: "Confirm Account Block?", blockConfirmContent: "Do you wish to block account {} within tenant {}?", @@ -696,6 +697,7 @@ export default { }, userTable: { block: "Block", + blocked: "Blocked", normal: "Available", quotaExceeded: "Quota Exceeded", statusExplanation: "User Status Explanation", @@ -703,8 +705,8 @@ export default { + "preventing the selection of this account for job submission.", quotaExceededExplanation: "Quota Exceeded: The user is not blocked, but the used quota is greater than or " + "equal to the user's quota limit, preventing the selection of this account for job submission.", - normalExplanation: "Normal: The user is not blocked, and the used quota is less than the user's quota limit, " - + "allowing the selection of this account to submit jobs.", + normalExplanation: "Available: The user is not blocked, and the used quota is less than the user's " + + "quota limit, allowing the selection of this account to submit jobs.", admin: "Admin", user: "Regular User", role: "Role", @@ -716,7 +718,7 @@ export default { confirmUnsealText2: " ", confirmUnsealText3: "?", unsealSuccess: "User unsealed successfully!", - unseal: "Unseal", + unseal: "Unblock", confirmBlock: "Confirm blocking user?", confirmBlockText1: "Confirm blocking user from account ", confirmBlockText2: " ", diff --git a/apps/mis-web/src/i18n/zh_cn.ts b/apps/mis-web/src/i18n/zh_cn.ts index cd060dba04..ff75b0d0b8 100644 --- a/apps/mis-web/src/i18n/zh_cn.ts +++ b/apps/mis-web/src/i18n/zh_cn.ts @@ -257,6 +257,7 @@ export default { unblockFail: "解封账户失败!", unblockError: "账户{}余额不足,您可以将其加入白名单或充值解封", + block: "封锁", unblock: "解除封锁", blockConfirmTitle: "确认封锁账户?", blockConfirmContent: "确认要在租户{}中封锁账户{}", @@ -696,6 +697,7 @@ export default { }, userTable:{ block:"封锁", + blocked: "封锁", normal:"正常", quotaExceeded: "限额", statusExplanation: "用户状态说明", diff --git a/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx b/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx index e36386471e..7987266e1b 100644 --- a/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx +++ b/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx @@ -413,7 +413,7 @@ export const AccountTable: React.FC = ({ }); }} > - {t(p("blocked"))} + {t(p("block"))} )} diff --git a/apps/mis-web/src/pageComponents/users/UserTable.tsx b/apps/mis-web/src/pageComponents/users/UserTable.tsx index b4b0045867..b5e91a5fef 100644 --- a/apps/mis-web/src/pageComponents/users/UserTable.tsx +++ b/apps/mis-web/src/pageComponents/users/UserTable.tsx @@ -46,7 +46,7 @@ export const UserTable: React.FC = ({ const DisplayedUserStateTexts = { [DisplayedUserState.DISPLAYED_NORMAL]: {t(p("normal"))}, [DisplayedUserState.DISPLAYED_QUOTA_EXCEEDED]: {t(p("quotaExceeded"))}, - [DisplayedUserState.DISPLAYED_BLOCKED]: {t(p("block"))}, + [DisplayedUserState.DISPLAYED_BLOCKED]: {t(p("blocked"))}, };