From 805e9e54be4f562823de9cffcb564397c0787b33 Mon Sep 17 00:00:00 2001 From: rolin999 Date: Thu, 5 Dec 2024 14:56:22 +0800 Subject: [PATCH] style: modify some enum fields in audit (#2007) --- src/bk-user/bkuser/apps/audit/constants.py | 4 +-- src/bk-user/locale/en/LC_MESSAGES/django.po | 28 +++++++++++++------ .../locale/zh_CN/LC_MESSAGES/django.po | 18 +++++++----- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/bk-user/bkuser/apps/audit/constants.py b/src/bk-user/bkuser/apps/audit/constants.py index 05394474d..1d21452fd 100644 --- a/src/bk-user/bkuser/apps/audit/constants.py +++ b/src/bk-user/bkuser/apps/audit/constants.py @@ -26,7 +26,7 @@ class ObjectTypeEnum(StrStructuredEnum): IDP = EnumField("idp", label=_("认证源")) DATA_SOURCE_USER = EnumField("data_source_user", label=_("数据源用户")) TENANT_USER = EnumField("tenant_user", label=_("租户用户")) - DATA_SOURCE_DEPARTMENT = EnumField("data_source_department", label=_("部门")) + DATA_SOURCE_DEPARTMENT = EnumField("data_source_department", label=_("数据源部门")) TENANT_DEPARTMENT = EnumField("tenant_department", label=_("租户部门")) TENANT = EnumField("tenant", label=_("租户")) VIRTUAL_USER = EnumField("virtual_user", label=_("虚拟用户")) @@ -98,5 +98,5 @@ class OperationEnum(StrStructuredEnum): # 虚拟用户 CREATE_VIRTUAL_USER = EnumField("create_virtual_user", label=_("创建虚拟用户")) - MODIFY_VIRTUAL_USER = EnumField("modify_virtual_user", label=_("修改虚拟用户信息")) + MODIFY_VIRTUAL_USER = EnumField("modify_virtual_user", label=_("修改虚拟用户")) DELETE_VIRTUAL_USER = EnumField("delete_virtual_user", label=_("删除虚拟用户")) diff --git a/src/bk-user/locale/en/LC_MESSAGES/django.po b/src/bk-user/locale/en/LC_MESSAGES/django.po index a0e48adb8..8a5933321 100644 --- a/src/bk-user/locale/en/LC_MESSAGES/django.po +++ b/src/bk-user/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-29 15:36+0800\n" +"POT-Creation-Date: 2024-12-05 10:25+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -792,10 +792,9 @@ msgstr "IDP" msgid "数据源用户" msgstr "Data Source User" -#: bkuser/apps/audit/constants.py:29 bkuser/apps/idp/constants.py:39 -#: bkuser/apps/sync/constants.py:80 bkuser/apps/sync/constants.py:90 -msgid "部门" -msgstr "Department" +#: bkuser/apps/audit/constants.py:29 +msgid "数据源部门" +msgstr "Data Source Department" #: bkuser/apps/audit/constants.py:30 msgid "租户部门" @@ -986,7 +985,7 @@ msgid "创建虚拟用户" msgstr "Create virtual user" #: bkuser/apps/audit/constants.py:101 -msgid "修改虚拟用户信息" +msgid "修改虚拟用户" msgstr "Modify virtual user" #: bkuser/apps/audit/constants.py:102 @@ -1035,6 +1034,11 @@ msgstr "Disabled" msgid "用户" msgstr "User" +#: bkuser/apps/idp/constants.py:39 bkuser/apps/sync/constants.py:80 +#: bkuser/apps/sync/constants.py:90 +msgid "部门" +msgstr "Department" + #: bkuser/apps/idp/constants.py:42 msgid "任意" msgstr "Any" @@ -1925,7 +1929,9 @@ msgstr "The number of user Base DNs cannot exceed {}" #: bkuser/plugins/ldap/models.py:88 msgid "用户 Base DN 不可重复或者是其他 DN 的祖先节点(后缀)" -msgstr "The user Base DN cannot be repeated or the ancestor node (suffix) of other DNs." +msgstr "" +"The user Base DN cannot be repeated or the ancestor node (suffix) of other " +"DNs." #: bkuser/plugins/ldap/models.py:91 msgid "需要提供部门对象类" @@ -1941,7 +1947,9 @@ msgstr "The number of department Base DNs cannot exceed {}" #: bkuser/plugins/ldap/models.py:100 msgid "部门 Base DN 不可重复或者是其他 DN 的祖先节点(后缀)" -msgstr "The department Base DN cannot be repeated or the ancestor node (suffix) of other DNs." +msgstr "" +"The department Base DN cannot be repeated or the ancestor node (suffix) of " +"other DNs." #: bkuser/plugins/ldap/models.py:123 msgid "需要提供用户组对象类" @@ -1957,7 +1965,9 @@ msgstr "The number of user group Base DNs cannot exceed {}" #: bkuser/plugins/ldap/models.py:132 msgid "用户组 Base DN 不可重复或者是其他 DN 的祖先节点(后缀)" -msgstr "The user group Base DN cannot be repeated or the ancestor node (suffix) of other DNs." +msgstr "" +"The user group Base DN cannot be repeated or the ancestor node (suffix) of " +"other DNs." #: bkuser/plugins/ldap/models.py:135 msgid "用户组对象类为 groupOfNames 时,成员字段应为 member" diff --git a/src/bk-user/locale/zh_CN/LC_MESSAGES/django.po b/src/bk-user/locale/zh_CN/LC_MESSAGES/django.po index 5a8c806c4..25f7016db 100644 --- a/src/bk-user/locale/zh_CN/LC_MESSAGES/django.po +++ b/src/bk-user/locale/zh_CN/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-30 16:39+0800\n" +"POT-Creation-Date: 2024-12-05 10:25+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -734,10 +734,9 @@ msgstr "认证源" msgid "数据源用户" msgstr "数据源用户" -#: bkuser/apps/audit/constants.py:29 bkuser/apps/idp/constants.py:39 -#: bkuser/apps/sync/constants.py:80 bkuser/apps/sync/constants.py:90 -msgid "部门" -msgstr "部门" +#: bkuser/apps/audit/constants.py:29 +msgid "数据源部门" +msgstr "数据源部门" #: bkuser/apps/audit/constants.py:30 msgid "租户部门" @@ -928,8 +927,8 @@ msgid "创建虚拟用户" msgstr "创建虚拟用户" #: bkuser/apps/audit/constants.py:101 -msgid "修改虚拟用户信息" -msgstr "修改虚拟用户信息" +msgid "修改虚拟用户" +msgstr "修改虚拟用户" #: bkuser/apps/audit/constants.py:102 msgid "删除虚拟用户" @@ -977,6 +976,11 @@ msgstr "未启用" msgid "用户" msgstr "用户" +#: bkuser/apps/idp/constants.py:39 bkuser/apps/sync/constants.py:80 +#: bkuser/apps/sync/constants.py:90 +msgid "部门" +msgstr "部门" + #: bkuser/apps/idp/constants.py:42 msgid "任意" msgstr "任意"