From 6164e4291cff963025a612e021f9bc5c7c609a5e Mon Sep 17 00:00:00 2001 From: song-tianyang Date: Mon, 5 Feb 2024 14:36:10 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=A0=91=E9=BB=98=E8=AE=A4=E8=8A=82=E7=82=B9=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/sdk/src/main/resources/i18n/project.properties | 1 + .../sdk/src/main/resources/i18n/project_en_US.properties | 1 + .../sdk/src/main/resources/i18n/project_zh_CN.properties | 1 + .../sdk/src/main/resources/i18n/project_zh_TW.properties | 1 + .../io/metersphere/project/service/FileModuleService.java | 4 ++-- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/framework/sdk/src/main/resources/i18n/project.properties b/backend/framework/sdk/src/main/resources/i18n/project.properties index fff36d310e..1b0c6da9fa 100644 --- a/backend/framework/sdk/src/main/resources/i18n/project.properties +++ b/backend/framework/sdk/src/main/resources/i18n/project.properties @@ -1,4 +1,5 @@ fake_error.id.not_blank=ID不能为空 +file.module.default.name=未规划文件 fake_error.project_id.length_range=项目ID长度必须在{min}-{max}之间 fake_error.project_id.not_blank=项目ID不能为空 fake_error.create_user.length_range=创建人长度必须在{min}-{max}之间 diff --git a/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties index 6001c622a9..b37c6f7258 100644 --- a/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties @@ -1,4 +1,5 @@ fake_error.id.not_blank=ID is required +file.module.default.name=Unplanned file fake_error.project_id.length_range=Project ID length must be between {min} and {max} fake_error.project_id.not_blank=Project ID is required fake_error.name.length_range=Name length must be between {min} and {max} diff --git a/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties index fb7a9acf3d..7fb68c7459 100644 --- a/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties @@ -1,4 +1,5 @@ fake_error.id.not_blank=ID不能为空 +file.module.default.name=未规划文件 fake_error.project_id.length_range=项目ID长度必须在{min}-{max}之间 fake_error.project_id.not_blank=项目ID不能为空 fake_error.name.length_range=误报名称长度必须在{min}-{max}之间 diff --git a/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties index d52dbf54e6..25e4ca7119 100644 --- a/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties @@ -1,4 +1,5 @@ fake_error.id.not_blank=ID不能為空 +file.module.default.name=未規劃文件 fake_error.project_id.length_range=項目ID長度必須在{min}-{max}之間 fake_error.project_id.not_blank=項目ID不能為空 fake_error.name.length_range=誤報名稱長度必須在{min}-{max}之間 diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/FileModuleService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/FileModuleService.java index 0af403f359..1210c9bfb5 100644 --- a/backend/services/project-management/src/main/java/io/metersphere/project/service/FileModuleService.java +++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/FileModuleService.java @@ -51,13 +51,13 @@ public class FileModuleService extends ModuleTreeService implements CleanupProje public List getTree(String projectId) { List fileModuleList = extFileModuleMapper.selectBaseByProjectId(projectId, ModuleConstants.NODE_TYPE_DEFAULT); - return super.buildTreeAndCountResource(fileModuleList, true, Translator.get("default.module")); + return super.buildTreeAndCountResource(fileModuleList, true, Translator.get("file.module.default.name")); } public List getTreeOnlyIdsAndResourceCount(String projectId, String storage, List moduleCountDTOList) { //节点内容只有Id和parentId List fileModuleList = extFileModuleMapper.selectIdAndParentIdByProjectId(projectId, storage); - return super.buildTreeAndCountResource(fileModuleList, moduleCountDTOList, true, Translator.get("default.module")); + return super.buildTreeAndCountResource(fileModuleList, moduleCountDTOList, true, Translator.get("file.module.default.name")); } public String add(FileModuleCreateRequest request, String operator) {