From 9b8c817a16547c6fe573ebc33efce5cc196096ea Mon Sep 17 00:00:00 2001 From: wangruidong <940853815@qq.com> Date: Thu, 2 Nov 2023 15:16:04 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?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/serializers/token.py | 2 +- apps/locale/ja/LC_MESSAGES/django.po | 71 ++++++++++++----------- apps/locale/zh/LC_MESSAGES/django.mo | 4 +- apps/locale/zh/LC_MESSAGES/django.po | 73 +++++++++++++----------- 4 files changed, 81 insertions(+), 69 deletions(-) diff --git a/apps/authentication/serializers/token.py b/apps/authentication/serializers/token.py index 6cd3af912..58239d1ee 100644 --- a/apps/authentication/serializers/token.py +++ b/apps/authentication/serializers/token.py @@ -19,7 +19,7 @@ __all__ = [ class AccessKeySerializer(serializers.ModelSerializer): ip_group = serializers.ListField( - default=['*'], label=_('AccessIP'), help_text=ip_group_help_text, + default=['*'], label=_('Access IP'), help_text=ip_group_help_text, child=serializers.CharField(max_length=1024, validators=[ip_group_child_validator]) ) diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index 0f9d4b4a6..2d7ee8d3c 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-31 14:04+0800\n" +"POT-Creation-Date: 2023-11-02 14:52+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,7 +27,7 @@ msgstr "パラメータ 'action' は [{}] でなければなりません。" #: assets/models/_user.py:24 audits/signal_handlers/login_log.py:34 #: authentication/confirm/password.py:9 authentication/confirm/password.py:24 #: authentication/confirm/password.py:26 authentication/forms.py:32 -#: authentication/templates/authentication/login.html:324 +#: authentication/templates/authentication/login.html:330 #: 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 @@ -422,6 +422,18 @@ msgstr "開始日" msgid "Date finished" msgstr "終了日" +#: accounts/models/automations/change_secret.py:43 +#: assets/models/automations/base.py:113 audits/models.py:207 +#: audits/serializers.py:51 ops/models/base.py:49 ops/models/job.py:220 +#: terminal/models/applet/applet.py:316 terminal/models/applet/host.py:140 +#: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 +#: terminal/serializers/applet_host.py:124 tickets/models/ticket/general.py:283 +#: tickets/serializers/super_ticket.py:13 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:201 +#: xpack/plugins/cloud/models.py:257 +msgid "Status" +msgstr "ステータス" + #: accounts/models/automations/change_secret.py:44 #: accounts/serializers/account/account.py:257 assets/const/automation.py:8 #: authentication/templates/authentication/passkey.html:173 @@ -920,10 +932,16 @@ msgstr "アカウントを追加: %s" msgid "Delete account: %s" msgstr "アカウントを削除: %s" -#: accounts/tasks/automation.py:24 +#: accounts/tasks/automation.py:25 msgid "Account execute automation" msgstr "アカウント実行の自動化" +#: accounts/tasks/automation.py:51 accounts/tasks/automation.py:62 +#, fuzzy +#| msgid "Asset execute automation" +msgid "Execute automation record" +msgstr "アセット実行の自動化" + #: accounts/tasks/backup_account.py:25 msgid "Execute account backup plan" msgstr "アカウントのバックアップ計画を実施する" @@ -1259,11 +1277,11 @@ msgstr "同じレベルのノード名を同じにすることはできません msgid "App assets" msgstr "アプリ資産" -#: assets/automations/base/manager.py:136 +#: assets/automations/base/manager.py:133 msgid "{} disabled" msgstr "{} 無効" -#: assets/automations/base/manager.py:202 +#: assets/automations/base/manager.py:199 msgid " - Platform {} ansible disabled" msgstr " - プラットフォーム {} ansible 無効" @@ -1710,17 +1728,6 @@ msgstr "自動化されたタスク" msgid "Asset automation task" msgstr "アセットの自動化タスク" -#: assets/models/automations/base.py:113 audits/models.py:207 -#: audits/serializers.py:51 ops/models/base.py:49 ops/models/job.py:220 -#: terminal/models/applet/applet.py:316 terminal/models/applet/host.py:140 -#: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 -#: terminal/serializers/applet_host.py:124 tickets/models/ticket/general.py:283 -#: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:201 -#: xpack/plugins/cloud/models.py:257 -msgid "Status" -msgstr "ステータス" - #: assets/models/automations/gather_facts.py:15 msgid "Gather asset facts" msgstr "資産情報の収集" @@ -2293,8 +2300,8 @@ msgstr "作成" msgid "Connect" msgstr "接続" -#: audits/const.py:30 authentication/templates/authentication/login.html:290 -#: authentication/templates/authentication/login.html:363 +#: audits/const.py:30 authentication/templates/authentication/login.html:296 +#: authentication/templates/authentication/login.html:369 #: templates/_header_bar.html:95 msgid "Login" msgstr "ログイン" @@ -2601,7 +2608,7 @@ msgstr "" "さい。" #: authentication/api/password.py:67 -#: authentication/templates/authentication/login.html:355 +#: authentication/templates/authentication/login.html:361 #: users/templates/users/forgot_password.html:27 #: users/templates/users/forgot_password.html:28 #: users/templates/users/forgot_password_previewing.html:13 @@ -3113,13 +3120,13 @@ msgstr "メール" msgid "The {} cannot be empty" msgstr "{} 空にしてはならない" -#: authentication/serializers/token.py:23 +#: authentication/serializers/token.py:22 #, fuzzy #| msgid "Access key" -msgid "AccessIP" -msgstr "アクセスキー" +msgid "Access IP" +msgstr "IPホワイトリスト" -#: authentication/serializers/token.py:93 perms/serializers/permission.py:37 +#: authentication/serializers/token.py:92 perms/serializers/permission.py:37 #: perms/serializers/permission.py:59 users/serializers/user.py:98 #: users/serializers/user.py:168 msgid "Is valid" @@ -3303,7 +3310,7 @@ msgstr "" msgid "Cancel" msgstr "キャンセル" -#: authentication/templates/authentication/login.html:270 +#: authentication/templates/authentication/login.html:276 msgid "" "Configuration file has problems and cannot be logged in. Please contact the " "administrator or view latest docs" @@ -3311,11 +3318,11 @@ msgstr "" "設定ファイルに問題があり、ログインできません。管理者に連絡するか、最新のド" "キュメントを参照してください。" -#: authentication/templates/authentication/login.html:271 +#: authentication/templates/authentication/login.html:277 msgid "If you are administrator, you can update the config resolve it, set" msgstr "管理者の場合は、configを更新して解決することができます。" -#: authentication/templates/authentication/login.html:370 +#: authentication/templates/authentication/login.html:376 msgid "More login options" msgstr "その他のログインオプション" @@ -3574,7 +3581,7 @@ msgstr "テキストフィールドへのマーシャルデータ" msgid "Encrypt field using Secret Key" msgstr "Secret Keyを使用したフィールドの暗号化" -#: common/db/fields.py:558 +#: common/db/fields.py:575 msgid "" "Invalid JSON data for JSONManyToManyField, should be like {'type': 'all'} or " "{'type': 'ids', 'ids': []} or {'type': 'attrs', 'attrs': [{'name': 'ip', " @@ -3584,15 +3591,15 @@ msgstr "" "｛'type'：'ids'，'ids':[]｝或 ＃タイプ：属性、属性：[＃名前：ip、照合：正確、" "値：1.1.1.1｝" -#: common/db/fields.py:565 +#: common/db/fields.py:582 msgid "Invalid type, should be \"all\", \"ids\" or \"attrs\"" msgstr "無効なタイプです。all、ids、またはattrsでなければなりません" -#: common/db/fields.py:568 +#: common/db/fields.py:585 msgid "Invalid ids for ids, should be a list" msgstr "無効なID、リストでなければなりません" -#: common/db/fields.py:570 common/db/fields.py:575 +#: common/db/fields.py:587 common/db/fields.py:592 #: common/serializers/fields.py:104 tickets/serializers/ticket/common.py:58 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 @@ -3600,11 +3607,11 @@ msgstr "無効なID、リストでなければなりません" msgid "This field is required." msgstr "このフィールドは必須です。" -#: common/db/fields.py:573 common/db/fields.py:578 +#: common/db/fields.py:590 common/db/fields.py:595 msgid "Invalid attrs, should be a list of dict" msgstr "無効な属性、dictリストでなければなりません" -#: common/db/fields.py:580 +#: common/db/fields.py:597 msgid "Invalid attrs, should be has name and value" msgstr "名前と値が必要な無効な属性" diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index bdc0399a2..91ea218c2 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:8e12c0cc20ed3b5e16cdef15238c78c27d4189740c3c71fdca9cbb20230bec74 -size 133982 +oid sha256:73e074ad0c1d8bfec0c2df6e2c9e29a230a3acc0e8ee1c0820910e8ce769fd52 +size 134072 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 07c704639..5252027ae 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-31 14:04+0800\n" +"POT-Creation-Date: 2023-11-02 14:52+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -26,7 +26,7 @@ msgstr "参数 'action' 必须是 [{}]" #: assets/models/_user.py:24 audits/signal_handlers/login_log.py:34 #: authentication/confirm/password.py:9 authentication/confirm/password.py:24 #: authentication/confirm/password.py:26 authentication/forms.py:32 -#: authentication/templates/authentication/login.html:324 +#: authentication/templates/authentication/login.html:330 #: 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 @@ -421,6 +421,18 @@ msgstr "开始日期" msgid "Date finished" msgstr "结束日期" +#: accounts/models/automations/change_secret.py:43 +#: assets/models/automations/base.py:113 audits/models.py:207 +#: audits/serializers.py:51 ops/models/base.py:49 ops/models/job.py:220 +#: terminal/models/applet/applet.py:316 terminal/models/applet/host.py:140 +#: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 +#: terminal/serializers/applet_host.py:124 tickets/models/ticket/general.py:283 +#: tickets/serializers/super_ticket.py:13 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:201 +#: xpack/plugins/cloud/models.py:257 +msgid "Status" +msgstr "状态" + #: accounts/models/automations/change_secret.py:44 #: accounts/serializers/account/account.py:257 assets/const/automation.py:8 #: authentication/templates/authentication/passkey.html:173 @@ -917,10 +929,16 @@ msgstr "添加账号: %s" msgid "Delete account: %s" msgstr "删除账号: %s" -#: accounts/tasks/automation.py:24 +#: accounts/tasks/automation.py:25 msgid "Account execute automation" msgstr "账号执行自动化" +#: accounts/tasks/automation.py:51 accounts/tasks/automation.py:62 +#, fuzzy +#| msgid "Asset execute automation" +msgid "Execute automation record" +msgstr "资产执行自动化" + #: accounts/tasks/backup_account.py:25 msgid "Execute account backup plan" msgstr "执行账号备份计划" @@ -1252,11 +1270,11 @@ msgstr "同级别节点名字不能重复" msgid "App assets" msgstr "资产管理" -#: assets/automations/base/manager.py:136 +#: assets/automations/base/manager.py:133 msgid "{} disabled" msgstr "{} 已禁用" -#: assets/automations/base/manager.py:202 +#: assets/automations/base/manager.py:199 msgid " - Platform {} ansible disabled" msgstr " - 平台 {} Ansible 已禁用, 无法执行任务" @@ -1703,17 +1721,6 @@ msgstr "自动化任务" msgid "Asset automation task" msgstr "资产自动化任务" -#: assets/models/automations/base.py:113 audits/models.py:207 -#: audits/serializers.py:51 ops/models/base.py:49 ops/models/job.py:220 -#: terminal/models/applet/applet.py:316 terminal/models/applet/host.py:140 -#: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 -#: terminal/serializers/applet_host.py:124 tickets/models/ticket/general.py:283 -#: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:201 -#: xpack/plugins/cloud/models.py:257 -msgid "Status" -msgstr "状态" - #: assets/models/automations/gather_facts.py:15 msgid "Gather asset facts" msgstr "收集资产信息" @@ -2277,8 +2284,8 @@ msgstr "创建" msgid "Connect" msgstr "连接" -#: audits/const.py:30 authentication/templates/authentication/login.html:290 -#: authentication/templates/authentication/login.html:363 +#: audits/const.py:30 authentication/templates/authentication/login.html:296 +#: authentication/templates/authentication/login.html:369 #: templates/_header_bar.html:95 msgid "Login" msgstr "登录" @@ -2581,7 +2588,7 @@ msgid "" msgstr "用户来自 {} 请去相应系统修改密码" #: authentication/api/password.py:67 -#: authentication/templates/authentication/login.html:355 +#: authentication/templates/authentication/login.html:361 #: users/templates/users/forgot_password.html:27 #: users/templates/users/forgot_password.html:28 #: users/templates/users/forgot_password_previewing.html:13 @@ -3082,13 +3089,11 @@ msgstr "邮箱" msgid "The {} cannot be empty" msgstr "{} 不能为空" -#: authentication/serializers/token.py:23 -#, fuzzy -#| msgid "Access key" -msgid "AccessIP" -msgstr "アクセスIP" +#: authentication/serializers/token.py:22 +msgid "Access IP" +msgstr "IP 白名单" -#: authentication/serializers/token.py:93 perms/serializers/permission.py:37 +#: authentication/serializers/token.py:92 perms/serializers/permission.py:37 #: perms/serializers/permission.py:59 users/serializers/user.py:98 #: users/serializers/user.py:168 msgid "Is valid" @@ -3264,17 +3269,17 @@ msgstr "如果这次公钥更新不是由你发起的，那么你的账号可能 msgid "Cancel" msgstr "取消" -#: authentication/templates/authentication/login.html:270 +#: authentication/templates/authentication/login.html:276 msgid "" "Configuration file has problems and cannot be logged in. Please contact the " "administrator or view latest docs" msgstr "配置文件有问题，无法登录，请联系管理员或查看最新文档" -#: authentication/templates/authentication/login.html:271 +#: authentication/templates/authentication/login.html:277 msgid "If you are administrator, you can update the config resolve it, set" msgstr "如果你是管理员，可以更新配置文件解决，设置配置项" -#: authentication/templates/authentication/login.html:370 +#: authentication/templates/authentication/login.html:376 msgid "More login options" msgstr "其他方式登录" @@ -3531,7 +3536,7 @@ msgstr "编码数据为 text" msgid "Encrypt field using Secret Key" msgstr "加密的字段" -#: common/db/fields.py:558 +#: common/db/fields.py:575 msgid "" "Invalid JSON data for JSONManyToManyField, should be like {'type': 'all'} or " "{'type': 'ids', 'ids': []} or {'type': 'attrs', 'attrs': [{'name': 'ip', " @@ -3541,15 +3546,15 @@ msgstr "" "{'type': 'attrs', 'attrs': [{'name': 'ip', 'match': 'exact', 'value': " "'1.1.1.1'}}" -#: common/db/fields.py:565 +#: common/db/fields.py:582 msgid "Invalid type, should be \"all\", \"ids\" or \"attrs\"" msgstr "无效类型，应为 all、ids 或 attrs" -#: common/db/fields.py:568 +#: common/db/fields.py:585 msgid "Invalid ids for ids, should be a list" msgstr "无效的ID，应为列表" -#: common/db/fields.py:570 common/db/fields.py:575 +#: common/db/fields.py:587 common/db/fields.py:592 #: common/serializers/fields.py:104 tickets/serializers/ticket/common.py:58 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 @@ -3557,11 +3562,11 @@ msgstr "无效的ID，应为列表" msgid "This field is required." msgstr "该字段是必填项。" -#: common/db/fields.py:573 common/db/fields.py:578 +#: common/db/fields.py:590 common/db/fields.py:595 msgid "Invalid attrs, should be a list of dict" msgstr "无效的属性，应为dict列表" -#: common/db/fields.py:580 +#: common/db/fields.py:597 msgid "Invalid attrs, should be has name and value" msgstr "无效属性，应具有名称和值"