From 5daca6592bd25c1bb40ea22ca191f687a28b8b37 Mon Sep 17 00:00:00 2001 From: Bai Date: Fri, 4 Jun 2021 11:14:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88=20?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=20->=20=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/serializers/asset_user.py | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 75515 -> 75494 bytes apps/locale/zh/LC_MESSAGES/django.po | 35 +++----------------------- apps/users/models/user.py | 2 +- 4 files changed, 6 insertions(+), 33 deletions(-) diff --git a/apps/assets/serializers/asset_user.py b/apps/assets/serializers/asset_user.py index 90145399f..6552281c6 100644 --- a/apps/assets/serializers/asset_user.py +++ b/apps/assets/serializers/asset_user.py @@ -47,7 +47,7 @@ class AssetUserReadSerializer(AssetUserWriteSerializer): ip = serializers.CharField(read_only=True, label=_("IP")) asset = serializers.CharField(source='asset_id', label=_('Asset')) backend = serializers.CharField(read_only=True, label=_("Backend")) - backend_display = serializers.CharField(read_only=True, label=_("Backend (Display)")) + backend_display = serializers.CharField(read_only=True, label=_("Source")) class Meta(AssetUserWriteSerializer.Meta): read_only_fields = ( diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 562853c5ed03958ff5cc4444f0131527efcd9509..d5940b932d0d1b4e0a655e25c4605507d71bae46 100644 GIT binary patch delta 20409 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 HF3JA^D3R?_ delta 20438 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 46b53a6ae..af2cbcc87 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-02 16:58+0800\n" +"POT-Creation-Date: 2021-06-04 11:11+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -819,8 +819,8 @@ msgid "Backend" msgstr "后端" #: assets/serializers/asset_user.py:50 -msgid "Backend (Display)" -msgstr "后端 (显示名称)" +msgid "Source" +msgstr "来源" #: assets/serializers/asset_user.py:81 users/forms/profile.py:160 #: users/models/user.py:580 users/templates/users/user_password_update.html:48 @@ -3899,7 +3899,7 @@ msgid "Wechat" msgstr "微信" #: users/models/user.py:596 -msgid "Source" +msgid "User source" msgstr "用户来源" #: users/models/user.py:600 @@ -5057,30 +5057,3 @@ msgstr "旗舰版" #: xpack/plugins/license/models.py:77 msgid "Community edition" msgstr "社区版" - -#~ msgid "{} is required" -#~ msgstr "{} 字段是必填项" - -#~ msgid "AppSecret is required" -#~ msgstr "AppSecret 是必须的" - -#~ msgid "Corporation ID(corpid)" -#~ msgstr "企业 ID(CorpId)" - -#~ msgid "Agent ID(agentid)" -#~ msgstr "应用 ID(AgentId)" - -#~ msgid "Secret(secret)" -#~ msgstr "秘钥(secret)" - -#~ msgid "AgentId" -#~ msgstr "应用 ID(AgentId)" - -#~ msgid "AppKey" -#~ msgstr "应用 Key(AppKey)" - -#~ msgid "AppSecret" -#~ msgstr "应用密文(AppSecret)" - -#~ msgid "No" -#~ msgstr "无" diff --git a/apps/users/models/user.py b/apps/users/models/user.py index 6f5b52f14..69d0318eb 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -593,7 +593,7 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser): source = models.CharField( max_length=30, default=Source.local, choices=Source.choices, - verbose_name=_('Source') + verbose_name=_('User source') ) date_password_last_updated = models.DateTimeField( auto_now_add=True, blank=True, null=True,