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 48d8e20d03..7ff3b9f32f 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 @@ -189,8 +189,8 @@ message.jenkins_task=Execution message.batch_execution=Batch execution message.manual_execution=Manual execution message.test_plan_management=Test Plan -message.bug_management=Bug management -message.case_management=Case management +message.bug_management=Bug +message.case_management=Functional message.api_test_management=API Test message.ui_test_management=UI test message.load_test_management=Load test diff --git a/frontend/src/locale/en-US/index.ts b/frontend/src/locale/en-US/index.ts index 30803a30f0..c70d9d0711 100644 --- a/frontend/src/locale/en-US/index.ts +++ b/frontend/src/locale/en-US/index.ts @@ -55,7 +55,7 @@ export default { 'menu.loadTest': 'Performance Test', 'menu.projectManagement.projectPermission': 'Project Permission', 'menu.projectManagement.log': 'Log', - 'menu.projectManagement.taskCenter': 'The task center', + 'menu.projectManagement.taskCenter': 'Task center', 'menu.projectManagement.environmentManagement': 'Environment', 'menu.settings': 'Settings', 'menu.settings.system': 'System', diff --git a/frontend/src/views/bug-management/locale/en-US.ts b/frontend/src/views/bug-management/locale/en-US.ts index 4b7d9c3f2e..2d0f8800c0 100644 --- a/frontend/src/views/bug-management/locale/en-US.ts +++ b/frontend/src/views/bug-management/locale/en-US.ts @@ -109,7 +109,7 @@ export default { caseRelated: 'Related cases', }, recycle: { - recycleBin: 'Recycle Bin', + recycleBin: 'Recycle', recover: 'Recover', recoverSuccess: 'Recover success', recoverError: 'Recover failed', diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue index f63cb21114..ef05c55890 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue @@ -1241,7 +1241,9 @@ }; }); - caseLevelFields.value = result.customFields.find((item: any) => item.internal && item.fieldName === '用例等级'); + caseLevelFields.value = result.customFields.find( + (item: any) => item.internal && (item.fieldName === 'Case Priority' || item.fieldName === '用例等级') + ); caseFilters.value = caseLevelFields.value.options.map((item: any) => item.value); fullColumns = [ ...columns.slice(0, columns.length - 1), diff --git a/frontend/src/views/setting/organization/member/index.vue b/frontend/src/views/setting/organization/member/index.vue index 44b4d089e6..7a13754f4d 100644 --- a/frontend/src/views/setting/organization/member/index.vue +++ b/frontend/src/views/setting/organization/member/index.vue @@ -414,7 +414,7 @@ const userGroupOptions = ref([]); const projectOptions = ref([]); const getLinkList = async () => { - if (lastOrganizationId) { + if (lastOrganizationId.value) { userGroupOptions.value = await getGlobalUserGroup(lastOrganizationId.value); if (hasAnyPermission(['ORGANIZATION_PROJECT:READ'])) { projectOptions.value = await getProjectList(lastOrganizationId.value); diff --git a/frontend/src/views/setting/organization/template/locale/en-US.ts b/frontend/src/views/setting/organization/template/locale/en-US.ts index 8a6fcb1125..5214a1ba82 100644 --- a/frontend/src/views/setting/organization/template/locale/en-US.ts +++ b/frontend/src/views/setting/organization/template/locale/en-US.ts @@ -12,11 +12,11 @@ export default { 'system.orgTemplate.templateDescription': 'The template configuration contains the combination configuration of the collaboration type and the transaction type. It can be applied to multiple projects to facilitate unified management and organization of project collaboration and workflow', 'system.orgTemplate.noReminders': 'No reminders', - 'system.orgTemplate.caseTemplates': 'UseCase templates', + 'system.orgTemplate.caseTemplates': 'Functional Template', 'system.orgTemplate.APITemplates': 'API template', 'system.orgTemplate.UITemplates': 'UI template', 'system.orgTemplate.testPlanTemplates': 'TestPlan template', - 'system.orgTemplate.defectTemplates': 'Defect template', + 'system.orgTemplate.defectTemplates': 'Bug Template', 'system.orgTemplate.enabledTemplates': 'enabled', 'system.orgTemplate.disabledTemplates': 'disabled', 'system.orgTemplate.fieldSetting': 'Setting', @@ -107,8 +107,8 @@ export default { 'system.orgTemplate.apiInputPlaceholder': 'Please enter a third-party API', 'system.orgTemplate.apiFieldId': 'API field', 'system.orgTemplate.copyTemplate': 'copy{type}template', - 'system.orgTemplate.createTemplateType': 'create{type}', - 'system.orgTemplate.editTemplateType': 'update{type}', + 'system.orgTemplate.createTemplateType': 'Create {type}', + 'system.orgTemplate.editTemplateType': 'Update {type}', 'system.orgTemplate.workFlowTip': 'Change the properties or workflow configuration of the event will take effect immediately on the related project. Exercise caution when performing this operation', 'system.orgTemplate.workFlowToolTip': @@ -187,16 +187,16 @@ export default { 'system.orgTemplate.addFieldDesc': 'Adds a new field', 'system.orgTemplate.enterStatusDesc': 'Please enter a status description', 'system.orgTemplate.field': 'Field', - 'system.orgTemplate.caseTemplateManagement': 'Use case template', + 'system.orgTemplate.caseTemplateManagement': 'Functional Template', 'system.orgTemplate.apiTemplateManagement': 'Interface template', - 'system.orgTemplate.bugTemplateManagement': 'Defect template', + 'system.orgTemplate.bugTemplateManagement': 'Bug Template', 'system.orgTemplate.templateTypeName': ' {type}name', 'system.orgTemplate.createCaseTemplate': 'Create a use case template', 'system.orgTemplate.updateCaseTemplate': 'Update the use case template', 'system.orgTemplate.createApiTemplate': 'Creating Api Template', 'system.orgTemplate.updateApiTemplate': 'Update Api Template', - 'system.orgTemplate.createDefectTemplate': 'Create defect templates', - 'system.orgTemplate.updateDefectTemplate': 'Update defect templates', + 'system.orgTemplate.createDefectTemplate': 'Create bug template', + 'system.orgTemplate.updateDefectTemplate': 'Update bug template', 'system.orgTemplate.enableApiAlert': 'After connecting to the third-party platform, you need to fill in the field API for the custom field. When using the template, the API field is not displayed', 'system.orgTemplate.pleaseEnterAPITip': 'Please enter the field API',