From 3870a81222134d9824b81d90ad9154c30a7de76b Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Mon, 18 May 2020 16:05:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=A1=E6=81=AF=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/listener/EasyExcelListener.java | 2 +- .../track/service/TestCaseNodeService.java | 2 +- .../main/resources/i18n/messages.properties | 4 ++-- .../resources/i18n/messages_en_US.properties | 4 ++-- .../resources/i18n/messages_zh_CN.properties | 3 ++- .../resources/i18n/messages_zh_TW.properties | 22 ++++++++++++++----- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/io/metersphere/excel/listener/EasyExcelListener.java b/backend/src/main/java/io/metersphere/excel/listener/EasyExcelListener.java index e651979601..acfd96c6ae 100644 --- a/backend/src/main/java/io/metersphere/excel/listener/EasyExcelListener.java +++ b/backend/src/main/java/io/metersphere/excel/listener/EasyExcelListener.java @@ -61,7 +61,7 @@ public abstract class EasyExcelListener extends AnalysisEventListener { if (!StringUtils.isEmpty(errMsg)) { ExcelErrData excelErrData = new ExcelErrData(t, rowIndex, - Translator.get("number") + rowIndex + Translator.get("row") + Translator.get("erroer") + Translator.get("number") + rowIndex + Translator.get("row") + Translator.get("error") + "：" + errMsg); errList.add(excelErrData); } else { diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java index c8ef98ce14..9faa743a84 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java @@ -260,7 +260,7 @@ public class TestCaseNodeService { String rootNodeName = null; if (nodeNameList.size() <= 1) { - throw new ExcelException(Translator.get("test_case_module_not_null") + ":" + path); + throw new ExcelException(Translator.get("test_case_create_module_fail") + ":" + path); } else { pathIterator.next(); pathIterator.remove(); diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index 9cb68664bd..195a2618d7 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -3,7 +3,7 @@ before_delete_plan= test_case_node_level_tip= test_case_node_level= test_case_module_not_null= -test_case_create_moule_fail= +test_case_create_module_fail= test_case_import_template_name= test_case_import_template_sheet= module_not_null= @@ -13,7 +13,7 @@ parse_data_error= missing_header_information= number= row= -erroer= +error= incorrect_format= test_case_type_validate= test_case_priority_validate= diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 3e9b591fee..ad60394485 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -37,7 +37,7 @@ password_modification_failed=Password modification failed cannot_delete_current_user=Cannot delete the user currently logged in test_case_node_level=level test_case_module_not_null=The owned module cannot be empty -test_case_create_moule_fail=Failed to create module +test_case_create_module_fail=Failed to create module test_case_import_template_name=Test case templates test_case_import_template_sheet=Template module_not_null=The module must not be blank @@ -47,7 +47,7 @@ parse_data_error=Parse data error missing_header_information=Missing header information number=Number row=row -erroer=erroer +error=error incorrect_format=Incorrect format test_case_type_validate=must be functional, performance, api test_case_priority_validate=must be P0, P1, P2, P3 diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 97bb1d7480..89954c4501 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -38,7 +38,7 @@ cannot_delete_current_user=无法删除当前登录用户 test_case_node_level=层 test_case_node_level_tip=模块树最大深度为 test_case_module_not_null=所属模块不能为空 -test_case_create_moule_fail=创建模块失败 +test_case_create_module_fail=创建模块失败 test_case_import_template_name=测试用例模版 test_case_import_template_sheet=模版 module_not_null=所属模块不能为空格 @@ -52,4 +52,5 @@ incorrect_format=格式不正确 test_case_type_validate=必须为functional、performance、api test_case_priority_validate=必须为P0、P1、P2、P3 test_case_method_validate=必须为manual、auto +error=出错 #test case end \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 777656a854..0fc4492dca 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -1,6 +1,6 @@ test_case_exist=該項目下已存在用例： error_lang_invalid=語言參數錯誤 -load_test_already_exists=測試名稱不能重複 +load_test_already_exists=測試名稱不能重復 project_name_is_null=項目名稱不能為空 project_name_already_exists=項目名稱已存在 workspace_name_is_null=工作空間名不能為空 @@ -16,10 +16,10 @@ run_load_test_file_init_error=無法運行測試，初始化運行環境失敗 load_test_is_running=測試正在運行, 請等待 node_deep_limit=節點深度不超過5層！ no_nodes_message=沒有節點信息 -duplicate_node_ip=節點 IP 重複 -only_one_k8s=只能添加一個 K8s +duplicate_node_ip=節點 IP 重復 +only_one_k8s=只能添加壹個 K8s organization_id_is_null=組織 ID 不能為空 -max_thread_insufficient=並髮用戶數超額 +max_thread_insufficient=並發用戶數超額 cannot_edit_load_test_running=不能修改正在運行的測試 test_not_found=測試不存在: test_not_running=測試未運行 @@ -38,7 +38,19 @@ cannot_delete_current_user=無法刪除當前登錄用戶 test_case_node_level=層 test_case_node_level_tip=模塊樹最大深度為 test_case_module_not_null=所屬模塊不能為空 -test_case_create_moule_fail=創建模塊失敗 +test_case_create_module_fail=創建模塊失敗 test_case_import_template_name=測試用例模版 test_case_import_template_sheet=模版 +module_not_null=所屬模塊不能為空格 +user_not_exists=該工作空間下無該用戶 +test_case_already_exists=該項目下已存在該測試用例 +parse_data_error=解析數據出錯 +missing_header_information=缺少頭部信息 +number=第 +row=行 +incorrect_format=格式不正確 +test_case_type_validate=必須為functional、performance、api +test_case_priority_validate=必須為P0、P1、P2、P3 +test_case_method_validate=必須為manual、auto +error=出错 #test case end \ No newline at end of file