From 95e7bde5d7cbfd4f06b0b440f28f56d996e91ac1 Mon Sep 17 00:00:00 2001
From: jiangweidong <weidong.jiang@fit2cloud.com>
Date: Mon, 9 Oct 2023 18:34:23 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/authentication/mixins.py        |  2 +-
 apps/locale/ja/LC_MESSAGES/django.po | 30 +++++++-------
 apps/locale/zh/LC_MESSAGES/django.po | 58 ++++++++++++++--------------
 3 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/apps/authentication/mixins.py b/apps/authentication/mixins.py
index faa81736a..906fcbb97 100644
--- a/apps/authentication/mixins.py
+++ b/apps/authentication/mixins.py
@@ -79,7 +79,7 @@ def authenticate(request=None, **credentials):
         if not user.is_valid:
             temp_user = user
             temp_user.backend = backend_path
-            request.error_message = _('User is not valid')
+            request.error_message = _('User is invalid')
             return temp_user
 
         # 检查用户是否允许认证
diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po
index f27672f02..99759dcae 100644
--- a/apps/locale/ja/LC_MESSAGES/django.po
+++ b/apps/locale/ja/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-09 17:52+0800\n"
+"POT-Creation-Date: 2023-10-09 18:32+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -94,7 +94,7 @@ msgid "Update"
 msgstr "更新"
 
 #: accounts/const/account.py:33
-#: accounts/serializers/automations/change_secret.py:155 audits/const.py:59
+#: accounts/serializers/automations/change_secret.py:155 audits/const.py:60
 #: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19
 #: ops/const.py:74 terminal/const.py:77 xpack/plugins/cloud/const.py:43
 msgid "Failed"
@@ -893,7 +893,7 @@ msgstr "* パスワードの長さの範囲6-30ビット"
 msgid "Automation task execution"
 msgstr "自動タスク実行履歴"
 
-#: accounts/serializers/automations/change_secret.py:154 audits/const.py:58
+#: accounts/serializers/automations/change_secret.py:154 audits/const.py:59
 #: audits/models.py:62 audits/signal_handlers/activity_log.py:33
 #: common/const/choices.py:18 ops/const.py:72 ops/serializers/celery.py:40
 #: terminal/const.py:76 terminal/models/session/sharing.py:121
@@ -985,7 +985,7 @@ msgstr "レビュー担当者"
 msgid "Warning"
 msgstr "警告"
 
-#: acls/const.py:10 notifications/apps.py:7
+#: acls/const.py:10 audits/const.py:36 notifications/apps.py:7
 msgid "Notifications"
 msgstr "通知"
 
@@ -1284,7 +1284,7 @@ msgstr "認証に失敗しました"
 msgid "Connect failed"
 msgstr "接続に失敗しました"
 
-#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:41
+#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:42
 #: audits/signal_handlers/activity_log.py:62 common/utils/ip/geoip/utils.py:31
 #: common/utils/ip/geoip/utils.py:37 common/utils/ip/utils.py:104
 msgid "Unknown"
@@ -1306,7 +1306,7 @@ msgstr "テストゲートウェイ"
 msgid "Gather facts"
 msgstr "資産情報の収集"
 
-#: assets/const/base.py:33 audits/const.py:52
+#: assets/const/base.py:33 audits/const.py:53
 #: terminal/serializers/applet_host.py:32
 msgid "Disabled"
 msgstr "無効"
@@ -1340,7 +1340,7 @@ msgid "Cloud service"
 msgstr "クラウド サービス"
 
 #: assets/const/category.py:14 assets/models/asset/gpt.py:11
-#: assets/models/asset/web.py:16 audits/const.py:39
+#: assets/models/asset/web.py:16 audits/const.py:40
 #: terminal/models/applet/applet.py:27 users/const.py:47
 msgid "Web"
 msgstr "Web"
@@ -1851,7 +1851,7 @@ msgstr "開ける"
 msgid "Setting"
 msgstr "設定"
 
-#: assets/models/platform.py:38 audits/const.py:53
+#: assets/models/platform.py:38 audits/const.py:54
 #: authentication/backends/passkey/models.py:11 settings/models.py:36
 #: terminal/serializers/applet_host.py:33
 msgid "Enabled"
@@ -2299,30 +2299,30 @@ msgstr "ログイン"
 msgid "Change password"
 msgstr "パスワードを変更する"
 
-#: audits/const.py:40 settings/serializers/terminal.py:6
+#: audits/const.py:41 settings/serializers/terminal.py:6
 #: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:164
 #: terminal/serializers/session.py:49 terminal/serializers/session.py:63
 msgid "Terminal"
 msgstr "ターミナル"
 
-#: audits/const.py:45 audits/models.py:130
+#: audits/const.py:46 audits/models.py:130
 msgid "Operate log"
 msgstr "ログの操作"
 
-#: audits/const.py:46
+#: audits/const.py:47
 msgid "Session log"
 msgstr "セッションログ"
 
-#: audits/const.py:47
+#: audits/const.py:48
 msgid "Login log"
 msgstr "ログインログ"
 
-#: audits/const.py:48 terminal/models/applet/host.py:143
+#: audits/const.py:49 terminal/models/applet/host.py:143
 #: terminal/models/component/task.py:22
 msgid "Task"
 msgstr "タスク"
 
-#: audits/const.py:54
+#: audits/const.py:55
 msgid "-"
 msgstr "-"
 
@@ -2947,7 +2947,7 @@ msgid "Authentication failed (before login check failed): {}"
 msgstr "認証に失敗しました (ログインチェックが失敗する前): {}"
 
 #: authentication/mixins.py:82
-msgid "User is not valid"
+msgid "User is invalid"
 msgstr "無効なユーザーです"
 
 #: authentication/mixins.py:97
diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 28412b41c..aeea7f4b5 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: 2023-10-09 17:52+0800\n"
+"POT-Creation-Date: 2023-10-09 18:33+0800\n"
 "PO-Revision-Date: 2021-05-20 10:54+0800\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -93,7 +93,7 @@ msgid "Update"
 msgstr "更新"
 
 #: accounts/const/account.py:33
-#: accounts/serializers/automations/change_secret.py:155 audits/const.py:59
+#: accounts/serializers/automations/change_secret.py:155 audits/const.py:60
 #: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19
 #: ops/const.py:74 terminal/const.py:77 xpack/plugins/cloud/const.py:43
 msgid "Failed"
@@ -243,7 +243,7 @@ msgstr "资产"
 msgid "Su from"
 msgstr "切换自"
 
-#: accounts/models/account.py:54 assets/const/protocol.py:168
+#: accounts/models/account.py:54 assets/const/protocol.py:169
 #: settings/serializers/auth/cas.py:20 settings/serializers/auth/feishu.py:20
 #: terminal/models/applet/applet.py:35
 msgid "Version"
@@ -499,7 +499,7 @@ msgstr "账号验证"
 msgid "Secret type"
 msgstr "密文类型"
 
-#: accounts/models/base.py:39 accounts/models/mixins/vault.py:48
+#: accounts/models/base.py:39 accounts/models/mixins/vault.py:49
 #: accounts/serializers/account/base.py:19
 #: authentication/models/temp_token.py:10
 #: authentication/templates/authentication/_access_key_modal.html:31
@@ -890,7 +890,7 @@ msgstr "* 密码长度范围 6-30 位"
 msgid "Automation task execution"
 msgstr "自动化任务执行历史"
 
-#: accounts/serializers/automations/change_secret.py:154 audits/const.py:58
+#: accounts/serializers/automations/change_secret.py:154 audits/const.py:59
 #: audits/models.py:62 audits/signal_handlers/activity_log.py:33
 #: common/const/choices.py:18 ops/const.py:72 ops/serializers/celery.py:40
 #: terminal/const.py:76 terminal/models/session/sharing.py:121
@@ -982,7 +982,7 @@ msgstr "审批"
 msgid "Warning"
 msgstr "告警"
 
-#: acls/const.py:10 notifications/apps.py:7
+#: acls/const.py:10 audits/const.py:36 notifications/apps.py:7
 msgid "Notifications"
 msgstr "通知"
 
@@ -1276,7 +1276,7 @@ msgstr "认证失败"
 msgid "Connect failed"
 msgstr "连接失败"
 
-#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:41
+#: assets/const/automation.py:6 audits/const.py:6 audits/const.py:42
 #: audits/signal_handlers/activity_log.py:62 common/utils/ip/geoip/utils.py:31
 #: common/utils/ip/geoip/utils.py:37 common/utils/ip/utils.py:104
 msgid "Unknown"
@@ -1298,7 +1298,7 @@ msgstr "测试网关"
 msgid "Gather facts"
 msgstr "收集资产信息"
 
-#: assets/const/base.py:33 audits/const.py:52
+#: assets/const/base.py:33 audits/const.py:53
 #: terminal/serializers/applet_host.py:32
 msgid "Disabled"
 msgstr "禁用"
@@ -1310,7 +1310,7 @@ msgstr "禁用"
 msgid "Basic"
 msgstr "基本"
 
-#: assets/const/base.py:35 assets/const/protocol.py:245
+#: assets/const/base.py:35 assets/const/protocol.py:252
 #: assets/models/asset/web.py:13
 msgid "Script"
 msgstr "脚本"
@@ -1332,7 +1332,7 @@ msgid "Cloud service"
 msgstr "云服务"
 
 #: assets/const/category.py:14 assets/models/asset/gpt.py:11
-#: assets/models/asset/web.py:16 audits/const.py:39
+#: assets/models/asset/web.py:16 audits/const.py:40
 #: terminal/models/applet/applet.py:27 users/const.py:47
 msgid "Web"
 msgstr "Web"
@@ -1378,11 +1378,11 @@ msgstr "ChatGPT"
 msgid "Other"
 msgstr "其它"
 
-#: assets/const/protocol.py:48
+#: assets/const/protocol.py:49
 msgid "SFTP root"
 msgstr "SFTP 根路径"
 
-#: assets/const/protocol.py:50
+#: assets/const/protocol.py:51
 #, python-brace-format
 msgid ""
 "SFTP root directory, Support variable: <br>- ${ACCOUNT} The connected "
@@ -1392,39 +1392,39 @@ msgstr ""
 "SFTP根目录，支持变量：<br>-${ACCOUNT}已连接帐户用户名<br>-${HOME}连接帐户的主"
 "目录<br>-${USER}用户的用户名"
 
-#: assets/const/protocol.py:65
+#: assets/const/protocol.py:66
 msgid "Console"
 msgstr "控制台"
 
-#: assets/const/protocol.py:66
+#: assets/const/protocol.py:67
 msgid "Connect to console session"
 msgstr "连接到控制台会话"
 
-#: assets/const/protocol.py:70
+#: assets/const/protocol.py:71
 msgid "Any"
 msgstr "任意"
 
-#: assets/const/protocol.py:72 settings/serializers/security.py:228
+#: assets/const/protocol.py:73 settings/serializers/security.py:228
 msgid "Security"
 msgstr "安全"
 
-#: assets/const/protocol.py:73
+#: assets/const/protocol.py:74
 msgid "Security layer to use for the connection"
 msgstr "连接 RDP 使用的安全层"
 
-#: assets/const/protocol.py:79
+#: assets/const/protocol.py:80
 msgid "AD domain"
 msgstr "AD 网域"
 
-#: assets/const/protocol.py:94
+#: assets/const/protocol.py:95
 msgid "Username prompt"
 msgstr "用户名提示"
 
-#: assets/const/protocol.py:95
+#: assets/const/protocol.py:96
 msgid "We will send username when we see this prompt"
 msgstr "当我们看到这个提示时，我们将发送用户名"
 
-#: assets/const/protocol.py:100
+#: assets/const/protocol.py:101
 msgid "Password prompt"
 msgstr "密码提示"
 
@@ -1843,7 +1843,7 @@ msgstr "开放的"
 msgid "Setting"
 msgstr "设置"
 
-#: assets/models/platform.py:38 audits/const.py:53
+#: assets/models/platform.py:38 audits/const.py:54
 #: authentication/backends/passkey/models.py:11 settings/models.py:36
 #: terminal/serializers/applet_host.py:33
 msgid "Enabled"
@@ -2282,30 +2282,30 @@ msgstr "登录"
 msgid "Change password"
 msgstr "改密"
 
-#: audits/const.py:40 settings/serializers/terminal.py:6
+#: audits/const.py:41 settings/serializers/terminal.py:6
 #: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:164
 #: terminal/serializers/session.py:49 terminal/serializers/session.py:63
 msgid "Terminal"
 msgstr "终端"
 
-#: audits/const.py:45 audits/models.py:130
+#: audits/const.py:46 audits/models.py:130
 msgid "Operate log"
 msgstr "操作日志"
 
-#: audits/const.py:46
+#: audits/const.py:47
 msgid "Session log"
 msgstr "会话日志"
 
-#: audits/const.py:47
+#: audits/const.py:48
 msgid "Login log"
 msgstr "登录日志"
 
-#: audits/const.py:48 terminal/models/applet/host.py:143
+#: audits/const.py:49 terminal/models/applet/host.py:143
 #: terminal/models/component/task.py:22
 msgid "Task"
 msgstr "任务"
 
-#: audits/const.py:54
+#: audits/const.py:55
 msgid "-"
 msgstr "-"
 
@@ -2916,7 +2916,7 @@ msgid "Authentication failed (before login check failed): {}"
 msgstr "认证失败 (登录前检查失败): {}"
 
 #: authentication/mixins.py:82
-msgid "User is not valid"
+msgid "User is invalid"
 msgstr "无效的用户"
 
 #: authentication/mixins.py:97