github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 用户列表导出部分字段没翻译

pull/6650/head
xinwen 2021-08-16 17:28:47 +08:00 committed by 老广
parent 7b4faccf05
commit 9c7adb7a14
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
apps/locale/zh/LC_MESSAGES/django.mo
View File

Binary file not shown.

20
apps/locale/zh/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n" "Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-08-16 16:27+0800\n" "POT-Creation-Date: 2021-08-16 17:25+0800\n"
"PO-Revision-Date: 2021-05-20 10:54+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n"
"Last-Translator: ibuler <ibuler@qq.com>\n" "Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n" "Language-Team: JumpServer team<ibuler@qq.com>\n"
@ -4215,7 +4215,7 @@ msgstr "Administrator是初始的超级管理员"
msgid "The old password is incorrect" msgid "The old password is incorrect"
msgstr "旧密码错误" msgstr "旧密码错误"
#: users/serializers/profile.py:36 users/serializers/user.py:126 #: users/serializers/profile.py:36 users/serializers/user.py:129
msgid "Password does not match security rules" msgid "Password does not match security rules"
msgstr "密码不满足安全规则" msgstr "密码不满足安全规则"
@ -4292,11 +4292,23 @@ msgstr "超级角色名称"
msgid "Total role name" msgid "Total role name"
msgstr "汇总角色名称" msgstr "汇总角色名称"
#: users/serializers/user.py:112 #: users/serializers/user.py:90
msgid "Is wecom bound"
msgstr "是否绑定了企业微信"
#: users/serializers/user.py:91
msgid "Is dingtalk bound"
msgstr "是否绑定了钉钉"
#: users/serializers/user.py:92
msgid "Is feishu bound"
msgstr "是否绑定了飞书"
#: users/serializers/user.py:115
msgid "Role limit to {}" msgid "Role limit to {}"
msgstr "角色只能为 {}" msgstr "角色只能为 {}"
#: users/serializers/user.py:211 #: users/serializers/user.py:214
msgid "name not unique" msgid "name not unique"
msgstr "名称重复" msgstr "名称重复"

3
apps/users/serializers/user.py
View File

@ -87,6 +87,9 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
'role_display': {'label': _('Super role name')}, 'role_display': {'label': _('Super role name')},
'total_role_display': {'label': _('Total role name')}, 'total_role_display': {'label': _('Total role name')},
'role': {'default': "User"}, 'role': {'default': "User"},
'is_wecom_bound': {'label': _('Is wecom bound')},
'is_dingtalk_bound': {'label': _('Is dingtalk bound')},
'is_feishu_bound': {'label': _('Is feishu bound')},
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):