diff --git a/backend/src/main/java/io/metersphere/api/service/MockConfigService.java b/backend/src/main/java/io/metersphere/api/service/MockConfigService.java index 4bcf49b976..ab46220191 100644 --- a/backend/src/main/java/io/metersphere/api/service/MockConfigService.java +++ b/backend/src/main/java/io/metersphere/api/service/MockConfigService.java @@ -1202,7 +1202,7 @@ public class MockConfigService { if (!isMatch) { response.setStatus(404); - returnStr = "未找到匹配的Mock期望!"; + returnStr = Translator.get("mock_warning"); } return returnStr; } @@ -1244,7 +1244,7 @@ public class MockConfigService { if (!isMatch) { response.setStatus(404); - returnStr = "未找到匹配的Mock期望!"; + returnStr = Translator.get("mock_warning"); } return returnStr; } diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 8fe2bc555c..5a41eeb6fc 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -281,5 +281,6 @@ performance_case=PERFORMANCE scenario_case=SCENARIO create_user=Create user test_case_status=Case status - id_not_rightful=ID is not rightful +# mock +mock_warning=No matching Mock expectation was found diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 594b68af75..5f24c862cb 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -281,3 +281,5 @@ test_case_status_saved=已保存 create_user=创建人 test_case_status=用例状态 id_not_rightful=ID 不合法 +# mock +mock_warning=未找到匹配的Mock期望 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index b9f3b23a5c..8e22d67225 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -282,3 +282,5 @@ test_case_status_saved=已保存 create_user=創建人 test_case_status=用例狀態 id_not_rightful=ID 不合法 +# mock +mock_warning=未找到匹配的Mock期望 diff --git a/frontend/src/business/components/api/automation/report/ApiReportList.vue b/frontend/src/business/components/api/automation/report/ApiReportList.vue index 4fb89c617e..48754cd82f 100644 --- a/frontend/src/business/components/api/automation/report/ApiReportList.vue +++ b/frontend/src/business/components/api/automation/report/ApiReportList.vue @@ -166,7 +166,7 @@ export default { handleView(report) { this.reportId = report.id; if (report.status === 'Running') { - this.$warning("正在运行中,请稍后查看") + this.$warning(this.$t('commons.run_warning')) return; } this.currentProjectId = report.projectId; diff --git a/frontend/src/business/components/task/TaskCenter.vue b/frontend/src/business/components/task/TaskCenter.vue index aca580ebe4..a910835b7f 100644 --- a/frontend/src/business/components/task/TaskCenter.vue +++ b/frontend/src/business/components/task/TaskCenter.vue @@ -33,7 +33,7 @@ :size="size.toString()" custom-class="ms-drawer-task"> -
收起
+
{{ this.$t('') }}
@@ -349,9 +349,9 @@ export default { this.getExecResult(row.id); } } else if (status === 'stop') { - this.$warning("当前任务已停止,无法查看报告"); + this.$warning(this.$t('commons.run_stop')); } else { - this.$warning("正在运行中,请稍后查看"); + this.$warning(this.$t('commons.run_warning')) } } }, diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 287fad2836..0c902b0e0f 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -188,6 +188,7 @@ export default { api_case: "Api Case", scenario_case: "Scenario Case", task_center: "Task center", + task_close: "Put away", notice_center: "Notice center", notice_count: 'Messages', notice_tips: 'Only display the news within the last 3 months', @@ -205,7 +206,9 @@ export default { run_success: "Run Success", run_completed: "Run Completed", run_fail: "Run Fail", - follow_success:"Follow Success", + run_warning: "Is running, please check later", + run_stop: "當前任務已停止,無法查看報告", + follow_success: "Follow Success", cancel_follow_success: "Cancel Follow Success", generate_test_data: "Generate test data", type: "Type", diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index b3447038b6..8d911d83ae 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -189,6 +189,7 @@ export default { api_case: "接口用例", scenario_case: "场景用例", task_center: "任务中心", + task_close: "收起", notice_center: "消息中心", notice_count: '条消息', notice_tips: '仅显示最近3个月的站内消息', @@ -205,6 +206,8 @@ export default { environment: "运行环境", run_success: "执行成功", run_completed: "执行完成", + run_warning: "正在运行中,请稍后查看", + run_stop: "The current task has been stopped and the report cannot be viewed", run_fail: "执行失败", follow_success: "关注成功", cancel_follow_success: "取消关注成功", diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index dfe34fb5e9..e2a9b56d8c 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -189,6 +189,7 @@ export default { api_case: "接口用例", scenario_case: "場景用例", task_center: "任務中心", + task_close: "收起", notice_center: "消息中心", notice_count: '條消息', notice_tips: '僅顯示最近3個月的站內消息', @@ -205,9 +206,11 @@ export default { environment: "運行環境", run_success: "執行成功", run_completed: "執行完成", + run_warning: "正在運行中,請稍後查看", + run_stop: "當前任務已停止,無法查看報告", run_fail: "執行失敗", - follow_success:"關註成功", - cancel_follow_success:"取消關註成功", + follow_success: "關註成功", + cancel_follow_success: "取消關註成功", type: "類型", relationship: { name: '依賴關系',