From 29e4296034c01d610f960a8c6b95ffcafd9b4513 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 30 Nov 2022 15:37:10 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/i18n/messages_en_US.properties | 13 +++++++++++++ .../resources/i18n/messages_zh_CN.properties | 14 ++++++++++++++ .../resources/i18n/messages_zh_TW.properties | 13 +++++++++++++ frontend/src/lang/en.js | 10 ++++++++++ frontend/src/lang/tw.js | 16 +++++++++++++--- frontend/src/lang/zh.js | 16 +++++++++++++--- frontend/src/layout/components/Sidebar/index.vue | 2 +- .../src/views/system/sysParam/EmailSetting.vue | 4 ++-- 8 files changed, 79 insertions(+), 9 deletions(-) diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 44b053e949..375af2fc78 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -247,3 +247,16 @@ I18N_LOG_FORMAT_POSITION=IN\u3010%s\u3011 I18N_LOG_FORMAT=TO %s\u3010%s\u3011 I18N_LOG_FORMAT_PREFIX=With authority of %s\u3010%s\u3011 +\u4E0A\u4F20\u63D2\u4EF6=Upload +\u5378\u8F7D\u63D2\u4EF6=Uninstall +\u67E5\u770B\u7CFB\u7EDF\u6A21\u677F=System templates +\u7F16\u8F91\u62A5\u544A=Edit report +\u521B\u5EFA\u62A5\u544A=Create report +\u5220\u9664\u62A5\u544A=Delete report +\u5BFC\u51FA\u65E5\u5FD7=Export log +\u5BFC\u5165\u7528\u6237=Import user +\u6570\u636E\u96C6\u8868\u5355=Dataset form +\u7F16\u8F91\u8BB0\u5F55=Edit record +\u5220\u9664\u8BB0\u5F55=Delete record +\u6C34\u5370\u7BA1\u7406=Watermark + diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index d51c0e69cf..c1a7f7fb66 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -247,3 +247,17 @@ I18N_LOG_FORMAT_POSITION=\u5728\u3010%s\u3011 I18N_LOG_FORMAT=\u7ED9%s\u3010%s\u3011 I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6743\u9650 +\u4E0A\u4F20\u63D2\u4EF6=\u4E0A\u4F20\u63D2\u4EF6 +\u5378\u8F7D\u63D2\u4EF6=\u5378\u8F7D\u63D2\u4EF6 +\u67E5\u770B\u7CFB\u7EDF\u6A21\u677F=\u7CFB\u7EDF\u6A21\u7248 +\u7F16\u8F91\u62A5\u544A=\u7F16\u8F91\u62A5\u544A +\u521B\u5EFA\u62A5\u544A=\u521B\u5EFA\u62A5\u544A +\u5220\u9664\u62A5\u544A=\u5220\u9664\u62A5\u544A +\u5BFC\u51FA\u65E5\u5FD7=\u5BFC\u51FA\u65E5\u5FD7 +\u5BFC\u5165\u7528\u6237=\u5BFC\u5165\u7528\u6237 +\u6570\u636E\u96C6\u8868\u5355=\u6570\u636E\u96C6\u8868\u5355 +\u7F16\u8F91\u8BB0\u5F55=\u7F16\u8F91\u8BB0\u5F55 +\u5220\u9664\u8BB0\u5F55=\u5220\u9664\u8BB0\u5F55 +\u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406 + + diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 37072949cb..116f5f4533 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -242,3 +242,16 @@ I18N_PROHIBIT_SCANNING_TO_CREATE_USER=\u7981\u6B62\u6383\u78BC\u5275\u5EFA\u7528 I18N_LOG_FORMAT_POSITION=\u5728\u3010%s\u3011 I18N_LOG_FORMAT=\u7D66%s\u3010%s\u3011 I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6B0A\u9650 + +\u4E0A\u4F20\u63D2\u4EF6=\u4E0A\u50B3\u63D2\u4EF6 +\u5378\u8F7D\u63D2\u4EF6=\u5378\u8F09\u63D2\u4EF6 +\u67E5\u770B\u7CFB\u7EDF\u6A21\u677F=\u7CFB\u7D71\u6A21\u7248 +\u7F16\u8F91\u62A5\u544A=\u7DE8\u8F2F\u5831\u544A +\u521B\u5EFA\u62A5\u544A=\u5275\u5EFA\u5831\u544A +\u5220\u9664\u62A5\u544A=\u522A\u9664\u5831\u544A +\u5BFC\u51FA\u65E5\u5FD7=\u5C0E\u51FA\u65E5\u8A8C +\u5BFC\u5165\u7528\u6237=\u5C0E\u5165\u7528\u6236 +\u6570\u636E\u96C6\u8868\u5355=\u6578\u64DA\u96C6\u8868\u55AE +\u7F16\u8F91\u8BB0\u5F55=\u7DE8\u8F2F\u8A18\u9304 +\u5220\u9664\u8BB0\u5F55=\u522A\u9664\u8A18\u9304 +\u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406 diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 8ff6d4a01d..7926a3247c 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -135,6 +135,7 @@ export default { default_login: 'Normal' }, commons: { + collapse_navigation: 'Collapse navigation', operate_cancelled: 'Operation cancelled', bind: 'Bind', unbind: 'Unbind', @@ -811,6 +812,7 @@ export default { edite_organization: 'Edit organization' }, system_parameter_setting: { + email_server_config: 'Mailbox server configuration', edit_success: 'Edit success', mailbox_service_settings: 'Mail Setting', test_connection: 'Test connection', @@ -2541,6 +2543,14 @@ export default { }, emailtask: { + week_mon: 'Mon', + week_tue: 'Tue', + week_wed: 'Wed', + week_thu: 'Thu', + week_fri: 'Fri', + week_sat: 'Sat', + week_sun: 'Sun', + send_config: 'Send configuration', title: 'Title', panel: 'Panel', content: 'Content', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index e4ce6b8e57..32211820a2 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -135,6 +135,7 @@ export default { default_login: '普通登錄' }, commons: { + collapse_navigation: '收起導航', operate_cancelled: '已取消操作', bind: '綁定', unbind: '解綁', @@ -811,6 +812,7 @@ export default { edite_organization: '編輯組織' }, system_parameter_setting: { + email_server_config: '郵箱服務器配置', edit_success: '編輯成功', mailbox_service_settings: '郵件設置', test_connection: '測試連接', @@ -2542,6 +2544,14 @@ export default { }, emailtask: { + week_mon: '周一', + week_tue: '周二', + week_wed: '周三', + week_thu: '周四', + week_fri: '周五', + week_sat: '周六', + week_sun: '周日', + send_config: '發送設置', title: '報告主題', panel: '儀表闆', content: '報告正文', @@ -2566,9 +2576,9 @@ export default { emial_preview: '報告預覽', chart_data_range: '視圖數據範圍', simple_repeat: '簡單重複', - once_a_day: '每天一次', - once_a_week: '每周一次', - once_a_month: '每月一次', + once_a_day: '每天', + once_a_week: '每周', + once_a_month: '每月', complex_repeat: '複雜重複', pixel_tip: '可直接輸入分辨率(例如:2560 * 1600)或者選擇', task_type: '任務類型', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 5ed1e27d35..b02b6feb2f 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -135,6 +135,7 @@ export default { default_login: '普通登录' }, commons: { + collapse_navigation: '收起导航', operate_cancelled: '已取消操作', bind: '绑定', unbind: '解绑', @@ -810,6 +811,7 @@ export default { edite_organization: '编辑组织' }, system_parameter_setting: { + email_server_config: '邮箱服务器配置', edit_success: '编辑成功', mailbox_service_settings: '邮件设置', test_connection: '测试连接', @@ -2542,6 +2544,14 @@ export default { }, emailtask: { + week_mon: '周一', + week_tue: '周二', + week_wed: '周三', + week_thu: '周四', + week_fri: '周五', + week_sat: '周六', + week_sun: '周日', + send_config: '发送设置', title: '报告主题', panel: '仪表板', content: '报告正文', @@ -2566,9 +2576,9 @@ export default { emial_preview: '报告预览', chart_data_range: '视图数据范围', simple_repeat: '简单重复', - once_a_day: '每天一次', - once_a_week: '每周一次', - once_a_month: '每月一次', + once_a_day: '每天', + once_a_week: '每周', + once_a_month: '每月', complex_repeat: '复杂重复', pixel_tip: '可直接输入自定义分辨率(例如:2560 * 1600)或选择', task_type: '任务类型', diff --git a/frontend/src/layout/components/Sidebar/index.vue b/frontend/src/layout/components/Sidebar/index.vue index 2803d7986e..21eb6f2916 100644 --- a/frontend/src/layout/components/Sidebar/index.vue +++ b/frontend/src/layout/components/Sidebar/index.vue @@ -33,7 +33,7 @@ :style="{ transform: isCollapse ? 'rotate(90deg)' : 'rotate(-90deg)' }" class="el-icon-upload2" /> - {{ isCollapse ? "" : "收起导航" }} + {{ isCollapse ? "" : $t('commons.collapse_navigation') }} diff --git a/frontend/src/views/system/sysParam/EmailSetting.vue b/frontend/src/views/system/sysParam/EmailSetting.vue index 59a5a818d6..4ff1473d75 100644 --- a/frontend/src/views/system/sysParam/EmailSetting.vue +++ b/frontend/src/views/system/sysParam/EmailSetting.vue @@ -81,7 +81,7 @@ :placeholder="$t('system_parameter_setting.SMTP_password')" /> - +