From bced33fd9389f3c3cd158dc108b3ebf5fdc408ec Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 22 Aug 2023 13:40:41 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20sql=20server=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=A9=B1=E5=8A=A8=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/const/protocol.py | 9 +++ apps/locale/ja/LC_MESSAGES/django.po | 112 ++++++++++++++------------- apps/locale/zh/LC_MESSAGES/django.po | 112 ++++++++++++++------------- 3 files changed, 127 insertions(+), 106 deletions(-) diff --git a/apps/assets/const/protocol.py b/apps/assets/const/protocol.py index 553201237..8ff322fd1 100644 --- a/apps/assets/const/protocol.py +++ b/apps/assets/const/protocol.py @@ -154,6 +154,15 @@ class Protocol(ChoicesMixin, models.TextChoices): 'required': True, 'secret_types': ['password'], 'xpack': True, + 'setting': { + 'version': { + 'type': 'choice', + 'choices': [('>=2014', '>= 2014'), ('<2014', '< 2014')], + 'default': '>=2014', + 'label': _('Version'), + 'help_text': _('SQL Server version, Different versions have different connection drivers') + } + } }, cls.clickhouse: { 'port': 9000, diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index 791dc3098..fb2af2458 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-08-17 18:24+0800\n" +"POT-Creation-Date: 2023-08-22 13:39+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,7 +26,7 @@ msgstr "パラメータ 'action' は [{}] でなければなりません。" #: accounts/serializers/automations/change_secret.py:33 #: assets/models/_user.py:24 audits/signal_handlers/login_log.py:28 #: authentication/confirm/password.py:9 authentication/forms.py:32 -#: authentication/templates/authentication/login.html:274 +#: authentication/templates/authentication/login.html:286 #: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:47 #: users/forms/profile.py:22 users/serializers/user.py:104 #: users/templates/users/_msg_user_created.html:13 @@ -225,8 +225,9 @@ msgstr "資産" msgid "Su from" msgstr "から切り替え" -#: accounts/models/account.py:54 settings/serializers/auth/cas.py:20 -#: settings/serializers/auth/feishu.py:20 terminal/models/applet/applet.py:34 +#: accounts/models/account.py:54 assets/const/protocol.py:162 +#: settings/serializers/auth/cas.py:20 settings/serializers/auth/feishu.py:20 +#: terminal/models/applet/applet.py:34 msgid "Version" msgstr "バージョン" @@ -315,7 +316,7 @@ msgid "Trigger mode" msgstr "トリガーモード" #: accounts/models/automations/backup_account.py:105 audits/models.py:194 -#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:205 +#: terminal/models/session/sharing.py:125 xpack/plugins/cloud/models.py:205 msgid "Reason" msgstr "理由" @@ -708,7 +709,7 @@ msgstr "ID" #: perms/serializers/permission.py:30 rbac/builtin.py:123 #: rbac/models/rolebinding.py:49 rbac/serializers/rolebinding.py:17 #: terminal/backends/command/models.py:16 terminal/models/session/session.py:29 -#: terminal/models/session/sharing.py:33 terminal/notifications.py:156 +#: terminal/models/session/sharing.py:34 terminal/notifications.py:156 #: terminal/notifications.py:205 terminal/serializers/command.py:16 #: terminal/templates/terminal/_msg_command_warning.html:6 #: terminal/templates/terminal/_msg_session_sharing.html:6 @@ -820,7 +821,7 @@ msgstr "自動タスク実行履歴" #: accounts/serializers/automations/change_secret.py:155 audits/const.py:53 #: audits/models.py:59 audits/signal_handlers/activity_log.py:33 #: common/const/choices.py:18 ops/const.py:59 ops/serializers/celery.py:40 -#: terminal/const.py:76 terminal/models/session/sharing.py:117 +#: terminal/const.py:76 terminal/models/session/sharing.py:121 #: tickets/views/approve.py:115 msgid "Success" msgstr "成功" @@ -914,7 +915,7 @@ msgstr "レビュー担当者" #: acls/models/base.py:43 authentication/models/access_key.py:17 #: authentication/models/connection_token.py:53 #: authentication/templates/authentication/_access_key_modal.html:32 -#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:28 +#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:29 #: tickets/const.py:37 msgid "Active" msgstr "アクティブ" @@ -1166,7 +1167,7 @@ msgstr "無効" msgid "Basic" msgstr "基本" -#: assets/const/base.py:35 assets/const/protocol.py:230 +#: assets/const/base.py:35 assets/const/protocol.py:239 #: assets/models/asset/web.py:13 msgid "Script" msgstr "脚本" @@ -1299,15 +1300,20 @@ msgstr "SYSDBA" msgid "Connect as SYSDBA" msgstr "SYSDBA として接続" -#: assets/const/protocol.py:177 +#: assets/const/protocol.py:163 +msgid "" +"SQL Server version, Different versions have different connection drivers" +msgstr "SQL Server のバージョン。バージョンによって接続ドライバが異なります" + +#: assets/const/protocol.py:186 msgid "Auth username" msgstr "ユーザー名で認証する" -#: assets/const/protocol.py:200 +#: assets/const/protocol.py:209 msgid "Safe mode" msgstr "安全モード" -#: assets/const/protocol.py:202 +#: assets/const/protocol.py:211 msgid "" "When safe mode is enabled, some operations will be disabled, such as: New " "tab, right click, visit other website, etc." @@ -1315,24 +1321,24 @@ msgstr "" "安全モードが有効になっている場合、新しいタブ、右クリック、他のウェブサイトへ" "のアクセスなど、一部の操作が無効になります" -#: assets/const/protocol.py:207 assets/models/asset/web.py:9 +#: assets/const/protocol.py:216 assets/models/asset/web.py:9 #: assets/serializers/asset/info/spec.py:16 msgid "Autofill" msgstr "自動充填" -#: assets/const/protocol.py:215 assets/models/asset/web.py:10 +#: assets/const/protocol.py:224 assets/models/asset/web.py:10 msgid "Username selector" msgstr "ユーザー名ピッカー" -#: assets/const/protocol.py:220 assets/models/asset/web.py:11 +#: assets/const/protocol.py:229 assets/models/asset/web.py:11 msgid "Password selector" msgstr "パスワードセレクター" -#: assets/const/protocol.py:225 assets/models/asset/web.py:12 +#: assets/const/protocol.py:234 assets/models/asset/web.py:12 msgid "Submit selector" msgstr "ボタンセレクターを確認する" -#: assets/const/protocol.py:248 +#: assets/const/protocol.py:257 msgid "API mode" msgstr "APIモード" @@ -2121,8 +2127,8 @@ msgstr "作成" msgid "Connect" msgstr "接続" -#: audits/const.py:29 authentication/templates/authentication/login.html:240 -#: authentication/templates/authentication/login.html:313 +#: audits/const.py:29 authentication/templates/authentication/login.html:252 +#: authentication/templates/authentication/login.html:325 #: templates/_header_bar.html:89 msgid "Login" msgstr "ログイン" @@ -2171,7 +2177,7 @@ msgid "Job audit log" msgstr "ジョブ監査ログ" #: audits/models.py:51 audits/models.py:95 audits/models.py:166 -#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:109 +#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:113 msgid "Remote addr" msgstr "リモートaddr" @@ -2188,8 +2194,8 @@ msgid "File" msgstr "書類" #: audits/models.py:62 terminal/backends/command/models.py:21 -#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:19 -#: terminal/models/session/sharing.py:91 +#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:20 +#: terminal/models/session/sharing.py:95 #: terminal/templates/terminal/_msg_command_alert.html:10 #: terminal/templates/terminal/_msg_command_warning.html:17 #: tickets/models/ticket/command_confirm.py:15 @@ -2312,14 +2318,14 @@ msgid "Auth Token" msgstr "認証トークン" #: audits/signal_handlers/login_log.py:31 authentication/notifications.py:73 -#: authentication/views/login.py:75 authentication/views/wecom.py:159 +#: authentication/views/login.py:77 authentication/views/wecom.py:159 #: notifications/backends/__init__.py:11 settings/serializers/auth/wecom.py:10 #: users/models/user.py:740 users/models/user.py:848 msgid "WeCom" msgstr "企業微信" #: audits/signal_handlers/login_log.py:32 authentication/views/feishu.py:122 -#: authentication/views/login.py:87 notifications/backends/__init__.py:14 +#: authentication/views/login.py:89 notifications/backends/__init__.py:14 #: settings/serializers/auth/feishu.py:10 #: settings/serializers/auth/feishu.py:13 users/models/user.py:742 #: users/models/user.py:850 @@ -2327,7 +2333,7 @@ msgid "FeiShu" msgstr "本を飛ばす" #: audits/signal_handlers/login_log.py:33 authentication/views/dingtalk.py:159 -#: authentication/views/login.py:81 notifications/backends/__init__.py:12 +#: authentication/views/login.py:83 notifications/backends/__init__.py:12 #: settings/serializers/auth/dingtalk.py:10 users/models/user.py:741 #: users/models/user.py:849 msgid "DingTalk" @@ -2398,7 +2404,7 @@ msgstr "" "さい。" #: authentication/api/password.py:64 -#: authentication/templates/authentication/login.html:305 +#: authentication/templates/authentication/login.html:317 #: users/templates/users/forgot_password.html:27 #: users/templates/users/forgot_password.html:28 #: users/templates/users/forgot_password_previewing.html:13 @@ -3048,7 +3054,7 @@ msgid "request new one" msgstr "新しいものを要求する" #: authentication/templates/authentication/_msg_reset_password_code.html:12 -#: terminal/models/session/sharing.py:26 terminal/models/session/sharing.py:93 +#: terminal/models/session/sharing.py:27 terminal/models/session/sharing.py:97 #: terminal/templates/terminal/_msg_session_sharing.html:12 #: users/forms/profile.py:107 users/templates/users/forgot_password.html:66 msgid "Verify code" @@ -3102,7 +3108,7 @@ msgstr "" msgid "Cancel" msgstr "キャンセル" -#: authentication/templates/authentication/login.html:320 +#: authentication/templates/authentication/login.html:332 msgid "More login options" msgstr "その他のログインオプション" @@ -3214,23 +3220,23 @@ msgstr "本を飛ばすのバインドに成功" msgid "Failed to get user from FeiShu" msgstr "本を飛ばすからユーザーを取得できませんでした" -#: authentication/views/login.py:183 +#: authentication/views/login.py:204 msgid "Redirecting" msgstr "リダイレクト" -#: authentication/views/login.py:184 +#: authentication/views/login.py:205 msgid "Redirecting to {} authentication" msgstr "{} 認証へのリダイレクト" -#: authentication/views/login.py:207 +#: authentication/views/login.py:228 msgid "Login timeout, please try again." msgstr "ログインタイムアウト、もう一度お試しください" -#: authentication/views/login.py:250 +#: authentication/views/login.py:271 msgid "User email already exists ({})" msgstr "ユーザー メールボックスは既に存在します ({})" -#: authentication/views/login.py:328 +#: authentication/views/login.py:349 msgid "" "Wait for {} confirm, You also can copy link to her/him
\n" " Don't close this page" @@ -3238,15 +3244,15 @@ msgstr "" "{} 確認を待ちます。彼女/彼へのリンクをコピーすることもできます
\n" " このページを閉じないでください" -#: authentication/views/login.py:333 +#: authentication/views/login.py:354 msgid "No ticket found" msgstr "チケットが見つかりません" -#: authentication/views/login.py:369 +#: authentication/views/login.py:390 msgid "Logout success" msgstr "ログアウト成功" -#: authentication/views/login.py:370 +#: authentication/views/login.py:391 msgid "Logout success, return login page" msgstr "ログアウト成功、ログインページを返す" @@ -3809,7 +3815,7 @@ msgstr "アルグ" #: ops/models/adhoc.py:25 ops/models/base.py:16 ops/models/base.py:53 #: ops/models/job.py:138 ops/models/job.py:226 ops/models/playbook.py:30 -#: terminal/models/session/sharing.py:24 +#: terminal/models/session/sharing.py:25 msgid "Creator" msgstr "作成者" @@ -3850,7 +3856,7 @@ msgstr "タスクモニターを表示できます" msgid "Kwargs" msgstr "クワーグ" -#: ops/models/celery.py:61 terminal/models/session/sharing.py:124 +#: ops/models/celery.py:61 terminal/models/session/sharing.py:128 #: tickets/const.py:25 msgid "Finished" msgstr "終了" @@ -6197,7 +6203,7 @@ msgstr "セッション再生をダウンロードできます" msgid "Account id" msgstr "アカウント ID" -#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:114 +#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:118 msgid "Login from" msgstr "ログイン元" @@ -6233,61 +6239,61 @@ msgstr "セッションを終了できます" msgid "Can validate session action perm" msgstr "セッションアクションのパーマを検証できます" -#: terminal/models/session/sharing.py:31 +#: terminal/models/session/sharing.py:32 msgid "Expired time (min)" msgstr "期限切れ時間 (分)" -#: terminal/models/session/sharing.py:35 terminal/serializers/sharing.py:20 +#: terminal/models/session/sharing.py:36 terminal/serializers/sharing.py:20 #: terminal/serializers/sharing.py:52 msgid "Action permission" msgstr "アクションパーミッション" -#: terminal/models/session/sharing.py:37 +#: terminal/models/session/sharing.py:38 msgid "Origin" msgstr "ソース" -#: terminal/models/session/sharing.py:41 terminal/models/session/sharing.py:96 +#: terminal/models/session/sharing.py:42 terminal/models/session/sharing.py:100 #: terminal/notifications.py:261 msgid "Session sharing" msgstr "セッション共有" -#: terminal/models/session/sharing.py:43 +#: terminal/models/session/sharing.py:44 msgid "Can add super session sharing" msgstr "スーパーセッション共有を追加できます" -#: terminal/models/session/sharing.py:79 +#: terminal/models/session/sharing.py:83 msgid "Link not active" msgstr "リンクがアクティブでない" -#: terminal/models/session/sharing.py:81 +#: terminal/models/session/sharing.py:85 msgid "Link expired" msgstr "リンク期限切れ" -#: terminal/models/session/sharing.py:83 +#: terminal/models/session/sharing.py:87 msgid "User not allowed to join" msgstr "ユーザーはセッションに参加できません" -#: terminal/models/session/sharing.py:100 terminal/serializers/sharing.py:71 +#: terminal/models/session/sharing.py:104 terminal/serializers/sharing.py:71 msgid "Joiner" msgstr "ジョイナー" -#: terminal/models/session/sharing.py:103 +#: terminal/models/session/sharing.py:107 msgid "Date joined" msgstr "参加日" -#: terminal/models/session/sharing.py:106 +#: terminal/models/session/sharing.py:110 msgid "Date left" msgstr "日付が残っています" -#: terminal/models/session/sharing.py:129 +#: terminal/models/session/sharing.py:133 msgid "Session join record" msgstr "セッション参加記録" -#: terminal/models/session/sharing.py:145 +#: terminal/models/session/sharing.py:149 msgid "Invalid verification code" msgstr "検証コードが無効" -#: terminal/models/session/sharing.py:152 +#: terminal/models/session/sharing.py:156 msgid "You have already joined this session" msgstr "すでにこのセッションに参加しています" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index dfacac28e..efcd4aea9 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-08-17 18:24+0800\n" +"POT-Creation-Date: 2023-08-22 13:39+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -25,7 +25,7 @@ msgstr "参数 'action' 必须是 [{}]" #: accounts/serializers/automations/change_secret.py:33 #: assets/models/_user.py:24 audits/signal_handlers/login_log.py:28 #: authentication/confirm/password.py:9 authentication/forms.py:32 -#: authentication/templates/authentication/login.html:274 +#: authentication/templates/authentication/login.html:286 #: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:47 #: users/forms/profile.py:22 users/serializers/user.py:104 #: users/templates/users/_msg_user_created.html:13 @@ -224,8 +224,9 @@ msgstr "资产" msgid "Su from" msgstr "切换自" -#: accounts/models/account.py:54 settings/serializers/auth/cas.py:20 -#: settings/serializers/auth/feishu.py:20 terminal/models/applet/applet.py:34 +#: accounts/models/account.py:54 assets/const/protocol.py:162 +#: settings/serializers/auth/cas.py:20 settings/serializers/auth/feishu.py:20 +#: terminal/models/applet/applet.py:34 msgid "Version" msgstr "版本" @@ -314,7 +315,7 @@ msgid "Trigger mode" msgstr "触发模式" #: accounts/models/automations/backup_account.py:105 audits/models.py:194 -#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:205 +#: terminal/models/session/sharing.py:125 xpack/plugins/cloud/models.py:205 msgid "Reason" msgstr "原因" @@ -708,7 +709,7 @@ msgstr "ID" #: perms/serializers/permission.py:30 rbac/builtin.py:123 #: rbac/models/rolebinding.py:49 rbac/serializers/rolebinding.py:17 #: terminal/backends/command/models.py:16 terminal/models/session/session.py:29 -#: terminal/models/session/sharing.py:33 terminal/notifications.py:156 +#: terminal/models/session/sharing.py:34 terminal/notifications.py:156 #: terminal/notifications.py:205 terminal/serializers/command.py:16 #: terminal/templates/terminal/_msg_command_warning.html:6 #: terminal/templates/terminal/_msg_session_sharing.html:6 @@ -820,7 +821,7 @@ msgstr "自动化任务执行历史" #: accounts/serializers/automations/change_secret.py:155 audits/const.py:53 #: audits/models.py:59 audits/signal_handlers/activity_log.py:33 #: common/const/choices.py:18 ops/const.py:59 ops/serializers/celery.py:40 -#: terminal/const.py:76 terminal/models/session/sharing.py:117 +#: terminal/const.py:76 terminal/models/session/sharing.py:121 #: tickets/views/approve.py:115 msgid "Success" msgstr "成功" @@ -914,7 +915,7 @@ msgstr "审批人" #: acls/models/base.py:43 authentication/models/access_key.py:17 #: authentication/models/connection_token.py:53 #: authentication/templates/authentication/_access_key_modal.html:32 -#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:28 +#: perms/models/asset_permission.py:76 terminal/models/session/sharing.py:29 #: tickets/const.py:37 msgid "Active" msgstr "激活中" @@ -1163,7 +1164,7 @@ msgstr "禁用" msgid "Basic" msgstr "基本" -#: assets/const/base.py:35 assets/const/protocol.py:230 +#: assets/const/base.py:35 assets/const/protocol.py:239 #: assets/models/asset/web.py:13 msgid "Script" msgstr "脚本" @@ -1296,39 +1297,44 @@ msgstr "SYSDBA" msgid "Connect as SYSDBA" msgstr "以 SYSDBA 角色连接" -#: assets/const/protocol.py:177 +#: assets/const/protocol.py:163 +msgid "" +"SQL Server version, Different versions have different connection drivers" +msgstr "SQL Server 版本，不同版本有不同的连接驱动" + +#: assets/const/protocol.py:186 msgid "Auth username" msgstr "使用用户名认证" -#: assets/const/protocol.py:200 +#: assets/const/protocol.py:209 msgid "Safe mode" msgstr "安全模式" -#: assets/const/protocol.py:202 +#: assets/const/protocol.py:211 msgid "" "When safe mode is enabled, some operations will be disabled, such as: New " "tab, right click, visit other website, etc." msgstr "" "当安全模式启用时，一些操作将被禁用，例如：新建标签页、右键、访问其它网站 等" -#: assets/const/protocol.py:207 assets/models/asset/web.py:9 +#: assets/const/protocol.py:216 assets/models/asset/web.py:9 #: assets/serializers/asset/info/spec.py:16 msgid "Autofill" msgstr "自动代填" -#: assets/const/protocol.py:215 assets/models/asset/web.py:10 +#: assets/const/protocol.py:224 assets/models/asset/web.py:10 msgid "Username selector" msgstr "用户名选择器" -#: assets/const/protocol.py:220 assets/models/asset/web.py:11 +#: assets/const/protocol.py:229 assets/models/asset/web.py:11 msgid "Password selector" msgstr "密码选择器" -#: assets/const/protocol.py:225 assets/models/asset/web.py:12 +#: assets/const/protocol.py:234 assets/models/asset/web.py:12 msgid "Submit selector" msgstr "确认按钮选择器" -#: assets/const/protocol.py:248 +#: assets/const/protocol.py:257 msgid "API mode" msgstr "API 模式" @@ -2110,8 +2116,8 @@ msgstr "创建" msgid "Connect" msgstr "连接" -#: audits/const.py:29 authentication/templates/authentication/login.html:240 -#: authentication/templates/authentication/login.html:313 +#: audits/const.py:29 authentication/templates/authentication/login.html:252 +#: authentication/templates/authentication/login.html:325 #: templates/_header_bar.html:89 msgid "Login" msgstr "登录" @@ -2160,7 +2166,7 @@ msgid "Job audit log" msgstr "作业审计日志" #: audits/models.py:51 audits/models.py:95 audits/models.py:166 -#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:109 +#: terminal/models/session/session.py:38 terminal/models/session/sharing.py:113 msgid "Remote addr" msgstr "远端地址" @@ -2177,8 +2183,8 @@ msgid "File" msgstr "文件" #: audits/models.py:62 terminal/backends/command/models.py:21 -#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:19 -#: terminal/models/session/sharing.py:91 +#: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:20 +#: terminal/models/session/sharing.py:95 #: terminal/templates/terminal/_msg_command_alert.html:10 #: terminal/templates/terminal/_msg_command_warning.html:17 #: tickets/models/ticket/command_confirm.py:15 @@ -2301,14 +2307,14 @@ msgid "Auth Token" msgstr "认证令牌" #: audits/signal_handlers/login_log.py:31 authentication/notifications.py:73 -#: authentication/views/login.py:75 authentication/views/wecom.py:159 +#: authentication/views/login.py:77 authentication/views/wecom.py:159 #: notifications/backends/__init__.py:11 settings/serializers/auth/wecom.py:10 #: users/models/user.py:740 users/models/user.py:848 msgid "WeCom" msgstr "企业微信" #: audits/signal_handlers/login_log.py:32 authentication/views/feishu.py:122 -#: authentication/views/login.py:87 notifications/backends/__init__.py:14 +#: authentication/views/login.py:89 notifications/backends/__init__.py:14 #: settings/serializers/auth/feishu.py:10 #: settings/serializers/auth/feishu.py:13 users/models/user.py:742 #: users/models/user.py:850 @@ -2316,7 +2322,7 @@ msgid "FeiShu" msgstr "飞书" #: audits/signal_handlers/login_log.py:33 authentication/views/dingtalk.py:159 -#: authentication/views/login.py:81 notifications/backends/__init__.py:12 +#: authentication/views/login.py:83 notifications/backends/__init__.py:12 #: settings/serializers/auth/dingtalk.py:10 users/models/user.py:741 #: users/models/user.py:849 msgid "DingTalk" @@ -2383,7 +2389,7 @@ msgid "" msgstr "用户来自 {} 请去相应系统修改密码" #: authentication/api/password.py:64 -#: authentication/templates/authentication/login.html:305 +#: authentication/templates/authentication/login.html:317 #: users/templates/users/forgot_password.html:27 #: users/templates/users/forgot_password.html:28 #: users/templates/users/forgot_password_previewing.html:13 @@ -3017,7 +3023,7 @@ msgid "request new one" msgstr "重新申请" #: authentication/templates/authentication/_msg_reset_password_code.html:12 -#: terminal/models/session/sharing.py:26 terminal/models/session/sharing.py:93 +#: terminal/models/session/sharing.py:27 terminal/models/session/sharing.py:97 #: terminal/templates/terminal/_msg_session_sharing.html:12 #: users/forms/profile.py:107 users/templates/users/forgot_password.html:66 msgid "Verify code" @@ -3067,7 +3073,7 @@ msgstr "如果这次公钥更新不是由你发起的，那么你的账号可能 msgid "Cancel" msgstr "取消" -#: authentication/templates/authentication/login.html:320 +#: authentication/templates/authentication/login.html:332 msgid "More login options" msgstr "其他方式登录" @@ -3179,23 +3185,23 @@ msgstr "绑定 飞书 成功" msgid "Failed to get user from FeiShu" msgstr "从飞书获取用户失败" -#: authentication/views/login.py:183 +#: authentication/views/login.py:204 msgid "Redirecting" msgstr "跳转中" -#: authentication/views/login.py:184 +#: authentication/views/login.py:205 msgid "Redirecting to {} authentication" msgstr "正在跳转到 {} 认证" -#: authentication/views/login.py:207 +#: authentication/views/login.py:228 msgid "Login timeout, please try again." msgstr "登录超时，请重新登录" -#: authentication/views/login.py:250 +#: authentication/views/login.py:271 msgid "User email already exists ({})" msgstr "用户邮箱已存在 ({})" -#: authentication/views/login.py:328 +#: authentication/views/login.py:349 msgid "" "Wait for {} confirm, You also can copy link to her/him
\n" " Don't close this page" @@ -3203,15 +3209,15 @@ msgstr "" "等待 {} 确认, 你也可以复制链接发给他/她
\n" " 不要关闭本页面" -#: authentication/views/login.py:333 +#: authentication/views/login.py:354 msgid "No ticket found" msgstr "没有发现工单" -#: authentication/views/login.py:369 +#: authentication/views/login.py:390 msgid "Logout success" msgstr "退出登录成功" -#: authentication/views/login.py:370 +#: authentication/views/login.py:391 msgid "Logout success, return login page" msgstr "退出登录成功，返回到登录页面" @@ -3767,7 +3773,7 @@ msgstr "参数" #: ops/models/adhoc.py:25 ops/models/base.py:16 ops/models/base.py:53 #: ops/models/job.py:138 ops/models/job.py:226 ops/models/playbook.py:30 -#: terminal/models/session/sharing.py:24 +#: terminal/models/session/sharing.py:25 msgid "Creator" msgstr "创建者" @@ -3808,7 +3814,7 @@ msgstr "可以查看任务监控" msgid "Kwargs" msgstr "其它参数" -#: ops/models/celery.py:61 terminal/models/session/sharing.py:124 +#: ops/models/celery.py:61 terminal/models/session/sharing.py:128 #: tickets/const.py:25 msgid "Finished" msgstr "结束" @@ -6114,7 +6120,7 @@ msgstr "可以下载会话录像" msgid "Account id" msgstr "账号 ID" -#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:114 +#: terminal/models/session/session.py:36 terminal/models/session/sharing.py:118 msgid "Login from" msgstr "登录来源" @@ -6150,61 +6156,61 @@ msgstr "可以终断会话" msgid "Can validate session action perm" msgstr "可以验证会话动作权限" -#: terminal/models/session/sharing.py:31 +#: terminal/models/session/sharing.py:32 msgid "Expired time (min)" msgstr "过期时间 (分)" -#: terminal/models/session/sharing.py:35 terminal/serializers/sharing.py:20 +#: terminal/models/session/sharing.py:36 terminal/serializers/sharing.py:20 #: terminal/serializers/sharing.py:52 msgid "Action permission" msgstr "操作权限" -#: terminal/models/session/sharing.py:37 +#: terminal/models/session/sharing.py:38 msgid "Origin" msgstr "来源" -#: terminal/models/session/sharing.py:41 terminal/models/session/sharing.py:96 +#: terminal/models/session/sharing.py:42 terminal/models/session/sharing.py:100 #: terminal/notifications.py:261 msgid "Session sharing" msgstr "会话分享" -#: terminal/models/session/sharing.py:43 +#: terminal/models/session/sharing.py:44 msgid "Can add super session sharing" msgstr "可以创建超级会话分享" -#: terminal/models/session/sharing.py:79 +#: terminal/models/session/sharing.py:83 msgid "Link not active" msgstr "链接失效" -#: terminal/models/session/sharing.py:81 +#: terminal/models/session/sharing.py:85 msgid "Link expired" msgstr "链接过期" -#: terminal/models/session/sharing.py:83 +#: terminal/models/session/sharing.py:87 msgid "User not allowed to join" msgstr "该用户无权加入会话" -#: terminal/models/session/sharing.py:100 terminal/serializers/sharing.py:71 +#: terminal/models/session/sharing.py:104 terminal/serializers/sharing.py:71 msgid "Joiner" msgstr "加入者" -#: terminal/models/session/sharing.py:103 +#: terminal/models/session/sharing.py:107 msgid "Date joined" msgstr "加入日期" -#: terminal/models/session/sharing.py:106 +#: terminal/models/session/sharing.py:110 msgid "Date left" msgstr "结束日期" -#: terminal/models/session/sharing.py:129 +#: terminal/models/session/sharing.py:133 msgid "Session join record" msgstr "会话加入记录" -#: terminal/models/session/sharing.py:145 +#: terminal/models/session/sharing.py:149 msgid "Invalid verification code" msgstr "验证码不正确" -#: terminal/models/session/sharing.py:152 +#: terminal/models/session/sharing.py:156 msgid "You have already joined this session" msgstr "您已经加入过此会话"