From e43ffa7994dfe2c2d061401513426889c3624535 Mon Sep 17 00:00:00 2001 From: xinwen Date: Wed, 14 Apr 2021 17:54:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=9C=E7=A8=8B=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/applications/serializers/application.py | 4 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 74611 -> 74719 bytes apps/locale/zh/LC_MESSAGES/django.po | 59 +++++++++++-------- 3 files changed, 35 insertions(+), 28 deletions(-) diff --git a/apps/applications/serializers/application.py b/apps/applications/serializers/application.py index f6bb60516..580ce9a12 100644 --- a/apps/applications/serializers/application.py +++ b/apps/applications/serializers/application.py @@ -44,8 +44,8 @@ class ApplicationSerializerMixin(serializers.Serializer): class ApplicationSerializer(ApplicationSerializerMixin, BulkOrgResourceModelSerializer): - category_display = serializers.ReadOnlyField(source='get_category_display', label=_('Category')) - type_display = serializers.ReadOnlyField(source='get_type_display', label=_('Type')) + category_display = serializers.ReadOnlyField(source='get_category_display', label=_('Category(Display)')) + type_display = serializers.ReadOnlyField(source='get_type_display', label=_('Type(Dispaly)')) class Meta: model = models.Application diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 674b2022a5aa99d057dc11ad7164aed4ac01eeec..4e146d83b81d1f910f5ed64ed4565a09bf68c181 100644 GIT binary patch delta 21781 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index c5a272651..49694c4a0 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-14 16:04+0800\n" +"POT-Creation-Date: 2021-04-14 17:52+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -177,8 +177,8 @@ msgid "" "192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, 2001:db8:2de::e13, 2001:" "db8:1a:1110::/64 " msgstr "" -"格式为逗号分隔的字符串, * 表示匹配所有。例如: 192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, 2001:db8:2de::e13, " -"2001:db8:1a:1110::/64" +"格式为逗号分隔的字符串, * 表示匹配所有。例如: 192.168.10.1, 192.168.1.0/24, " +"10.1.1.1-10.1.1.20, 2001:db8:2de::e13, 2001:db8:1a:1110::/64" #: acls/serializers/login_acl.py:30 acls/serializers/login_asset_acl.py:31 #: applications/serializers/attrs/application_type/mysql_workbench.py:18 @@ -204,7 +204,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. " #: applications/serializers/attrs/application_type/mysql_workbench.py:30 #: applications/serializers/attrs/application_type/vmware_client.py:26 #: assets/models/base.py:251 assets/models/gathered_user.py:15 -#: audits/models.py:99 authentication/forms.py:15 authentication/forms.py:17 +#: audits/models.py:100 authentication/forms.py:15 authentication/forms.py:17 #: ops/models/adhoc.py:148 users/forms/profile.py:31 users/models/user.py:528 #: users/templates/users/_select_user_modal.html:14 #: users/templates/users/user_detail.html:53 @@ -222,8 +222,8 @@ msgid "" "192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, 2001:db8:2de::e13, 2001:" "db8:1a:1110::/64 (Domain name support)" msgstr "" -"格式为逗号分隔的字符串, * 表示匹配所有。例如: 192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, 2001:db8:2de::e13, " -"2001:db8:1a:1110::/64 （支持网域）" +"格式为逗号分隔的字符串, * 表示匹配所有。例如: 192.168.10.1, 192.168.1.0/24, " +"10.1.1.1-10.1.1.20, 2001:db8:2de::e13, 2001:db8:1a:1110::/64 （支持网域）" #: acls/serializers/login_asset_acl.py:35 assets/models/asset.py:184 #: assets/serializers/asset_user.py:45 assets/serializers/gathered_user.py:20 @@ -273,8 +273,7 @@ msgstr "远程应用" msgid "Custom" msgstr "自定义" -#: applications/models/application.py:13 -#: applications/serializers/application.py:47 assets/models/label.py:21 +#: applications/models/application.py:13 assets/models/label.py:21 #: perms/models/application_permission.py:20 #: perms/serializers/application/permission.py:16 #: perms/serializers/application/user_permission.py:33 @@ -282,8 +281,7 @@ msgstr "自定义" msgid "Category" msgstr "类别" -#: applications/models/application.py:16 -#: applications/serializers/application.py:48 assets/models/cmd_filter.py:52 +#: applications/models/application.py:16 assets/models/cmd_filter.py:52 #: perms/models/application_permission.py:23 #: perms/serializers/application/permission.py:17 #: perms/serializers/application/user_permission.py:34 @@ -303,6 +301,14 @@ msgstr "网域" msgid "Attrs" msgstr "" +#: applications/serializers/application.py:47 +msgid "Category(Display)" +msgstr "类别 (显示名称)" + +#: applications/serializers/application.py:48 +msgid "Type(Dispaly)" +msgstr "类型 (显示名称)" + #: applications/serializers/attrs/application_category/cloud.py:9 #: assets/models/cluster.py:40 msgid "Cluster" @@ -1082,7 +1088,7 @@ msgstr "操作" msgid "Filename" msgstr "文件名" -#: audits/models.py:42 audits/models.py:95 +#: audits/models.py:42 audits/models.py:96 #: users/templates/users/user_detail.html:487 msgid "Success" msgstr "成功" @@ -1136,42 +1142,42 @@ msgstr "日期" msgid "Change by" msgstr "修改者" -#: audits/models.py:89 users/templates/users/user_detail.html:84 +#: audits/models.py:90 users/templates/users/user_detail.html:84 msgid "Disabled" msgstr "禁用" -#: audits/models.py:90 settings/models.py:33 +#: audits/models.py:91 settings/models.py:33 #: users/templates/users/user_detail.html:82 msgid "Enabled" msgstr "启用" -#: audits/models.py:91 +#: audits/models.py:92 msgid "-" msgstr "" -#: audits/models.py:96 xpack/plugins/cloud/const.py:25 +#: audits/models.py:97 xpack/plugins/cloud/const.py:25 msgid "Failed" msgstr "失败" -#: audits/models.py:100 +#: audits/models.py:101 msgid "Login type" msgstr "登录方式" -#: audits/models.py:101 +#: audits/models.py:102 #: tickets/serializers/ticket/meta/ticket_type/login_confirm.py:14 msgid "Login ip" msgstr "登录IP" -#: audits/models.py:102 +#: audits/models.py:103 #: tickets/serializers/ticket/meta/ticket_type/login_confirm.py:17 msgid "Login city" msgstr "登录城市" -#: audits/models.py:103 audits/serializers.py:38 +#: audits/models.py:104 audits/serializers.py:38 msgid "User agent" msgstr "用户代理" -#: audits/models.py:104 +#: audits/models.py:105 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 #: authentication/templates/authentication/login_otp.html:6 #: users/forms/profile.py:64 users/models/user.py:552 @@ -1180,21 +1186,21 @@ msgstr "用户代理" msgid "MFA" msgstr "多因子认证" -#: audits/models.py:105 xpack/plugins/change_auth_plan/models.py:303 +#: audits/models.py:106 xpack/plugins/change_auth_plan/models.py:303 #: xpack/plugins/cloud/models.py:161 msgid "Reason" msgstr "原因" -#: audits/models.py:106 tickets/models/ticket.py:47 +#: audits/models.py:107 tickets/models/ticket.py:47 #: xpack/plugins/cloud/models.py:157 xpack/plugins/cloud/models.py:206 msgid "Status" msgstr "状态" -#: audits/models.py:107 +#: audits/models.py:108 msgid "Date login" msgstr "登录日期" -#: audits/models.py:108 +#: audits/models.py:109 msgid "Authentication backend" msgstr "认证方式" @@ -1372,12 +1378,13 @@ msgid "" msgstr "账号已被锁定（请联系管理员解锁 或 {}分钟后重试）" #: authentication/errors.py:60 +#, python-brace-format msgid "" "MFA code invalid, or ntp sync server time, You can also try {times_try} " "times (The account will be temporarily locked for {block_time} minutes)" msgstr "" -"MFA验证码不正确，或者服务器端时间不对。 您还可以尝试 {times_try} 次（账号将" -"被临时 锁定 {block_time} 分钟）" +"MFA验证码不正确，或者服务器端时间不对。 您还可以尝试 {times_try} 次（账号将被" +"临时 锁定 {block_time} 分钟）" #: authentication/errors.py:65 msgid "MFA required" -- GitLab