Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: adjust locale from zh_cn to zh_CN #1997

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bk-user/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ test: ## 执行项目单元测试(pytest)
pytest --maxfail=1 -l --reuse-db tests --disable-warnings -vv

i18n-po: ## 将源代码 & 模版中的 message 采集到 django.po
python manage.py makemessages -d django -l zh_cn -e html,part -e py
python manage.py makemessages -d django -l zh_CN -e html,part -e py
python manage.py makemessages -d django -l en -e html,part -e py

i18n-mo: ## 将 django.po 文件编译成 django.mo 文件
Expand Down
150 changes: 75 additions & 75 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-27 18:14+0800\n"
"POT-Creation-Date: 2024-11-29 11:34+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 @@ -178,45 +178,45 @@ msgstr "The file to be imported must not exceed {} M in size"
msgid "出于安全考虑,全量导入模式暂不可用"
msgstr "Full import mode is temporarily unavailable for security reasons"

#: bkuser/apis/web/data_source/views.py:242
#: bkuser/apis/web/data_source/views.py:232
msgid "仅可更新实体类型数据源配置"
msgstr "Only configurations of real type data sources can be updated"

#: bkuser/apis/web/data_source/views.py:292
#: bkuser/apis/web/data_source/views.py:272
msgid "仅可重置实体类型数据源"
msgstr "Only real type data sources can be reset"

#: bkuser/apis/web/data_source/views.py:473
#: bkuser/apis/web/data_source/views.py:435
msgid "仅实体类型的本地数据源有提供导入模板"
msgstr "Only local data sources of real type provide import templates"

#: bkuser/apis/web/data_source/views.py:495
#: bkuser/apis/web/data_source/views.py:457
msgid "仅能导出实体类型的本地数据源数据"
msgstr "Only data from local real type data sources can be exported"

#: bkuser/apis/web/data_source/views.py:520
#: bkuser/apis/web/data_source/views.py:482
msgid "仅实体类型的本地数据源支持导入功能"
msgstr "Only local real type data sources support import functions"

#: bkuser/apis/web/data_source/views.py:527
#: bkuser/apis/web/data_source/views.py:489
msgid "文件格式异常"
msgstr "File format exception"

#: bkuser/apis/web/data_source/views.py:577
#: bkuser/apis/web/data_source/views.py:534
msgid "本地数据源不支持同步,请使用导入功能"
msgstr ""
"Local data source does not support synchronization, please use the import "
"function"

#: bkuser/apis/web/data_source/views.py:580
#: bkuser/apis/web/data_source/views.py:537
msgid "仅实体类型的数据源支持同步"
msgstr "Only real type data sources support synchronization"

#: bkuser/apis/web/data_source/views.py:632 bkuser/common/error_codes.py:93
#: bkuser/apis/web/data_source/views.py:584 bkuser/common/error_codes.py:93
msgid "数据源不存在"
msgstr "Data source does not exist"

#: bkuser/apis/web/data_source/views.py:635
#: bkuser/apis/web/data_source/views.py:587
msgid "仅实体类型的数据源有同步记录"
msgstr "Only real type data sources have synchronization records"

Expand Down Expand Up @@ -446,46 +446,46 @@ msgstr ""
msgid "数据类型:{}"
msgstr "Data type: {}"

#: bkuser/apis/web/organization/views/users.py:309
#: bkuser/apis/web/organization/views/users.py:318
msgid "仅可创建属于当前租户的用户"
msgstr "Only users belonging to the current tenant can be created"

#: bkuser/apis/web/organization/views/users.py:469
#: bkuser/apis/web/organization/views/users.py:478
msgid "仅本地实名数据源支持更新用户信息"
msgstr "Only local real-name data sources support updating user information"

#: bkuser/apis/web/organization/views/users.py:472
#: bkuser/apis/web/organization/views/users.py:481
msgid "仅可更新非协同产生的租户用户"
msgstr "Only tenant users not created through collaboration can be updated"

#: bkuser/apis/web/organization/views/users.py:489
#: bkuser/apis/web/organization/views/users.py:498
msgid "当前用户不允许更新用户名"
msgstr "The current user is not allowed to update the username"

#: bkuser/apis/web/organization/views/users.py:531
#: bkuser/apis/web/organization/views/users.py:548
msgid "仅本地实名数据源支持删除用户"
msgstr "Only local real-name data sources support deleting users"

#: bkuser/apis/web/organization/views/users.py:534
#: bkuser/apis/web/organization/views/users.py:551
msgid "仅可删除非协同产生的租户用户"
msgstr "Only tenant users not created through collaboration can be deleted"

#: bkuser/apis/web/organization/views/users.py:611
#: bkuser/apis/web/organization/views/users.py:646
msgid "该租户用户没有可用的密码规则"
msgstr "There are no available password rules for this tenant user"

#: bkuser/apis/web/organization/views/users.py:648
#: bkuser/apis/web/organization/views/users.py:683
#: bkuser/apis/web/personal_center/views.py:517
msgid "仅可以重置 已经启用密码功能 的 本地数据源 的用户密码"
msgstr ""
"Password can only be reset for users of local data sources with the password "
"function enabled"

#: bkuser/apis/web/organization/views/users.py:776
#: bkuser/apis/web/organization/views/users.py:825
msgid "指定的租户部门不存在"
msgstr "The specified tenant department does not exist"

#: bkuser/apis/web/organization/views/users.py:1104
#: bkuser/apis/web/organization/views/users.py:1203
msgid "当前数据源未启用密码功能"
msgstr "Current data source has not enabled password functionality"

Expand Down Expand Up @@ -648,12 +648,12 @@ msgstr "Tenant ID {} is already in use"

#: bkuser/apis/web/platform_management/serializers.py:111
msgid ""
"{} 不符合 租户 ID 的命名规范: 由3-32位小写字母、数字、连接符(-)字符组成,以小写字母开"
",小写字母或数字结尾"
"{} 不符合 租户 ID 的命名规范: 由3-32位小写字母、数字、连接符(-)字符组成,以小"
"写字母开头,小写字母或数字结尾"
msgstr ""
"{} does not meet the naming requirements for Tenant ID: must be composed of "
"3-32 lowercase letters, digits, or hyphens (-), starting with a lowercase letter and ending with "
"a lowercase letter or digit"
"3-32 lowercase letters, digits, or hyphens (-), starting with a lowercase "
"letter and ending with a lowercase letter or digit"

#: bkuser/apis/web/platform_management/serializers.py:124
msgid "密码不符合密码规则:{}"
Expand Down Expand Up @@ -821,151 +821,151 @@ msgstr "Delete data source"
msgid "同步数据源"
msgstr "Sync data source"

#: bkuser/apps/audit/constants.py:43
#: bkuser/apps/audit/constants.py:44
msgid "创建认证源"
msgstr "Create idp"

#: bkuser/apps/audit/constants.py:44
#: bkuser/apps/audit/constants.py:45
msgid "修改认证源"
msgstr "Modify idp"

#: bkuser/apps/audit/constants.py:45
#: bkuser/apps/audit/constants.py:46
msgid "修改认证源状态"
msgstr "Modify status of idp"

#: bkuser/apps/audit/constants.py:46
#: bkuser/apps/audit/constants.py:47
msgid "删除认证源"
msgstr "Delete idp"

#: bkuser/apps/audit/constants.py:48
#: bkuser/apps/audit/constants.py:50
msgid "创建数据源用户"
msgstr "Create data source user"

#: bkuser/apps/audit/constants.py:49
#: bkuser/apps/audit/constants.py:51
msgid "创建租户用户"
msgstr "Create tenant user"

#: bkuser/apps/audit/constants.py:50
#: bkuser/apps/audit/constants.py:52
msgid "创建用户-上级关系"
msgstr "Create user-leader relations"

#: bkuser/apps/audit/constants.py:51
#: bkuser/apps/audit/constants.py:53
msgid "创建用户-部门关系"
msgstr "Create user-department relations"

#: bkuser/apps/audit/constants.py:52
#: bkuser/apps/audit/constants.py:54
msgid "创建协同租户用户"
msgstr "Create collaboration tenant user"

#: bkuser/apps/audit/constants.py:54
#: bkuser/apps/audit/constants.py:56
msgid "修改数据源用户"
msgstr "Modify data source user"

#: bkuser/apps/audit/constants.py:55
#: bkuser/apps/audit/constants.py:57
msgid "修改租户用户"
msgstr "Modify tenant user"

#: bkuser/apps/audit/constants.py:56
#: bkuser/apps/audit/constants.py:58
msgid "修改用户-上级关系"
msgstr "Modify user-leader relations"

#: bkuser/apps/audit/constants.py:57
#: bkuser/apps/audit/constants.py:59
msgid "修改用户-部门关系"
msgstr "Modify user-department relations"

#: bkuser/apps/audit/constants.py:59
msgid "删除数据源用户"
msgstr "Delete data source user"

#: bkuser/apps/audit/constants.py:60
msgid "删除租户用户"
msgstr "Delete tenant user"
msgid "修改用户状态"
msgstr "Modify the user's status"

#: bkuser/apps/audit/constants.py:61
msgid "删除用户-上级关系"
msgstr "Delete user-leader relations"
msgid "修改用户账号过期时间"
msgstr "Modify the expiration time of the user account"

#: bkuser/apps/audit/constants.py:62
msgid "删除用户-部门关系"
msgstr "Delete user-department relations"
msgid "重置用户密码"
msgstr "Reset user's password"

#: bkuser/apps/audit/constants.py:63
msgid "删除协同租户用户"
msgstr "Delete collaboration tenant user"
msgid "修改用户邮箱"
msgstr "Modify the user's email"

#: bkuser/apps/audit/constants.py:65
msgid "修改用户状态"
msgstr "Modify the user's status"
#: bkuser/apps/audit/constants.py:64
msgid "修改用户电话号码"
msgstr "Modify the user's phone number"

#: bkuser/apps/audit/constants.py:66
msgid "修改用户账号过期时间"
msgstr "Modify the expiration time of the user account"
msgid "删除数据源用户"
msgstr "Delete data source user"

#: bkuser/apps/audit/constants.py:67
msgid "重置用户密码"
msgstr "Reset user's password"
msgid "删除租户用户"
msgstr "Delete tenant user"

#: bkuser/apps/audit/constants.py:68
msgid "修改用户邮箱"
msgstr "Modify the user's email"
msgid "删除用户-上级关系"
msgstr "Delete user-leader relations"

#: bkuser/apps/audit/constants.py:69
msgid "修改用户电话号码"
msgstr "Modify the user's phone number"
msgid "删除用户-部门关系"
msgstr "Delete user-department relations"

#: bkuser/apps/audit/constants.py:71
#: bkuser/apps/audit/constants.py:70
msgid "删除协同租户用户"
msgstr "Delete collaboration tenant user"

#: bkuser/apps/audit/constants.py:73
msgid "创建部门"
msgstr "Create department"

#: bkuser/apps/audit/constants.py:72
#: bkuser/apps/audit/constants.py:74
msgid "修改部门名称"
msgstr "Modify the name of department"

#: bkuser/apps/audit/constants.py:73
#: bkuser/apps/audit/constants.py:75
msgid "删除部门"
msgstr "Delete department"

#: bkuser/apps/audit/constants.py:74
#: bkuser/apps/audit/constants.py:76
msgid "修改上级部门"
msgstr "Modify the superior department"

#: bkuser/apps/audit/constants.py:76
#: bkuser/apps/audit/constants.py:79
msgid "创建租户"
msgstr "Create tenant"

#: bkuser/apps/audit/constants.py:77
#: bkuser/apps/audit/constants.py:80
msgid "修改租户信息"
msgstr "Modify tenant"

#: bkuser/apps/audit/constants.py:78
#: bkuser/apps/audit/constants.py:81
msgid "删除租户"
msgstr "Delete tenant"

#: bkuser/apps/audit/constants.py:79
#: bkuser/apps/audit/constants.py:82
msgid "修改租户状态"
msgstr "Modify the status of tenant"

#: bkuser/apps/audit/constants.py:80
#: bkuser/apps/audit/constants.py:83
msgid "创建租户实名管理员"
msgstr "Create real manager of tenant"

#: bkuser/apps/audit/constants.py:81
#: bkuser/apps/audit/constants.py:84
msgid "删除租户实名管理员"
msgstr "Delete real manager of tenant"

#: bkuser/apps/audit/constants.py:83
#: bkuser/apps/audit/constants.py:86
msgid "修改租户账户有效期配置"
msgstr "Modify the validity period config of tenant account"

#: bkuser/apps/audit/constants.py:86
#: bkuser/apps/audit/constants.py:90
msgid "创建虚拟用户"
msgstr "Create virtual user"

#: bkuser/apps/audit/constants.py:87
#: bkuser/apps/audit/constants.py:91
msgid "修改虚拟用户信息"
msgstr "Modify virtual user"

#: bkuser/apps/audit/constants.py:88
#: bkuser/apps/audit/constants.py:92
msgid "删除虚拟用户"
msgstr "Delete virtual user"

Expand Down
Loading