From cce6a20509e2f135e147b2bc76dcc707b3234199 Mon Sep 17 00:00:00 2001 From: vhwweng <1010382269@qq.com> Date: Wed, 28 Feb 2024 14:35:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug:=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E9=A1=B9=E7=9B=AE=E6=9C=80=E5=A4=A7=E5=8F=AF=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E4=BA=BA=E5=91=98=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=85=A8=E5=91=98=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA=20#10041?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops-manage/src/components/project-form.vue | 2 +- src/frontend/locale/manage/en-US.json | 11 ++++++++++- src/frontend/locale/manage/zh-CN.json | 11 ++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/frontend/devops-manage/src/components/project-form.vue b/src/frontend/devops-manage/src/components/project-form.vue index 1c5f318d2bc..776027713ed 100644 --- a/src/frontend/devops-manage/src/components/project-form.vue +++ b/src/frontend/devops-manage/src/components/project-form.vue @@ -451,7 +451,7 @@ onBeforeUnmount(() => { v-for="(subjectScope, index) in projectData.subjectScopes" :key="index" > - {{ subjectScope.name }} + {{ subjectScope.id === '*' ? t('全员') : subjectScope.name }} Date: Wed, 28 Feb 2024 14:46:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug:=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E9=A1=B9=E7=9B=AE=E6=9C=80=E5=A4=A7=E5=8F=AF=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E4=BA=BA=E5=91=98=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=85=A8=E5=91=98=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA=20#10041?= =?UTF-8?q?=20#=20Reviewed,=20transaction=20id:=203066?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/locale/manage/en-US.json | 8 -------- src/frontend/locale/manage/zh-CN.json | 8 -------- 2 files changed, 16 deletions(-) diff --git a/src/frontend/locale/manage/en-US.json b/src/frontend/locale/manage/en-US.json index d773f527910..47491935798 100644 --- a/src/frontend/locale/manage/en-US.json +++ b/src/frontend/locale/manage/en-US.json @@ -138,13 +138,5 @@ "重命名": "Rename", "项目类型": "Project Type", "创建项目申请单已撤回": "Creation of project application has been withdrawn", - "项目所属运营产品": "Operational Product", - "请选择所属运营产品": "Please select the operational product", - "公司OBS结算业务的运营产品，1个项目仅支持关联1个运营产品，多个项目可关联到同一运营产品": "The operational product for the company’s OBS settlement business supports only one project association per project, but multiple projects can be associated with the same operational product.", - "启用项目失败": "Failed to enable the project", - "项目尚未关联运营产品，启用失败，请先关联所属运营产品再启用项目。": "The project has not been associated with an operational product yet, activation failed. Please associate it with the corresponding operational product before enabling the project.", - "确定停用项目吗？": "Are you sure you want to disable the project?", - "停用项目后，系统将定期清理已停用项目下流水线产生的构建日志、制品、报告。请备份需要的数据后再停用！": "After disabling the project, the system will regularly clean up the build logs, artifacts, and reports generated by the pipelines under the disabled project. Please back up the necessary data before disabling!", - "去关联运营产品": "To associate", "全员": "EveryOne" } diff --git a/src/frontend/locale/manage/zh-CN.json b/src/frontend/locale/manage/zh-CN.json index 3b25b37bd42..5635b9425e2 100644 --- a/src/frontend/locale/manage/zh-CN.json +++ b/src/frontend/locale/manage/zh-CN.json @@ -139,13 +139,5 @@ "重命名": "重命名", "项目类型": "项目类型", "创建项目申请单已撤回": "创建项目申请单已撤回", - "项目所属运营产品": "项目所属运营产品", - "请选择所属运营产品": "请选择所属运营产品", - "公司OBS结算业务的运营产品，1个项目仅支持关联1个运营产品，多个项目可关联到同一运营产品": "公司OBS结算业务的运营产品，1个项目仅支持关联1个运营产品，多个项目可关联到同一运营产品", - "启用项目失败": "启用项目失败", - "项目尚未关联运营产品，启用失败，请先关联所属运营产品再启用项目。": "项目尚未关联运营产品，启用失败，请先关联所属运营产品再启用项目。", - "确定停用项目吗？": "确定停用项目吗？", - "停用项目后，系统将定期清理已停用项目下流水线产生的构建日志、制品、报告。请备份需要的数据后再停用！": "停用项目后，系统将定期清理已停用项目下{0}请{1}数据后再停用！", - "去关联运营产品": "去关联运营产品", "全员": "全员" }