From 7b4faccf05608ede406011211a7b43539e833e8d Mon Sep 17 00:00:00 2001 From: xinwen Date: Mon, 16 Aug 2021 15:55:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A3=9E=E4=B9=A6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/authentication/views/feishu.py | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 81793 -> 81825 bytes apps/locale/zh/LC_MESSAGES/django.po | 69 +++++++++++++++------------ 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/apps/authentication/views/feishu.py b/apps/authentication/views/feishu.py index 2db1404d7..33f503c0d 100644 --- a/apps/authentication/views/feishu.py +++ b/apps/authentication/views/feishu.py @@ -202,7 +202,7 @@ class FeiShuQRLoginCallbackView(AuthMixin, FeiShuQRMixin, View): user = get_object_or_none(User, feishu_id=user_id) if user is None: title = _('FeiShu is not bound') - msg = _('Please login with a password and then bind the WeCom') + msg = _('Please login with a password and then bind the FeiShu') response = self.get_failed_reponse(login_url, title=title, msg=msg) return response diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 7fca22dce84cbfaa97441fa9c37139a55b79d2ed..c39c1ba29ea1b569d461241154e10e14a92b7d4c 100644 GIT binary patch delta 21834 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 G&;396U)6E| diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 6736d2761..652e1697b 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-08-12 10:27+0800\n" +"POT-Creation-Date: 2021-08-16 16:27+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -172,7 +172,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. " #: acls/serializers/login_asset_acl.py:17 #: acls/serializers/login_asset_acl.py:51 -#: applications/serializers/application.py:71 +#: applications/serializers/application.py:72 #: applications/serializers/attrs/application_type/chrome.py:20 #: applications/serializers/attrs/application_type/custom.py:21 #: applications/serializers/attrs/application_type/mysql_workbench.py:30 @@ -252,7 +252,7 @@ msgid "Applications" msgstr "应用管理" #: applications/models/application.py:168 -#: applications/serializers/application.py:78 assets/models/label.py:21 +#: applications/serializers/application.py:79 assets/models/label.py:21 #: perms/models/application_permission.py:20 #: perms/serializers/application/user_permission.py:33 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:20 @@ -260,7 +260,7 @@ msgid "Category" msgstr "类别" #: applications/models/application.py:171 -#: applications/serializers/application.py:80 assets/models/cmd_filter.py:53 +#: applications/serializers/application.py:81 assets/models/cmd_filter.py:53 #: assets/models/user.py:202 perms/models/application_permission.py:23 #: perms/serializers/application/user_permission.py:34 #: terminal/models/storage.py:55 terminal/models/storage.py:116 @@ -279,14 +279,14 @@ msgid "Attrs" msgstr "" #: applications/serializers/application.py:48 -#: applications/serializers/application.py:79 assets/serializers/label.py:13 +#: applications/serializers/application.py:80 assets/serializers/label.py:13 #: perms/serializers/application/permission.py:16 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:24 msgid "Category display" msgstr "类别名称" #: applications/serializers/application.py:49 -#: applications/serializers/application.py:81 +#: applications/serializers/application.py:82 #: assets/serializers/system_user.py:26 audits/serializers.py:29 #: perms/serializers/application/permission.py:17 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:31 @@ -294,8 +294,12 @@ msgstr "类别名称" msgid "Type display" msgstr "类型名称" -#: applications/serializers/application.py:72 -#: applications/serializers/application.py:100 +#: applications/serializers/application.py:71 +msgid "Id" +msgstr "" + +#: applications/serializers/application.py:73 +#: applications/serializers/application.py:101 #: applications/serializers/attrs/application_type/chrome.py:23 #: applications/serializers/attrs/application_type/custom.py:25 #: applications/serializers/attrs/application_type/mysql_workbench.py:34 @@ -314,7 +318,7 @@ msgstr "类型名称" msgid "Password" msgstr "密码" -#: applications/serializers/application.py:73 assets/models/authbook.py:16 +#: applications/serializers/application.py:74 assets/models/authbook.py:16 #: assets/models/user.py:277 audits/models.py:39 #: perms/models/application_permission.py:31 #: perms/models/asset_permission.py:101 templates/_nav.html:45 @@ -329,19 +333,19 @@ msgstr "密码" msgid "System user" msgstr "系统用户" -#: applications/serializers/application.py:74 assets/serializers/account.py:31 +#: applications/serializers/application.py:75 assets/serializers/account.py:31 msgid "System user display" msgstr "系统用户名称" -#: applications/serializers/application.py:75 +#: applications/serializers/application.py:76 msgid "App" msgstr "应用" -#: applications/serializers/application.py:76 +#: applications/serializers/application.py:77 msgid "Union id" msgstr "联合ID" -#: applications/serializers/application.py:77 +#: applications/serializers/application.py:78 msgid "Application name" msgstr "应用名称" @@ -1711,7 +1715,7 @@ msgstr "CAS" #: authentication/templates/authentication/login.html:220 #: notifications/backends/__init__.py:16 msgid "FeiShu" -msgstr "" +msgstr "飞书" #: authentication/templates/authentication/login_otp.html:17 msgid "One-time password" @@ -1758,7 +1762,7 @@ msgstr "钉钉错误,请联系系统管理员" msgid "DingTalk Error" msgstr "钉钉错误" -#: authentication/views/dingtalk.py:56 authentication/views/feishu.py:55 +#: authentication/views/dingtalk.py:56 authentication/views/feishu.py:52 #: authentication/views/wecom.py:56 msgid "You've been hacked" msgstr "你被攻击了" @@ -1767,7 +1771,7 @@ msgstr "你被攻击了" msgid "DingTalk is already bound" msgstr "钉钉已经绑定" -#: authentication/views/dingtalk.py:105 authentication/views/feishu.py:102 +#: authentication/views/dingtalk.py:105 authentication/views/feishu.py:99 #: authentication/views/wecom.py:104 msgid "Please verify your password first" msgstr "请检查密码" @@ -1797,8 +1801,7 @@ msgstr "从钉钉获取用户失败" msgid "DingTalk is not bound" msgstr "钉钉没有绑定" -#: authentication/views/dingtalk.py:218 authentication/views/feishu.py:208 -#: authentication/views/wecom.py:216 +#: authentication/views/dingtalk.py:218 authentication/views/wecom.py:216 msgid "Please login with a password and then bind the WeCom" msgstr "请使用密码登录,然后绑定企业微信" @@ -1807,39 +1810,39 @@ msgid "Binding DingTalk failed" msgstr "绑定钉钉失败" #: authentication/views/feishu.py:40 -msgid "FeiShu Error, Please contact your system administrator" -msgstr "飞书错误,请联系系统管理员" - -#: authentication/views/feishu.py:43 msgid "FeiShu Error" msgstr "飞书错误" -#: authentication/views/feishu.py:89 +#: authentication/views/feishu.py:86 msgid "FeiShu is already bound" msgstr "飞书已经绑定" -#: authentication/views/feishu.py:136 +#: authentication/views/feishu.py:133 msgid "FeiShu query user failed" msgstr "飞书查询用户失败" -#: authentication/views/feishu.py:145 +#: authentication/views/feishu.py:142 msgid "The FeiShu is already bound to another user" msgstr "该飞书已经绑定其他用户" -#: authentication/views/feishu.py:150 authentication/views/feishu.py:232 -#: authentication/views/feishu.py:233 +#: authentication/views/feishu.py:147 authentication/views/feishu.py:229 +#: authentication/views/feishu.py:230 msgid "Binding FeiShu successfully" msgstr "绑定 飞书 成功" -#: authentication/views/feishu.py:201 +#: authentication/views/feishu.py:198 msgid "Failed to get user from FeiShu" msgstr "从飞书获取用户失败" -#: authentication/views/feishu.py:207 +#: authentication/views/feishu.py:204 msgid "FeiShu is not bound" msgstr "没有绑定飞书" -#: authentication/views/feishu.py:250 authentication/views/feishu.py:251 +#: authentication/views/feishu.py:205 +msgid "Please login with a password and then bind the FeiShu" +msgstr "请使用密码登录,然后绑定飞书" + +#: authentication/views/feishu.py:247 authentication/views/feishu.py:248 msgid "Binding FeiShu failed" msgstr "绑定飞书失败" @@ -2212,14 +2215,17 @@ msgid "[Alive] The terminal is offline: {name}" msgstr "" #: ops/notifications.py:42 +#, python-brace-format msgid "[Disk] Disk used more than {max_threshold}%: => {value} ({name})" msgstr "[Disk] 硬盘使用率超过 {max_threshold}%: => {value} ({name})" #: ops/notifications.py:49 +#, python-brace-format msgid "[Memory] Memory used more than {max_threshold}%: => {value} ({name})" msgstr "[Memory] 内存使用率超过 {max_threshold}%: => {value} ({name})" #: ops/notifications.py:56 +#, python-brace-format msgid "[CPU] CPU load more than {max_threshold}: => {value} ({name})" msgstr "[CPU] CPU 使用率超过 {max_threshold}: => {value} ({name})" @@ -5369,6 +5375,9 @@ msgstr "旗舰版" msgid "Community edition" msgstr "社区版" +#~ msgid "FeiShu Error, Please contact your system administrator" +#~ msgstr "飞书错误,请联系系统管理员" + #~ msgid "Append SSH KEY" #~ msgstr "追加新密钥"