diff --git a/apiserver/paasng/locale/en/LC_MESSAGES/django.mo b/apiserver/paasng/locale/en/LC_MESSAGES/django.mo index cfc3d88c1e..a1b1306070 100644 Binary files a/apiserver/paasng/locale/en/LC_MESSAGES/django.mo and b/apiserver/paasng/locale/en/LC_MESSAGES/django.mo differ diff --git a/apiserver/paasng/locale/en/LC_MESSAGES/django.po b/apiserver/paasng/locale/en/LC_MESSAGES/django.po index dd2c8c8347..a6583622f8 100644 --- a/apiserver/paasng/locale/en/LC_MESSAGES/django.po +++ b/apiserver/paasng/locale/en/LC_MESSAGES/django.po @@ -131,15 +131,15 @@ msgstr "" #: paas_wl/bk_app/cnative/specs/models/mount.py:42 #: paas_wl/bk_app/cnative/specs/models/mount.py:61 msgid "挂载资源名" -msgstr "" +msgstr "Mounted resource name" #: paas_wl/bk_app/cnative/specs/models/mount.py:82 msgid "挂载点的名称" -msgstr "" +msgstr "Name of the mount point" #: paas_wl/bk_app/cnative/specs/mounts.py:198 -msgid "删除持久存储资源失败,请先删除相应挂载卷资源" -msgstr "" +msgid "删除持久存储资源失败，请先删除相应挂载卷资源" +msgstr "Failed to delete persistent storage resources, please delete the corresponding mounted volume resources first." #: paas_wl/bk_app/cnative/specs/serializers.py:58 msgid "" @@ -166,11 +166,11 @@ msgstr "Mount volume content cannot be empty" #: paas_wl/bk_app/cnative/specs/serializers.py:119 msgid "configmap 挂载" -msgstr "" +msgstr "ConfigMap mounting" #: paas_wl/bk_app/cnative/specs/serializers.py:120 msgid "持久存储资源" -msgstr "" +msgstr "Persistent storage resources" #: paas_wl/bk_app/cnative/specs/serializers.py:150 #: paas_wl/bk_app/cnative/specs/serializers.py:164 @@ -181,19 +181,19 @@ msgstr "Failed to get process information" #: paas_wl/bk_app/cnative/specs/serializers.py:204 msgid "挂载资源的名称" -msgstr "" +msgstr "Name of the mounted resource" #: paas_wl/bk_app/cnative/specs/serializers.py:212 msgid "挂载卷资源类型" -msgstr "" +msgstr "Mount volume resource type" #: paas_wl/bk_app/cnative/specs/serializers.py:213 msgid "已绑定模块信息" -msgstr "" +msgstr "Bound module information" #: paas_wl/bk_app/cnative/specs/serializers.py:217 msgid "显示名称" -msgstr "" +msgstr "Display name" #: paas_wl/bk_app/cnative/specs/views.py:120 msgid "权限不足或仓库不可达" @@ -220,7 +220,7 @@ msgstr "Mount volume already exists in the same environment and path." #: paas_wl/bk_app/cnative/specs/views.py:339 msgid "当前应用暂不支持持久存储功能，请联系管理员" -msgstr "" +msgstr "The current application does not support persistent storage functionality. Please contact the administrator." #: paas_wl/bk_app/processes/controllers.py:51 msgid "进程操作过于频繁，请间隔 {operation_interval.total_seconds()} 秒再试。" @@ -451,7 +451,7 @@ msgstr "Credential with the same name already exists" #: paas_wl/workloads/images/views.py:76 msgid "该凭证已被应用使用" -msgstr "" +msgstr "The credential is already in use by an application." #: paas_wl/workloads/networking/egress/views.py:65 msgid "新建出口 IP 绑定功能已禁用，如有需要请联系管理员" @@ -465,8 +465,7 @@ msgstr "Parameter format error" #: paas_wl/workloads/networking/entrance/serializers.py:65 msgid "该域名与路径组合已被其他应用或模块使用" -msgstr "" -"This domain and path combination is already in use by another APP or module." +msgstr "This domain and path combination is already in use by another APP or module." #: paas_wl/workloads/networking/ingress/serializers.py:52 msgid "内部服务端口列表 ports 不能为空" diff --git a/apiserver/paasng/paas_wl/bk_app/cnative/specs/mounts.py b/apiserver/paasng/paas_wl/bk_app/cnative/specs/mounts.py index 08cf23cbb5..5257d2ca16 100644 --- a/apiserver/paasng/paas_wl/bk_app/cnative/specs/mounts.py +++ b/apiserver/paasng/paas_wl/bk_app/cnative/specs/mounts.py @@ -198,7 +198,7 @@ def create_by_app(self, application_id: str, environment_name: str, **kwargs) -> def delete_by_app(self, application_id: str, source_name: str) -> None: # 删除持久存储资源前，需要确保对应挂载卷资源已被删除 if Mount.objects.filter(source_config=self.build_volume_source(source_name)).exists(): - raise ValidationError(_("删除持久存储资源失败,请先删除相应挂载卷资源")) + raise ValidationError(_("删除持久存储资源失败，请先删除相应挂载卷资源")) app = Application.objects.get(id=application_id) app_envs = app.get_app_envs() diff --git a/apiserver/paasng/paas_wl/workloads/networking/entrance/serializers.py b/apiserver/paasng/paas_wl/workloads/networking/entrance/serializers.py index f6129f03ec..0e08768214 100644 --- a/apiserver/paasng/paas_wl/workloads/networking/entrance/serializers.py +++ b/apiserver/paasng/paas_wl/workloads/networking/entrance/serializers.py @@ -19,7 +19,7 @@ import re from typing import Dict, Optional, Type -from django.utils.translation import gettext as _ +from django.utils.translation import gettext_lazy as _ from rest_framework import serializers from rest_framework.exceptions import ValidationError from rest_framework.serializers import UniqueTogetherValidator diff --git a/apiserver/paasng/support-files/apigw/definition.yaml b/apiserver/paasng/support-files/apigw/definition.yaml index 9a90c6ce7d..6d78148558 100644 --- a/apiserver/paasng/support-files/apigw/definition.yaml +++ b/apiserver/paasng/support-files/apigw/definition.yaml @@ -33,7 +33,7 @@ grant_permissions: - bk_app_code: bk_monitorv3 - bk_app_code: bk_dataweb - bk_app_code: bk_bkdata - - bk_app_code: bk-notice + - bk_app_code: bk_notice strategies: []