diff --git a/core/core-backend/src/main/resources/i18n/core_en_US.properties b/core/core-backend/src/main/resources/i18n/core_en_US.properties index a6fee77233..91aad312c9 100644 --- a/core/core-backend/src/main/resources/i18n/core_en_US.properties +++ b/core/core-backend/src/main/resources/i18n/core_en_US.properties @@ -138,3 +138,8 @@ i18n_copilot_cross_ds_error=Cross-source datasets do not support this feature i18n_template_recommend=Recommended i18n_template_recent=Recently Used +i18n_default_org=Default Organization +i18n_org_admin=Organization Admin +i18n_ordinary_role=Ordinary User +i18n_sys_admin=System Admin + diff --git a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties index f4bbe8a443..ccbec17320 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties @@ -136,3 +136,8 @@ i18n_copilot_cross_ds_error=\u8DE8\u6E90\u6570\u636E\u96C6\u4E0D\u652F\u6301\u8B i18n_template_recommend=\u63A8\u8350 i18n_template_recent=\u6700\u8FD1\u4F7F\u7528 + +i18n_default_org=\u9ED8\u8BA4\u7EC4\u7EC7 +i18n_org_admin=\u7EC4\u7EC7\u7BA1\u7406\u5458 +i18n_ordinary_role=\u666E\u901A\u7528\u6237 +i18n_sys_admin=\u7CFB\u7EDF\u7BA1\u7406\u5458 diff --git a/core/core-backend/src/main/resources/i18n/core_zh_TW.properties b/core/core-backend/src/main/resources/i18n/core_zh_TW.properties index d3aea873c3..fb23734167 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_TW.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_TW.properties @@ -136,3 +136,8 @@ i18n_copilot_cross_ds_error=\u8DE8\u6E90\u6578\u64DA\u96C6\u4E0D\u652F\u6301\u8A i18n_template_recommend=\u63A8\u85A6 i18n_template_recent=\u6700\u8FD1\u4F7F\u7528 + +i18n_default_org=\u9ED8\u8A8D\u7D44\u7E54 +i18n_org_admin=\u7D44\u7E54\u7BA1\u7406\u54E1 +i18n_ordinary_role=\u666E\u901A\u7528\u6236 +i18n_sys_admin=\u7CFB\u7D71\u7BA1\u7406\u54E1 diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index fcb1880083..9b6be95e02 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -4373,41 +4373,80 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr 'API Key is your key to access DataEase API, which has full permissions for your account. Please keep it safe! Do not disclose API Key to external channels in any way to avoid security threats caused by others. ' }, free: { - title: 'Free Resource Management', - no_data: 'No free resources yet', + title: 'Orphaned Resource Management', + no_data: 'No Orphaned Resources', sync: 'Migrate', quick: 'One-click', batch: 'Batch', resource: 'Resource', - view_association: 'View blood relationship', + view_association: 'View Bloodline Relationship', quick_sync_tips: - 'All dashboards, data screens, data sets, and Datasources will be migrated to the [Migrate Resources] folder. ', + 'All dashboards, data screens, datasets, and data sources will be migrated to the [Migrated Resources] folder.', batch_sync_tips: - '1. Dashboards, data screens, data sets, and Datasources related to the selected resources will also be migrated to the [Migrate Resources] folder of the corresponding resources;', + "1. Dashboards, data screens, datasets, and data sources related to the selected resources will also be migrated to the corresponding resource's [Migrated Resources] folder;", batch_sync_tips1: - '2. Migrating a folder will also migrate the subfolders and resources under the folder. ', - quick_del_confirm: 'Are you sure you want to delete all free resources? ', - quick_del_tips: 'Once a resource is deleted, it cannot be undone. ', - quick_sync_confirm: 'Are you sure you want to migrate all free resources? ', + '2. The migrated folder will also migrate the subfolders and resources under that folder.', + quick_del_confirm: 'Are you sure to delete all orphaned resources?', + quick_del_tips: 'Resources cannot be revoked after deletion.', + quick_sync_confirm: 'Are you sure to migrate all orphaned resources?', quick_sync_confirm_tips: - 'After the resource is migrated, it cannot be undone. Please operate with caution. ', - batch_sync_confirm: - 'Are you sure you want to migrate {0} items and their related free resources? ', - single_sync_confirm: 'Are you sure you want to migrate this resource? ', - batch_del_confirm: 'Are you sure you want to delete {0} resources? ', + 'Resources cannot be revoked after migration, please proceed with caution.', + batch_sync_confirm: 'Are you sure to migrate {0} items and their related orphaned resources?', + single_sync_confirm: 'Are you sure to migrate this resource?', + batch_del_confirm: 'Are you sure to delete {0} resources?', batch_del_confirm_tips: - 'After the resource is deleted, it cannot be undone. Please operate with caution. ', + 'Resources cannot be revoked after deletion, please proceed with caution.', del_tips_dataset: - 'Deleting a dataset will cause the related datasets to become invalid. Are you sure you want to delete it? ', + 'Deleting the dataset will cause related datasets to become invalid, are you sure to delete?', del_tips_datasource: - 'Some datasets are using these Datasources. After deletion, the datasets will be unavailable. Are you sure you want to delete it? ', - single_del_confirm: 'Are you sure you want to delete this {0}? ', + 'Datasets are currently using these data sources, and they will become unusable after deletion, are you sure to delete?', + single_del_confirm: 'Are you sure to delete this {0}?', single_del_tips_dataset: - 'This dataset has the following blood relationship. Deleting it will cause the related views to become invalid. Are you sure you want to delete it? ', + 'This dataset has the following bloodline relationships, and deleting it will cause related visualizations to become invalid, are you sure to delete?', single_del_tips_datasource: - 'There are {0} datasets using this Datasource. After deletion, the dataset will be unavailable. Are you sure you want to delete it? ', + 'There are {0} datasets currently using this data source, and they will become unusable after deletion, are you sure to delete?', folder: 'Folder', del_folder_tips: - 'After deletion, all resources under this folder will be deleted. Please operate with caution. ' + 'After deletion, all resources under this folder will be deleted, please proceed with caution.', + sync_to_org: 'Migrate to Target Organization', + sync_org_placeholder: 'Please select the target organization', + relation_picture: 'Bloodline Relationship Diagram' + }, + security: { + title: 'Security Settings' + }, + setting_mfa: { + title: 'MFA Settings', + status: 'Global MFA Authentication Enabled', + platformEnable: 'Third-party Authentication Enables MFA', + exp: 'MFA Verification Expiry', + otpName: 'Name After Scanning OTP', + rate: 'OTP Delay Valid Count', + status_0: 'Not Enabled', + status_1: 'All Users', + status_2: 'System Administrators Only', + platform_tips: 'Third-party login methods include: OIDC, CAS', + exp_tips: + 'Unit: seconds, currently only effective when checking account password verification MFA', + user_enable: 'MFA Multi-factor Authentication', + code_input_msg: 'Please enter {0} digits', + bind_ready: 'Bound', + bind_unready: 'Unbound', + bind_title: 'Bind MFA Multi-factor Authentication', + enable_switch_tips: 'The administrator has set all users to enable MFA authentication', + reset_key_tips: 'Reset FMA', + step_1: 'Install Application', + step_2: 'Bind MFA Authenticator', + unbind_confirm: 'Are you sure to unbind MFA multi-factor authentication?', + mfa_code: 'MFA Verification Code' + }, + threshold_warn: { + all: 'All', + normal: 'Normal', + abnormal: 'Abnormal', + batch_del_confirm: 'Are you sure to delete {0} alert tasks?', + search_placeholder: 'Search by alert name', + chart_name: 'Chart Name', + warn_status: 'Alert Status' } } diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 46e2266290..8a25c93f70 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -4261,27 +4261,66 @@ export default { no_data: '暫無遊離資源', sync: '遷移', quick: '一鍵', - batch: '批次', + batch: '批量', resource: '資源', - view_association: '查看血緣關係', - quick_sync_tips: '所有儀表板、資料大螢幕、資料集、資料來源，將全部移轉到【遷移資源】資料夾。 ', + view_association: '查看血緣關系', + quick_sync_tips: '所有儀表板、數據大屏、數據集、數據源，將全部遷移到【遷移資源】文件夾。', batch_sync_tips: - '1. 與選取資源相關的儀表板、資料大螢幕、資料集、資料來源，也將一併遷移到對應資源的【遷移資源】資料夾；', - batch_sync_tips1: '2. 移轉資料夾將同時移轉該資料夾下的子資料夾和資源。 ', - quick_del_confirm: '確定刪除所有遊離資源嗎？ ', - quick_del_tips: '資源刪除後，不可撤銷。 ', - quick_sync_confirm: '確定遷移所有遊離資源嗎？ ', - quick_sync_confirm_tips: '遷移資源後，不可撤銷，請謹慎操作。 ', - batch_sync_confirm: '確定遷移{0} 項目及其相關遊離資源嗎？ ', + '1. 與選中資源相關的儀表板、數據大屏、數據集、數據源，也將一並遷移到對應資源的【遷移資源】文件夾；', + batch_sync_tips1: '2. 遷移文件夾將同時遷移該文件夾下的子文件夾和資源。', + quick_del_confirm: '確定刪除所有遊離資源嗎？', + quick_del_tips: '資源刪除後，不可撤銷。', + quick_sync_confirm: '確定遷移所有遊離資源嗎？', + quick_sync_confirm_tips: '遷移資源後，不可撤銷，請謹慎操作。', + batch_sync_confirm: '確定遷移 {0} 項及其相關遊離資源嗎？', single_sync_confirm: '確定遷移該資源嗎', - batch_del_confirm: '確定刪除{0} 項資源嗎？ ', - batch_del_confirm_tips: '資源刪除後，不可撤銷，請謹慎操作。 ', - del_tips_dataset: '刪除資料集會造成相關資料集失效，確定刪除？ ', - del_tips_datasource: '有資料集正在使用這些資料來源，刪除後資料集不可用，確定刪除？ ', - single_del_confirm: '確定刪除該{0}嗎？ ', - single_del_tips_dataset: '該資料集存在下列血緣關係，刪除會造成相關視圖失效，決定刪除？ ', - single_del_tips_datasource: '有{0} 個資料集正在使用此資料來源，刪除後資料集不可用，確定刪除？ ', - folder: '資料夾', - del_folder_tips: '刪除後，此資料夾下的所有資源都會被刪除，請謹慎操作。 ' + batch_del_confirm: '確定刪除 {0} 項資源嗎？', + batch_del_confirm_tips: '資源刪除後，不可撤銷，請謹慎操作。', + del_tips_dataset: '刪除數據集會造成相關數據集失效，確定刪除？', + del_tips_datasource: '有數據集正在使用這些數據源，刪除後數據集不可用，確定刪除？', + single_del_confirm: '確定刪除該{0}嗎？', + single_del_tips_dataset: '該數據集存在如下血緣關系，刪除會造成相關視圖失效，確定刪除？', + single_del_tips_datasource: '有 {0} 個數據集正在使用此數據源，刪除後數據集不可用，確定刪除？', + folder: '文件夾', + del_folder_tips: '刪除後，此文件夾下的所有資源都會被刪除，請謹慎操作。', + sync_to_org: '遷移至目標組織', + sync_org_placeholder: '請選擇目標組織', + relation_picture: '血緣關系圖' + }, + security: { + title: '安全設置' + }, + setting_mfa: { + title: 'MFA 設置', + status: '全局啟用 MFA 認證', + platformEnable: '第三方認證開啟 MFA', + exp: 'MFA 校驗有效期', + otpName: 'OPT 掃描後的名稱', + rate: 'OTP 延遲有效次數', + status_0: '未啟用', + status_1: '所有用戶', + status_2: '僅系統管理員', + platform_tips: '第三方登錄方式包括：OIDC、CAS', + exp_tips: '單位：秒，目前僅在查看賬號密碼校驗 MFA 時生效', + user_enable: 'MFA 多因子認證', + code_input_msg: '請輸入 {0} 位數字', + bind_ready: '已綁定', + bind_unready: '未綁定', + bind_title: '綁定 MFA 多因子認證', + enable_switch_tips: '管理員已設置所有用戶開啟 MFA 認證', + reset_key_tips: '重置 FMA', + step_1: '安裝應用', + step_2: '綁定 MFA 驗證器', + unbind_confirm: '確定解除 MFA 多因子認證綁定嗎？', + mfa_code: 'MFA 驗證碼' + }, + threshold_warn: { + all: '全部', + normal: '正常', + abnormal: '異常', + batch_del_confirm: '確定刪除 {0} 個告警任務嗎？', + search_placeholder: '通過告警名稱搜索', + chart_name: '圖表名稱', + warn_status: '告警狀態' } } diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index d59e15aaf1..41c7204833 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4318,5 +4318,14 @@ export default { step_2: '绑定 MFA 验证器', unbind_confirm: '确定解除 MFA 多因子认证绑定吗？', mfa_code: 'MFA 验证码' + }, + threshold_warn: { + all: '全部', + normal: '正常', + abnormal: '异常', + batch_del_confirm: '确定删除 {0} 个告警任务吗？', + search_placeholder: '通过告警名称搜索', + chart_name: '图表名称', + warn_status: '告警状态' } } diff --git a/sdk/common/src/main/java/io/dataease/i18n/Translator.java b/sdk/common/src/main/java/io/dataease/i18n/Translator.java index e6a05acdc4..a073cf488b 100644 --- a/sdk/common/src/main/java/io/dataease/i18n/Translator.java +++ b/sdk/common/src/main/java/io/dataease/i18n/Translator.java @@ -1,5 +1,6 @@ package io.dataease.i18n; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.dataease.utils.BeanUtils; import io.dataease.utils.JsonUtil; import io.dataease.utils.LogUtil; @@ -112,6 +113,10 @@ public class Translator { translateObject(item); } } + if (javaObject instanceof IPage) { + IPage iPage = (IPage) javaObject; + translateObject(iPage.getRecords()); + } if (javaObject.getClass().isArray()) { for (int i = 0; i < Array.getLength(javaObject); ++i) {