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

Merge pull request #9397 from jumpserver/pr@dev@perf_code_i18n 

perf: 修改 i18n
pull/9399/head
老广 2023-02-02 10:23:17 +08:00 committed by GitHub
parent 758d6ae81b 853f9c422d
commit f68dde456d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/serializers/asset/common.py
View File

@ -6,7 +6,7 @@ from django.db.transaction import atomic
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers from rest_framework import serializers
from accounts.models import Account, AccountTemplate from accounts.models import Account
from accounts.serializers import AccountSerializerCreateValidateMixin from accounts.serializers import AccountSerializerCreateValidateMixin
from common.serializers import WritableNestedModelSerializer, SecretReadableMixin, CommonModelSerializer from common.serializers import WritableNestedModelSerializer, SecretReadableMixin, CommonModelSerializer
from common.serializers.fields import LabeledChoiceField from common.serializers.fields import LabeledChoiceField

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

@ -6381,7 +6381,7 @@ msgstr "登录被阻塞"
#: users/serializers/user.py:93 #: users/serializers/user.py:93
msgid "Can public key authentication" msgid "Can public key authentication"
msgstr "能否公钥认证" msgstr "公钥认证"
#: users/serializers/user.py:162 #: users/serializers/user.py:162
msgid "Avatar url" msgid "Avatar url"

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

@ -96,11 +96,8 @@ class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, serializer
read_only=True read_only=True
) )
password = EncryptedField( password = EncryptedField(
label=_("Password"), label=_("Password"), required=False, allow_blank=True,
required=False, allow_null=True, max_length=1024,
allow_blank=True,
allow_null=True,
max_length=1024,
) )
custom_m2m_fields = { custom_m2m_fields = {
"system_roles": [BuiltinRole.system_user], "system_roles": [BuiltinRole.system_user],
@ -129,10 +126,8 @@ class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, serializer
] ]
# 包含不太常用的字段，可以没有 # 包含不太常用的字段，可以没有
fields_verbose = fields_small + [ fields_verbose = fields_small + [
"mfa_force_enabled", "mfa_force_enabled", "is_first_login",
"is_first_login", "date_password_last_updated", "avatar_url",
"date_password_last_updated",
"avatar_url",
] ]
# 外键的字段 # 外键的字段
fields_fk = [] fields_fk = []