From 891e3d56091aa32f9336a8f1a67f5f3c7e3a563e Mon Sep 17 00:00:00 2001 From: wangruidong <940853815@qq.com> Date: Tue, 22 Oct 2024 17:11:01 +0800 Subject: [PATCH] perf: Storage update comment failed --- apps/locale/ja/LC_MESSAGES/django.mo | 4 +- apps/locale/ja/LC_MESSAGES/django.po | 95 +++++++++++------------ apps/locale/zh/LC_MESSAGES/django.mo | 4 +- apps/locale/zh/LC_MESSAGES/django.po | 92 +++++++++++----------- apps/locale/zh_Hant/LC_MESSAGES/django.mo | 4 +- apps/locale/zh_Hant/LC_MESSAGES/django.po | 90 ++++++++++----------- apps/terminal/serializers/storage.py | 15 ++-- 7 files changed, 151 insertions(+), 153 deletions(-) diff --git a/apps/locale/ja/LC_MESSAGES/django.mo b/apps/locale/ja/LC_MESSAGES/django.mo index 85916325c..72b8334b6 100644 --- a/apps/locale/ja/LC_MESSAGES/django.mo +++ b/apps/locale/ja/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:607f8df8c6cea454283e0bc371db3be0c81f7cfa981a5f00c20b5be139e16aac -size 178618 +oid sha256:835dcba30214a93faf10b7e9faca13f5e0da6c50aebf19290aeeb05d9b0b2bbf +size 178641 diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index fc7cbb4b7..d8afc843e 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: 2024-08-20 14:54+0800\n" +"POT-Creation-Date: 2024-10-22 16:56+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -798,8 +798,8 @@ msgstr "カテゴリ" #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:40 #: terminal/models/component/storage.py:57 #: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29 -#: terminal/serializers/session.py:23 terminal/serializers/storage.py:271 -#: terminal/serializers/storage.py:283 tickets/models/comment.py:26 +#: terminal/serializers/session.py:23 terminal/serializers/storage.py:274 +#: terminal/serializers/storage.py:286 tickets/models/comment.py:26 #: tickets/models/flow.py:56 tickets/models/ticket/apply_application.py:16 #: tickets/models/ticket/general.py:276 tickets/serializers/flow.py:53 #: tickets/serializers/ticket/ticket.py:19 @@ -1425,12 +1425,13 @@ msgid "Unable to connect to port {port} on {address}" msgstr "{port} のポート {address} に接続できません" #: assets/automations/ping_gateway/manager.py:58 -#: authentication/middleware.py:93 xpack/plugins/cloud/providers/fc.py:47 +#: authentication/middleware.py:94 xpack/plugins/cloud/providers/fc.py:47 msgid "Authentication failed" msgstr "認証に失敗しました" #: assets/automations/ping_gateway/manager.py:60 -#: assets/automations/ping_gateway/manager.py:86 terminal/const.py:102 +#: assets/automations/ping_gateway/manager.py:86 audits/backends/__init__.py:29 +#: terminal/const.py:102 msgid "Connect failed" msgstr "接続に失敗しました" @@ -1978,7 +1979,8 @@ msgstr "ラベル" msgid "New node" msgstr "新しいノード" -#: assets/models/node.py:467 audits/backends/db.py:68 audits/backends/db.py:69 +#: assets/models/node.py:467 audits/backends/db.py:61 audits/backends/db.py:62 +#: audits/backends/es.py:66 audits/backends/es.py:67 msgid "empty" msgstr "空" @@ -2407,15 +2409,7 @@ msgstr "監査" msgid "The text content is too long. Use Elasticsearch to store operation logs" msgstr "文章の内容が長すぎる。Elasticsearchで操作履歴を保存する" -#: audits/backends/db.py:61 -msgid "labels" -msgstr "ラベル" - -#: audits/backends/db.py:62 -msgid "operate_log_id" -msgstr "操作ログID" - -#: audits/backends/db.py:94 +#: audits/backends/db.py:87 msgid "Tips" msgstr "謎々" @@ -2498,7 +2492,7 @@ msgstr "終了" #: audits/const.py:46 settings/serializers/terminal.py:6 #: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:175 #: terminal/models/virtualapp/provider.py:14 terminal/serializers/session.py:55 -#: terminal/serializers/session.py:69 +#: terminal/serializers/session.py:79 msgid "Terminal" msgstr "ターミナル" @@ -2523,11 +2517,11 @@ msgstr "タスク" msgid "-" msgstr "-" -#: audits/handler.py:116 +#: audits/handler.py:107 msgid "Yes" msgstr "是" -#: audits/handler.py:116 +#: audits/handler.py:107 msgid "No" msgstr "否" @@ -3140,7 +3134,7 @@ msgstr "電話番号を設定して有効にする" msgid "Clear phone number to disable" msgstr "無効にする電話番号をクリアする" -#: authentication/middleware.py:94 settings/utils/ldap.py:679 +#: authentication/middleware.py:95 settings/utils/ldap.py:679 msgid "Authentication failed (before login check failed): {}" msgstr "認証に失敗しました (ログインチェックが失敗する前): {}" @@ -3421,7 +3415,7 @@ msgstr "アカウントにリモートログイン動作があります。注意 msgid "Login time" msgstr "ログイン時間" -#: authentication/templates/authentication/_msg_different_city.html:16 +#: authentication/templates/authentication/_msg_different_city.html:14 msgid "" "If you suspect that the login behavior is abnormal, please modify the " "account password in time." @@ -3449,13 +3443,13 @@ msgstr "" msgid "Click here reset password" msgstr "ここをクリックしてパスワードをリセット" -#: authentication/templates/authentication/_msg_reset_password.html:16 -#: users/templates/users/_msg_user_created.html:22 +#: authentication/templates/authentication/_msg_reset_password.html:15 +#: users/templates/users/_msg_user_created.html:20 msgid "This link is valid for 1 hour. After it expires" msgstr "このリンクは1時間有効です。有効期限が切れた後" -#: authentication/templates/authentication/_msg_reset_password.html:17 -#: users/templates/users/_msg_user_created.html:23 +#: authentication/templates/authentication/_msg_reset_password.html:16 +#: users/templates/users/_msg_user_created.html:21 msgid "request new one" msgstr "新しいものを要求する" @@ -3484,7 +3478,7 @@ msgstr "パスワードが正常に更新されました" msgid "Browser" msgstr "ブラウザ" -#: authentication/templates/authentication/_msg_rest_password_success.html:13 +#: authentication/templates/authentication/_msg_rest_password_success.html:12 msgid "" "If the password update was not initiated by you, your account may have " "security issues" @@ -3492,8 +3486,8 @@ msgstr "" "パスワードの更新が開始されなかった場合、アカウントにセキュリティ上の問題があ" "る可能性があります" -#: authentication/templates/authentication/_msg_rest_password_success.html:14 -#: authentication/templates/authentication/_msg_rest_public_key_success.html:14 +#: authentication/templates/authentication/_msg_rest_password_success.html:13 +#: authentication/templates/authentication/_msg_rest_public_key_success.html:13 msgid "If you have any questions, you can contact the administrator" msgstr "質問があれば、管理者に連絡できます" @@ -3501,7 +3495,7 @@ msgstr "質問があれば、管理者に連絡できます" msgid "Your public key has just been successfully updated" msgstr "公開鍵が正常に更新されました" -#: authentication/templates/authentication/_msg_rest_public_key_success.html:13 +#: authentication/templates/authentication/_msg_rest_public_key_success.html:12 msgid "" "If the public key update was not initiated by you, your account may have " "security issues" @@ -3580,7 +3574,7 @@ msgid "LAN" msgstr "ローカルエリアネットワーク" #: authentication/views/base.py:70 -#: perms/templates/perms/_msg_permed_items_expire.html:21 +#: perms/templates/perms/_msg_permed_items_expire.html:20 msgid "If you have any question, please contact the administrator" msgstr "質問があったら、管理者に連絡して下さい" @@ -4467,7 +4461,7 @@ msgstr "Material" msgid "Material Type" msgstr "Material を選択してオプションを設定します。" -#: ops/models/job.py:545 +#: ops/models/job.py:555 msgid "Job Execution" msgstr "ジョブ実行" @@ -6617,7 +6611,7 @@ msgstr "使用中のストレージを削除できません" msgid "Command storages" msgstr "コマンドストア" -#: terminal/api/component/storage.py:82 +#: terminal/api/component/storage.py:82 xpack/plugins/cloud/manager.py:83 msgid "Invalid" msgstr "無効" @@ -7011,7 +7005,7 @@ msgstr "ログイン元" msgid "Replay" msgstr "リプレイ" -#: terminal/models/session/session.py:48 terminal/serializers/session.py:68 +#: terminal/models/session/session.py:48 terminal/serializers/session.py:78 msgid "Command amount" msgstr "コマンド量" @@ -7396,7 +7390,8 @@ msgstr "アクセスキー" msgid "Access key secret" msgstr "アクセスキーシークレット" -#: terminal/serializers/storage.py:68 xpack/plugins/cloud/models.py:258 +#: terminal/serializers/storage.py:68 xpack/plugins/cloud/manager.py:83 +#: xpack/plugins/cloud/models.py:258 msgid "Region" msgstr "リージョン" @@ -7453,6 +7448,14 @@ msgstr "インデックス" msgid "Doc type" msgstr "Docタイプ" +#: terminal/serializers/storage.py:258 +msgid "Store locally" +msgstr "ローカルに保存する" + +#: terminal/serializers/storage.py:259 +msgid "Do not save" +msgstr "保存しない" + #: terminal/serializers/task.py:9 msgid "Session id" msgstr "セッション" @@ -8216,7 +8219,7 @@ msgid "User password history" msgstr "ユーザーパスワード履歴" #: users/notifications.py:55 -#: users/templates/users/_msg_password_expire_reminder.html:17 +#: users/templates/users/_msg_password_expire_reminder.html:16 #: users/templates/users/reset_password.html:5 #: users/templates/users/reset_password.html:6 msgid "Reset password" @@ -8477,7 +8480,7 @@ msgstr "" msgid "Click here update password" msgstr "ここをクリック更新パスワード" -#: users/templates/users/_msg_password_expire_reminder.html:16 +#: users/templates/users/_msg_password_expire_reminder.html:15 msgid "If your password has expired, please click the link below to" msgstr "" "パスワードの有効期限が切れている場合は、以下のリンクをクリックしてください" @@ -8861,11 +8864,6 @@ msgstr "そして" msgid "Or" msgstr "または" -#: xpack/plugins/cloud/manager.py:55 xpack/plugins/cloud/providers/gcp.py:64 -#: xpack/plugins/cloud/providers/huaweicloud.py:34 -msgid "Account unavailable" -msgstr "利用できないアカウント" - #: xpack/plugins/cloud/meta.py:9 msgid "Cloud center" msgstr "クラウドセンター" @@ -8900,8 +8898,8 @@ msgstr "IPネットワークセグメントグループ" #: xpack/plugins/cloud/models.py:100 #: xpack/plugins/cloud/serializers/task.py:167 -msgid "Preferred IP type" -msgstr "優先 IP タイプ" +msgid "Sync IP type" +msgstr "同期IPタイプ" #: xpack/plugins/cloud/models.py:103 #: xpack/plugins/cloud/serializers/task.py:185 @@ -9161,6 +9159,11 @@ msgstr "華東-上海" msgid "AP-Singapore" msgstr "アジア太平洋-シンガポール" +#: xpack/plugins/cloud/providers/gcp.py:64 +#: xpack/plugins/cloud/providers/huaweicloud.py:34 +msgid "Account unavailable" +msgstr "利用できないアカウント" + #: xpack/plugins/cloud/providers/huaweicloud.py:44 msgid "CN North-Beijing1" msgstr "華北-北京1" @@ -9412,11 +9415,3 @@ msgstr "エンタープライズプロフェッショナル版" #: xpack/plugins/license/models.py:86 msgid "Ultimate edition" msgstr "エンタープライズ・フラッグシップ・エディション" - -#~ msgid "Account history" -#~ msgstr "アカウント履歴" - -#, fuzzy -#~| msgid "Operate log" -#~ msgid "Operate log id" -#~ msgstr "ログの操作" diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index ea7b1e7f5..7b4036c90 100644 --- a/apps/locale/zh/LC_MESSAGES/django.mo +++ b/apps/locale/zh/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb60a2ebb525e5aaa2d2c64fb4956fcc56f1b608a6dfb186513e743e226af261 -size 146172 +oid sha256:69e15a297e0f0280ee405763eb58dd038b12010d1f7499af8f9cedbacda62252 +size 146179 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 67224af42..1461d6b85 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: 2024-08-20 14:54+0800\n" +"POT-Creation-Date: 2024-10-22 16:56+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -796,8 +796,8 @@ msgstr "类别" #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:40 #: terminal/models/component/storage.py:57 #: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29 -#: terminal/serializers/session.py:23 terminal/serializers/storage.py:271 -#: terminal/serializers/storage.py:283 tickets/models/comment.py:26 +#: terminal/serializers/session.py:23 terminal/serializers/storage.py:274 +#: terminal/serializers/storage.py:286 tickets/models/comment.py:26 #: tickets/models/flow.py:56 tickets/models/ticket/apply_application.py:16 #: tickets/models/ticket/general.py:276 tickets/serializers/flow.py:53 #: tickets/serializers/ticket/ticket.py:19 @@ -1415,12 +1415,13 @@ msgid "Unable to connect to port {port} on {address}" msgstr "无法连接到 {port} 上的端口 {address}" #: assets/automations/ping_gateway/manager.py:58 -#: authentication/middleware.py:93 xpack/plugins/cloud/providers/fc.py:47 +#: authentication/middleware.py:94 xpack/plugins/cloud/providers/fc.py:47 msgid "Authentication failed" msgstr "认证失败" #: assets/automations/ping_gateway/manager.py:60 -#: assets/automations/ping_gateway/manager.py:86 terminal/const.py:102 +#: assets/automations/ping_gateway/manager.py:86 audits/backends/__init__.py:29 +#: terminal/const.py:102 msgid "Connect failed" msgstr "连接失败" @@ -1968,7 +1969,8 @@ msgstr "标签" msgid "New node" msgstr "新节点" -#: assets/models/node.py:467 audits/backends/db.py:68 audits/backends/db.py:69 +#: assets/models/node.py:467 audits/backends/db.py:61 audits/backends/db.py:62 +#: audits/backends/es.py:66 audits/backends/es.py:67 msgid "empty" msgstr "空" @@ -2388,15 +2390,7 @@ msgstr "日志审计" msgid "The text content is too long. Use Elasticsearch to store operation logs" msgstr "文字内容太长。请使用 Elasticsearch 存储操作日志" -#: audits/backends/db.py:61 -msgid "labels" -msgstr "标签" - -#: audits/backends/db.py:62 -msgid "operate_log_id" -msgstr "操作日志ID" - -#: audits/backends/db.py:94 +#: audits/backends/db.py:87 msgid "Tips" msgstr "提示" @@ -2479,7 +2473,7 @@ msgstr "结束" #: audits/const.py:46 settings/serializers/terminal.py:6 #: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:175 #: terminal/models/virtualapp/provider.py:14 terminal/serializers/session.py:55 -#: terminal/serializers/session.py:69 +#: terminal/serializers/session.py:79 msgid "Terminal" msgstr "终端" @@ -2504,11 +2498,11 @@ msgstr "任务" msgid "-" msgstr "-" -#: audits/handler.py:116 +#: audits/handler.py:107 msgid "Yes" msgstr "是" -#: audits/handler.py:116 +#: audits/handler.py:107 msgid "No" msgstr "否" @@ -3108,7 +3102,7 @@ msgstr "设置手机号码启用" msgid "Clear phone number to disable" msgstr "清空手机号码禁用" -#: authentication/middleware.py:94 settings/utils/ldap.py:679 +#: authentication/middleware.py:95 settings/utils/ldap.py:679 msgid "Authentication failed (before login check failed): {}" msgstr "认证失败 (登录前检查失败): {}" @@ -3387,7 +3381,7 @@ msgstr "你的账号存在异地登录行为，请关注。" msgid "Login time" msgstr "登录日期" -#: authentication/templates/authentication/_msg_different_city.html:16 +#: authentication/templates/authentication/_msg_different_city.html:14 msgid "" "If you suspect that the login behavior is abnormal, please modify the " "account password in time." @@ -3411,13 +3405,13 @@ msgstr "请点击下面链接重置密码， 如果不是您申请的，请关 msgid "Click here reset password" msgstr "点击这里重置密码" -#: authentication/templates/authentication/_msg_reset_password.html:16 -#: users/templates/users/_msg_user_created.html:22 +#: authentication/templates/authentication/_msg_reset_password.html:15 +#: users/templates/users/_msg_user_created.html:20 msgid "This link is valid for 1 hour. After it expires" msgstr "这个链接有效期1小时, 超过时间您可以" -#: authentication/templates/authentication/_msg_reset_password.html:17 -#: users/templates/users/_msg_user_created.html:23 +#: authentication/templates/authentication/_msg_reset_password.html:16 +#: users/templates/users/_msg_user_created.html:21 msgid "request new one" msgstr "重新申请" @@ -3446,14 +3440,14 @@ msgstr "你的密码刚刚成功更新" msgid "Browser" msgstr "浏览器" -#: authentication/templates/authentication/_msg_rest_password_success.html:13 +#: authentication/templates/authentication/_msg_rest_password_success.html:12 msgid "" "If the password update was not initiated by you, your account may have " "security issues" msgstr "如果这次密码更新不是由你发起的，那么你的账号可能存在安全问题" -#: authentication/templates/authentication/_msg_rest_password_success.html:14 -#: authentication/templates/authentication/_msg_rest_public_key_success.html:14 +#: authentication/templates/authentication/_msg_rest_password_success.html:13 +#: authentication/templates/authentication/_msg_rest_public_key_success.html:13 msgid "If you have any questions, you can contact the administrator" msgstr "如果有疑问或需求，请联系系统管理员" @@ -3461,7 +3455,7 @@ msgstr "如果有疑问或需求，请联系系统管理员" msgid "Your public key has just been successfully updated" msgstr "你的公钥刚刚成功更新" -#: authentication/templates/authentication/_msg_rest_public_key_success.html:13 +#: authentication/templates/authentication/_msg_rest_public_key_success.html:12 msgid "" "If the public key update was not initiated by you, your account may have " "security issues" @@ -3534,7 +3528,7 @@ msgid "LAN" msgstr "局域网" #: authentication/views/base.py:70 -#: perms/templates/perms/_msg_permed_items_expire.html:21 +#: perms/templates/perms/_msg_permed_items_expire.html:20 msgid "If you have any question, please contact the administrator" msgstr "如果有疑问或需求，请联系系统管理员" @@ -4408,7 +4402,7 @@ msgstr "Material" msgid "Material Type" msgstr "Material 类型" -#: ops/models/job.py:545 +#: ops/models/job.py:555 msgid "Job Execution" msgstr "作业执行" @@ -6514,7 +6508,7 @@ msgstr "不允许删除正在使用的存储配置" msgid "Command storages" msgstr "命令存储" -#: terminal/api/component/storage.py:82 +#: terminal/api/component/storage.py:82 xpack/plugins/cloud/manager.py:83 msgid "Invalid" msgstr "无效" @@ -6908,7 +6902,7 @@ msgstr "登录来源" msgid "Replay" msgstr "回放" -#: terminal/models/session/session.py:48 terminal/serializers/session.py:68 +#: terminal/models/session/session.py:48 terminal/serializers/session.py:78 msgid "Command amount" msgstr "命令数量" @@ -7286,7 +7280,8 @@ msgstr "Access key ID(AK)" msgid "Access key secret" msgstr "Access key secret(SK)" -#: terminal/serializers/storage.py:68 xpack/plugins/cloud/models.py:258 +#: terminal/serializers/storage.py:68 xpack/plugins/cloud/manager.py:83 +#: xpack/plugins/cloud/models.py:258 msgid "Region" msgstr "地域" @@ -7343,6 +7338,14 @@ msgstr "索引" msgid "Doc type" msgstr "文档类型" +#: terminal/serializers/storage.py:258 +msgid "Store locally" +msgstr "本地存储" + +#: terminal/serializers/storage.py:259 +msgid "Do not save" +msgstr "不保存" + #: terminal/serializers/task.py:9 msgid "Session id" msgstr "会话 ID" @@ -8100,7 +8103,7 @@ msgid "User password history" msgstr "用户密码历史" #: users/notifications.py:55 -#: users/templates/users/_msg_password_expire_reminder.html:17 +#: users/templates/users/_msg_password_expire_reminder.html:16 #: users/templates/users/reset_password.html:5 #: users/templates/users/reset_password.html:6 msgid "Reset password" @@ -8355,7 +8358,7 @@ msgstr "为了您的账号安全，请点击下面的链接及时更新密码" msgid "Click here update password" msgstr "点击这里更新密码" -#: users/templates/users/_msg_password_expire_reminder.html:16 +#: users/templates/users/_msg_password_expire_reminder.html:15 msgid "If your password has expired, please click the link below to" msgstr "如果你的密码已过期，请点击" @@ -8728,11 +8731,6 @@ msgstr "与" msgid "Or" msgstr "或" -#: xpack/plugins/cloud/manager.py:55 xpack/plugins/cloud/providers/gcp.py:64 -#: xpack/plugins/cloud/providers/huaweicloud.py:34 -msgid "Account unavailable" -msgstr "账号无效" - #: xpack/plugins/cloud/meta.py:9 msgid "Cloud center" msgstr "云管中心" @@ -8767,8 +8765,8 @@ msgstr "IP网段组" #: xpack/plugins/cloud/models.py:100 #: xpack/plugins/cloud/serializers/task.py:167 -msgid "Preferred IP type" -msgstr "首选 IP 类型" +msgid "Sync IP type" +msgstr "同步 IP 类型" #: xpack/plugins/cloud/models.py:103 #: xpack/plugins/cloud/serializers/task.py:185 @@ -9028,6 +9026,11 @@ msgstr "华东-上海" msgid "AP-Singapore" msgstr "亚太-新加坡" +#: xpack/plugins/cloud/providers/gcp.py:64 +#: xpack/plugins/cloud/providers/huaweicloud.py:34 +msgid "Account unavailable" +msgstr "账号无效" + #: xpack/plugins/cloud/providers/huaweicloud.py:44 msgid "CN North-Beijing1" msgstr "华北-北京1" @@ -9275,7 +9278,4 @@ msgstr "企业专业版" #: xpack/plugins/license/models.py:86 msgid "Ultimate edition" -msgstr "企业旗舰版" - -#~ msgid "Account history" -#~ msgstr "账号历史" +msgstr "企业旗舰版" \ No newline at end of file diff --git a/apps/locale/zh_Hant/LC_MESSAGES/django.mo b/apps/locale/zh_Hant/LC_MESSAGES/django.mo index 72d7016b8..a740926f1 100644 --- a/apps/locale/zh_Hant/LC_MESSAGES/django.mo +++ b/apps/locale/zh_Hant/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4aaedb4c31b1d11ddf63e5d0a27958ee5d42e78e2ce255746b8134d18ffc990f -size 146283 +oid sha256:bff387dec9ea743be3db8a192413d2e0691a747de164aed5f213d94b78f18c54 +size 146290 diff --git a/apps/locale/zh_Hant/LC_MESSAGES/django.po b/apps/locale/zh_Hant/LC_MESSAGES/django.po index 9e530430c..4f950081a 100644 --- a/apps/locale/zh_Hant/LC_MESSAGES/django.po +++ b/apps/locale/zh_Hant/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: 2024-08-20 14:54+0800\n" +"POT-Creation-Date: 2024-10-22 16:57+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -798,8 +798,8 @@ msgstr "類別" #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:40 #: terminal/models/component/storage.py:57 #: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29 -#: terminal/serializers/session.py:23 terminal/serializers/storage.py:271 -#: terminal/serializers/storage.py:283 tickets/models/comment.py:26 +#: terminal/serializers/session.py:23 terminal/serializers/storage.py:274 +#: terminal/serializers/storage.py:286 tickets/models/comment.py:26 #: tickets/models/flow.py:56 tickets/models/ticket/apply_application.py:16 #: tickets/models/ticket/general.py:276 tickets/serializers/flow.py:53 #: tickets/serializers/ticket/ticket.py:19 @@ -1417,12 +1417,13 @@ msgid "Unable to connect to port {port} on {address}" msgstr "無法連接到 {port} 上的埠 {address}" #: assets/automations/ping_gateway/manager.py:58 -#: authentication/middleware.py:93 xpack/plugins/cloud/providers/fc.py:47 +#: authentication/middleware.py:94 xpack/plugins/cloud/providers/fc.py:47 msgid "Authentication failed" msgstr "認證失敗" #: assets/automations/ping_gateway/manager.py:60 -#: assets/automations/ping_gateway/manager.py:86 terminal/const.py:102 +#: assets/automations/ping_gateway/manager.py:86 audits/backends/__init__.py:29 +#: terminal/const.py:102 msgid "Connect failed" msgstr "連接失敗" @@ -1970,7 +1971,8 @@ msgstr "標籤" msgid "New node" msgstr "新節點" -#: assets/models/node.py:467 audits/backends/db.py:68 audits/backends/db.py:69 +#: assets/models/node.py:467 audits/backends/db.py:61 audits/backends/db.py:62 +#: audits/backends/es.py:66 audits/backends/es.py:67 msgid "empty" msgstr "空" @@ -2390,15 +2392,7 @@ msgstr "日誌審計" msgid "The text content is too long. Use Elasticsearch to store operation logs" msgstr "文字內容太長。請使用 Elasticsearch 儲存操作日誌" -#: audits/backends/db.py:61 -msgid "labels" -msgstr "標籤" - -#: audits/backends/db.py:62 -msgid "operate_log_id" -msgstr "操作日誌ID" - -#: audits/backends/db.py:94 +#: audits/backends/db.py:87 msgid "Tips" msgstr "提示" @@ -2481,7 +2475,7 @@ msgstr "結束" #: audits/const.py:46 settings/serializers/terminal.py:6 #: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:175 #: terminal/models/virtualapp/provider.py:14 terminal/serializers/session.py:55 -#: terminal/serializers/session.py:69 +#: terminal/serializers/session.py:79 msgid "Terminal" msgstr "終端" @@ -2506,11 +2500,11 @@ msgstr "任務" msgid "-" msgstr "-" -#: audits/handler.py:116 +#: audits/handler.py:107 msgid "Yes" msgstr "是" -#: audits/handler.py:116 +#: audits/handler.py:107 msgid "No" msgstr "否" @@ -3110,7 +3104,7 @@ msgstr "設置手機號碼啟用" msgid "Clear phone number to disable" msgstr "清空手機號碼禁用" -#: authentication/middleware.py:94 settings/utils/ldap.py:679 +#: authentication/middleware.py:95 settings/utils/ldap.py:679 msgid "Authentication failed (before login check failed): {}" msgstr "認證失敗 (登錄前檢查失敗): {}" @@ -3389,7 +3383,7 @@ msgstr "你的帳號存在異地登入行為，請關注。" msgid "Login time" msgstr "登錄日期" -#: authentication/templates/authentication/_msg_different_city.html:16 +#: authentication/templates/authentication/_msg_different_city.html:14 msgid "" "If you suspect that the login behavior is abnormal, please modify the " "account password in time." @@ -3413,13 +3407,13 @@ msgstr "請點擊下面連結重設密碼， 如果不是您申請的，請關 msgid "Click here reset password" msgstr "點擊這裡重設密碼" -#: authentication/templates/authentication/_msg_reset_password.html:16 -#: users/templates/users/_msg_user_created.html:22 +#: authentication/templates/authentication/_msg_reset_password.html:15 +#: users/templates/users/_msg_user_created.html:20 msgid "This link is valid for 1 hour. After it expires" msgstr "這個連結有效期1小時, 超過時間您可以" -#: authentication/templates/authentication/_msg_reset_password.html:17 -#: users/templates/users/_msg_user_created.html:23 +#: authentication/templates/authentication/_msg_reset_password.html:16 +#: users/templates/users/_msg_user_created.html:21 msgid "request new one" msgstr "重新申請" @@ -3448,14 +3442,14 @@ msgstr "你的密碼剛剛成功更新" msgid "Browser" msgstr "瀏覽器" -#: authentication/templates/authentication/_msg_rest_password_success.html:13 +#: authentication/templates/authentication/_msg_rest_password_success.html:12 msgid "" "If the password update was not initiated by you, your account may have " "security issues" msgstr "如果這次密碼更新不是由你發起的，那麼你的帳號可能存在安全問題" -#: authentication/templates/authentication/_msg_rest_password_success.html:14 -#: authentication/templates/authentication/_msg_rest_public_key_success.html:14 +#: authentication/templates/authentication/_msg_rest_password_success.html:13 +#: authentication/templates/authentication/_msg_rest_public_key_success.html:13 msgid "If you have any questions, you can contact the administrator" msgstr "如果有疑問或需求，請聯絡系統管理員" @@ -3463,7 +3457,7 @@ msgstr "如果有疑問或需求，請聯絡系統管理員" msgid "Your public key has just been successfully updated" msgstr "你的公鑰剛剛成功更新" -#: authentication/templates/authentication/_msg_rest_public_key_success.html:13 +#: authentication/templates/authentication/_msg_rest_public_key_success.html:12 msgid "" "If the public key update was not initiated by you, your account may have " "security issues" @@ -3536,7 +3530,7 @@ msgid "LAN" msgstr "區域網路" #: authentication/views/base.py:70 -#: perms/templates/perms/_msg_permed_items_expire.html:21 +#: perms/templates/perms/_msg_permed_items_expire.html:20 msgid "If you have any question, please contact the administrator" msgstr "如果有疑問或需求，請聯絡系統管理員" @@ -4409,7 +4403,7 @@ msgstr "Material" msgid "Material Type" msgstr "Material 類型" -#: ops/models/job.py:545 +#: ops/models/job.py:555 msgid "Job Execution" msgstr "作業執行" @@ -6515,7 +6509,7 @@ msgstr "不允許刪除正在使用的儲存配置" msgid "Command storages" msgstr "命令儲存" -#: terminal/api/component/storage.py:82 +#: terminal/api/component/storage.py:82 xpack/plugins/cloud/manager.py:83 msgid "Invalid" msgstr "無效" @@ -6909,7 +6903,7 @@ msgstr "登錄來源" msgid "Replay" msgstr "重播" -#: terminal/models/session/session.py:48 terminal/serializers/session.py:68 +#: terminal/models/session/session.py:48 terminal/serializers/session.py:78 msgid "Command amount" msgstr "命令數量" @@ -7287,7 +7281,8 @@ msgstr "Access key ID(AK)" msgid "Access key secret" msgstr "Access key secret(SK)" -#: terminal/serializers/storage.py:68 xpack/plugins/cloud/models.py:258 +#: terminal/serializers/storage.py:68 xpack/plugins/cloud/manager.py:83 +#: xpack/plugins/cloud/models.py:258 msgid "Region" msgstr "地域" @@ -7344,6 +7339,14 @@ msgstr "索引" msgid "Doc type" msgstr "文件類型" +#: terminal/serializers/storage.py:258 +msgid "Store locally" +msgstr "本地儲存" + +#: terminal/serializers/storage.py:259 +msgid "Do not save" +msgstr "不儲存" + #: terminal/serializers/task.py:9 msgid "Session id" msgstr "會話 ID" @@ -8101,7 +8104,7 @@ msgid "User password history" msgstr "用戶密碼歷史" #: users/notifications.py:55 -#: users/templates/users/_msg_password_expire_reminder.html:17 +#: users/templates/users/_msg_password_expire_reminder.html:16 #: users/templates/users/reset_password.html:5 #: users/templates/users/reset_password.html:6 msgid "Reset password" @@ -8356,7 +8359,7 @@ msgstr "為了您的帳號安全，請點擊下面的連結及時更新密碼" msgid "Click here update password" msgstr "點擊這裡更新密碼" -#: users/templates/users/_msg_password_expire_reminder.html:16 +#: users/templates/users/_msg_password_expire_reminder.html:15 msgid "If your password has expired, please click the link below to" msgstr "如果你的密碼已過期，請點擊" @@ -8729,11 +8732,6 @@ msgstr "與" msgid "Or" msgstr "或" -#: xpack/plugins/cloud/manager.py:55 xpack/plugins/cloud/providers/gcp.py:64 -#: xpack/plugins/cloud/providers/huaweicloud.py:34 -msgid "Account unavailable" -msgstr "帳號無效" - #: xpack/plugins/cloud/meta.py:9 msgid "Cloud center" msgstr "雲管中心" @@ -8768,8 +8766,8 @@ msgstr "IP網段組" #: xpack/plugins/cloud/models.py:100 #: xpack/plugins/cloud/serializers/task.py:167 -msgid "Preferred IP type" -msgstr "首選 IP 類型" +msgid "Sync IP type" +msgstr "同步 IP 類型" #: xpack/plugins/cloud/models.py:103 #: xpack/plugins/cloud/serializers/task.py:185 @@ -9029,6 +9027,11 @@ msgstr "華東-上海" msgid "AP-Singapore" msgstr "亞太-新加坡" +#: xpack/plugins/cloud/providers/gcp.py:64 +#: xpack/plugins/cloud/providers/huaweicloud.py:34 +msgid "Account unavailable" +msgstr "帳號無效" + #: xpack/plugins/cloud/providers/huaweicloud.py:44 msgid "CN North-Beijing1" msgstr "華北-北京1" @@ -9277,6 +9280,3 @@ msgstr "企業專業版" #: xpack/plugins/license/models.py:86 msgid "Ultimate edition" msgstr "企業旗艦版" - -#~ msgid "Account history" -#~ msgstr "帳號歷史" diff --git a/apps/terminal/serializers/storage.py b/apps/terminal/serializers/storage.py index 3b9a66adf..b706fbbef 100644 --- a/apps/terminal/serializers/storage.py +++ b/apps/terminal/serializers/storage.py @@ -220,7 +220,6 @@ command_storage_type_serializer_classes_mapping = { class BaseStorageSerializer(serializers.ModelSerializer): storage_type_serializer_classes_mapping = {} meta = MethodSerializer() - comment = serializers.SerializerMethodField() class Meta: model = None @@ -253,11 +252,15 @@ class BaseStorageSerializer(serializers.ModelSerializer): serializer = serializer_class return serializer - @staticmethod - def get_comment(obj): - need_translate_comments = ['Store locally', 'Do not save'] - comment = obj.comment - return _(comment) if comment in need_translate_comments else comment + def to_representation(self, instance): + data = super().to_representation(instance) + need_translate_comments = { + 'Store locally': _('Store locally'), + 'Do not save': _('Do not save') + } + comment = instance.comment + data['comment'] = need_translate_comments.get(comment, comment) + return data def save(self, **kwargs): instance = super().save(**kwargs)