Skip to content

Commit

Permalink
style: modify some enum fields in audit (#2007)
Browse files Browse the repository at this point in the history
  • Loading branch information
rolin999 authored Dec 5, 2024
1 parent 22953a8 commit 805e9e5
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/bk-user/bkuser/apps/audit/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -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=_("虚拟用户"))
Expand Down Expand Up @@ -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=_("删除虚拟用户"))
28 changes: 19 additions & 9 deletions src/bk-user/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -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 "租户部门"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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 "需要提供部门对象类"
Expand All @@ -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 "需要提供用户组对象类"
Expand All @@ -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"
Expand Down
18 changes: 11 additions & 7 deletions src/bk-user/locale/zh_CN/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -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 "租户部门"
Expand Down Expand Up @@ -928,8 +927,8 @@ msgid "创建虚拟用户"
msgstr "创建虚拟用户"

#: bkuser/apps/audit/constants.py:101
msgid "修改虚拟用户信息"
msgstr "修改虚拟用户信息"
msgid "修改虚拟用户"
msgstr "修改虚拟用户"

#: bkuser/apps/audit/constants.py:102
msgid "删除虚拟用户"
Expand Down Expand Up @@ -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 "任意"
Expand Down

0 comments on commit 805e9e5

Please sign in to comment.