From fb32c976b2b71f658391fe1533e1b0b71bdabe65 Mon Sep 17 00:00:00 2001 From: Bai Date: Fri, 17 Feb 2023 19:23:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BF=BB=E8=AF=91=E6=89=80=E6=9C=89=20c?= =?UTF-8?q?elerytask=20verbose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/accounts/tasks/verify_account.py | 2 +- apps/audits/tasks.py | 2 - apps/locale/ja/LC_MESSAGES/django.mo | 4 +- apps/locale/ja/LC_MESSAGES/django.po | 92 +++++++++-------------- apps/locale/zh/LC_MESSAGES/django.mo | 4 +- apps/locale/zh/LC_MESSAGES/django.po | 104 +++++++++++++------------- 6 files changed, 93 insertions(+), 115 deletions(-) diff --git a/apps/accounts/tasks/verify_account.py b/apps/accounts/tasks/verify_account.py index 5db0f61a0..dcb0cb58f 100644 --- a/apps/accounts/tasks/verify_account.py +++ b/apps/accounts/tasks/verify_account.py @@ -1,6 +1,6 @@ from celery import shared_task from django.utils.translation import gettext_noop -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext_lazy as _ from accounts.const import AutomationTypes from accounts.tasks.common import automation_execute_start diff --git a/apps/audits/tasks.py b/apps/audits/tasks.py index 3c4abded3..7cd172bdd 100644 --- a/apps/audits/tasks.py +++ b/apps/audits/tasks.py @@ -49,8 +49,6 @@ def clean_ftp_log_period(): FTPLog.objects.filter(date_start__lt=expired_day).delete() -@shared_task(verbose_name=_('Clean audits log')) -@register_as_period_task(interval=3600 * 24) def clean_celery_tasks_period(): logger.debug("Start clean celery task history") expire_days = get_log_keep_day('TASK_LOG_KEEP_DAYS') diff --git a/apps/locale/ja/LC_MESSAGES/django.mo b/apps/locale/ja/LC_MESSAGES/django.mo index 28cbce867..7dfb18403 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:6717c42fb411e6469fc755487eea88e926088a5a73dcf00a0d52e1b9986ae147 -size 136360 +oid sha256:38dc2a7cac1399549375e745775e28bd4aa3d3a305f636a48dface30fa500814 +size 135976 diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index 70fbc2f46..a1a9378e7 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-02-17 16:56+0800\n" +"POT-Creation-Date: 2023-02-17 19:12+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -892,21 +892,6 @@ msgstr "アプリケーション" msgid "Can match application" msgstr "アプリケーションを一致させることができます" -#: applications/serializers/attrs/application_type/clickhouse.py:11 -#: assets/models/asset/common.py:96 assets/models/platform.py:21 -#: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:68 -#: xpack/plugins/cloud/serializers/account_attrs.py:73 -msgid "Port" -msgstr "ポート" - -#: applications/serializers/attrs/application_type/clickhouse.py:13 -msgid "" -"Typically, the port is 9000，the HTTP interface and the native interface use " -"different ports" -msgstr "" -"デフォルトポートは9000で、HTTPインタフェースとネイティブインタフェースは異な" -"るポートを使用する" - #: assets/api/asset/asset.py:145 msgid "Cannot create asset directly, you should create a host or other" msgstr "" @@ -980,13 +965,14 @@ msgstr "テストゲートウェイ" msgid "Gather facts" msgstr "資産情報の収集" -#: assets/const/category.py:11 settings/serializers/auth/radius.py:16 -#: settings/serializers/auth/sms.py:67 terminal/models/component/endpoint.py:13 +#: assets/const/category.py:11 assets/models/asset/host.py:8 +#: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:67 +#: terminal/models/component/endpoint.py:13 #: xpack/plugins/cloud/serializers/account_attrs.py:72 msgid "Host" msgstr "ホスト" -#: assets/const/category.py:12 +#: assets/const/category.py:12 assets/models/asset/device.py:8 msgid "Device" msgstr "インターネット機器" @@ -999,7 +985,7 @@ msgstr "データベース" msgid "Cloud service" msgstr "クラウド サービス" -#: assets/const/category.py:15 audits/const.py:33 +#: assets/const/category.py:15 assets/models/asset/web.py:16 audits/const.py:33 #: terminal/models/applet/applet.py:24 msgid "Web" msgstr "Web" @@ -1156,6 +1142,16 @@ msgstr "システムユーザー" msgid "Can match system user" msgstr "システムユーザーに一致できます" +#: assets/models/asset/cloud.py:11 +msgid "Cloud" +msgstr "クラウド サービス" + +#: assets/models/asset/common.py:96 assets/models/platform.py:21 +#: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:68 +#: xpack/plugins/cloud/serializers/account_attrs.py:73 +msgid "Port" +msgstr "ポート" + #: assets/models/asset/common.py:108 assets/serializers/asset/common.py:141 msgid "Address" msgstr "アドレス" @@ -1816,7 +1812,7 @@ msgstr "ファイル名" msgid "File transfer log" msgstr "ファイル転送ログ" -#: audits/models.py:55 audits/serializers.py:94 +#: audits/models.py:55 msgid "Resource Type" msgstr "リソースタイプ" @@ -1894,7 +1890,7 @@ msgstr "ユーザーログインログ" msgid "Reason display" msgstr "理由表示" -#: audits/serializers.py:124 +#: audits/serializers.py:123 #, python-format msgid "User %s %s this resource" msgstr "ユーザー %s %s が現在のリソースをサブスクライブしました。" @@ -1950,11 +1946,7 @@ msgstr "DingTalk" msgid "Temporary token" msgstr "仮パスワード" -#: audits/tasks.py:52 -msgid "Clean audits log" -msgstr "監査ログのクリーンアップ" - -#: audits/tasks.py:92 +#: audits/tasks.py:90 msgid "Clean audits session task log" msgstr "監査セッション タスク ログのクリーンアップ" @@ -3106,10 +3098,9 @@ msgid "Invalid address" msgstr "無効なアドレス。" #: common/utils/translate.py:42 -#, fuzzy, python-format -#| msgid "Hello" +#, python-format msgid "Hello %s" -msgstr "こんにちは" +msgstr "こんにちは %s" #: common/validators.py:14 msgid "Special char not allowed" @@ -4623,63 +4614,46 @@ msgstr "OTP発行者名" msgid "OTP valid window" msgstr "OTP有効なウィンドウ" -#: settings/serializers/other.py:23 -msgid "CMD" -msgstr "CMD" - -#: settings/serializers/other.py:24 -msgid "PowerShell" -msgstr "PowerShell" - -#: settings/serializers/other.py:26 -msgid "Shell (Windows)" -msgstr "シェル (Windows)" - -#: settings/serializers/other.py:27 -msgid "The shell type used when Windows assets perform ansible tasks" -msgstr "" -"Windowsアセットが実行可能なタスクを実行するときに使用されるシェルタイプ" - -#: settings/serializers/other.py:31 +#: settings/serializers/other.py:22 msgid "Perm ungroup node" msgstr "グループ化されていないノードを表示" -#: settings/serializers/other.py:32 +#: settings/serializers/other.py:23 msgid "Perm single to ungroup node" msgstr "" "グループ化されていないノードに個別に許可された資産を配置し、資産が存在する" "ノードが表示されないようにしますが、そのノードが許可されていないという質問に" "質問" -#: settings/serializers/other.py:37 +#: settings/serializers/other.py:28 msgid "Ticket authorize default time" msgstr "デフォルト製造オーダ承認時間" -#: settings/serializers/other.py:40 +#: settings/serializers/other.py:31 msgid "day" msgstr "日" -#: settings/serializers/other.py:40 +#: settings/serializers/other.py:31 msgid "hour" msgstr "時" -#: settings/serializers/other.py:41 +#: settings/serializers/other.py:32 msgid "Ticket authorize default time unit" msgstr "デフォルト製造オーダ承認時間単位" -#: settings/serializers/other.py:44 +#: settings/serializers/other.py:35 msgid "Help Docs URL" msgstr "ドキュメントリンク" -#: settings/serializers/other.py:45 +#: settings/serializers/other.py:36 msgid "default: http://docs.jumpserver.org" msgstr "デフォルト: http://docs.jumpserver.org" -#: settings/serializers/other.py:49 +#: settings/serializers/other.py:40 msgid "Help Support URL" msgstr "サポートリンク" -#: settings/serializers/other.py:50 +#: settings/serializers/other.py:41 msgid "default: http://www.jumpserver.org/support/" msgstr "デフォルト: http://www.jumpserver.org/support/" @@ -7316,6 +7290,10 @@ msgstr "インスタンス数" msgid "Run sync instance task" msgstr "同期インスタンス タスクを実行する" +#: xpack/plugins/cloud/tasks.py:41 +msgid "Period clean sync instance task execution" +msgstr "同期インスタンス タスクの実行記録を定期的にクリアする" + #: xpack/plugins/cloud/utils.py:69 msgid "Account unavailable" msgstr "利用できないアカウント" diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 70af7fd7f..6ba4a0014 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:8109162896c38e80e2a22895cd42e48b174e7b44897d7ea34c4c19f8eb865e81 -size 112043 +oid sha256:efc2a851536c7c7ee6fc9de33630d716e58fdaaa4dd1bce63a13e8a32482b4ae +size 111687 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 7a733d281..31bb51419 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-02-17 16:56+0800\n" +"POT-Creation-Date: 2023-02-17 19:12+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -886,19 +886,6 @@ msgstr "应用程序" msgid "Can match application" msgstr "匹配应用" -#: applications/serializers/attrs/application_type/clickhouse.py:11 -#: assets/models/asset/common.py:96 assets/models/platform.py:21 -#: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:68 -#: xpack/plugins/cloud/serializers/account_attrs.py:73 -msgid "Port" -msgstr "端口" - -#: applications/serializers/attrs/application_type/clickhouse.py:13 -msgid "" -"Typically, the port is 9000，the HTTP interface and the native interface use " -"different ports" -msgstr "默认端口为9000, HTTP接口和本机接口使用不同的端口" - #: assets/api/asset/asset.py:145 msgid "Cannot create asset directly, you should create a host or other" msgstr "不能直接创建资产, 你应该创建主机或其他资产" @@ -970,13 +957,14 @@ msgstr "测试网关" msgid "Gather facts" msgstr "收集资产信息" -#: assets/const/category.py:11 settings/serializers/auth/radius.py:16 -#: settings/serializers/auth/sms.py:67 terminal/models/component/endpoint.py:13 +#: assets/const/category.py:11 assets/models/asset/host.py:8 +#: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:67 +#: terminal/models/component/endpoint.py:13 #: xpack/plugins/cloud/serializers/account_attrs.py:72 msgid "Host" msgstr "主机" -#: assets/const/category.py:12 +#: assets/const/category.py:12 assets/models/asset/device.py:8 msgid "Device" msgstr "网络设备" @@ -989,7 +977,7 @@ msgstr "数据库" msgid "Cloud service" msgstr "云服务" -#: assets/const/category.py:15 audits/const.py:33 +#: assets/const/category.py:15 assets/models/asset/web.py:16 audits/const.py:33 #: terminal/models/applet/applet.py:24 msgid "Web" msgstr "Web" @@ -1146,6 +1134,16 @@ msgstr "系统用户" msgid "Can match system user" msgstr "可以匹配系统用户" +#: assets/models/asset/cloud.py:11 +msgid "Cloud" +msgstr "云服务" + +#: assets/models/asset/common.py:96 assets/models/platform.py:21 +#: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:68 +#: xpack/plugins/cloud/serializers/account_attrs.py:73 +msgid "Port" +msgstr "端口" + #: assets/models/asset/common.py:108 assets/serializers/asset/common.py:141 msgid "Address" msgstr "地址" @@ -1804,7 +1802,7 @@ msgstr "文件名" msgid "File transfer log" msgstr "文件管理" -#: audits/models.py:55 audits/serializers.py:94 +#: audits/models.py:55 msgid "Resource Type" msgstr "资源类型" @@ -1882,7 +1880,7 @@ msgstr "用户登录日志" msgid "Reason display" msgstr "原因描述" -#: audits/serializers.py:124 +#: audits/serializers.py:123 #, python-format msgid "User %s %s this resource" msgstr "用户 %s %s 了当前资源" @@ -1938,11 +1936,7 @@ msgstr "钉钉" msgid "Temporary token" msgstr "临时密码" -#: audits/tasks.py:52 -msgid "Clean audits log" -msgstr "清理审计日志" - -#: audits/tasks.py:92 +#: audits/tasks.py:90 msgid "Clean audits session task log" msgstr "清理审计会话任务日志" @@ -4575,61 +4569,45 @@ msgstr "OTP 扫描后的名称" msgid "OTP valid window" msgstr "OTP 延迟有效次数" -#: settings/serializers/other.py:23 -msgid "CMD" -msgstr "CMD" - -#: settings/serializers/other.py:24 -msgid "PowerShell" -msgstr "PowerShell" - -#: settings/serializers/other.py:26 -msgid "Shell (Windows)" -msgstr "Windows shell" - -#: settings/serializers/other.py:27 -msgid "The shell type used when Windows assets perform ansible tasks" -msgstr "windows 资产执行 Ansible 任务时，使用的 Shell 类型。" - -#: settings/serializers/other.py:31 +#: settings/serializers/other.py:22 msgid "Perm ungroup node" msgstr "显示未分组节点" -#: settings/serializers/other.py:32 +#: settings/serializers/other.py:23 msgid "Perm single to ungroup node" msgstr "" "放置单独授权的资产到未分组节点, 避免能看到资产所在节点，但该节点未被授权的问" "题" -#: settings/serializers/other.py:37 +#: settings/serializers/other.py:28 msgid "Ticket authorize default time" msgstr "默认工单授权时间" -#: settings/serializers/other.py:40 +#: settings/serializers/other.py:31 msgid "day" msgstr "天" -#: settings/serializers/other.py:40 +#: settings/serializers/other.py:31 msgid "hour" msgstr "时" -#: settings/serializers/other.py:41 +#: settings/serializers/other.py:32 msgid "Ticket authorize default time unit" msgstr "默认工单授权时间单位" -#: settings/serializers/other.py:44 +#: settings/serializers/other.py:35 msgid "Help Docs URL" msgstr "文档链接" -#: settings/serializers/other.py:45 +#: settings/serializers/other.py:36 msgid "default: http://docs.jumpserver.org" msgstr "默认: http://dev.jumpserver.org:8080" -#: settings/serializers/other.py:49 +#: settings/serializers/other.py:40 msgid "Help Support URL" msgstr "支持链接" -#: settings/serializers/other.py:50 +#: settings/serializers/other.py:41 msgid "default: http://www.jumpserver.org/support/" msgstr "默认: http://www.jumpserver.org/support/" @@ -7217,6 +7195,10 @@ msgstr "实例个数" msgid "Run sync instance task" msgstr "执行同步实例任务" +#: xpack/plugins/cloud/tasks.py:41 +msgid "Period clean sync instance task execution" +msgstr "定期清除同步实例任务执行记录" + #: xpack/plugins/cloud/utils.py:69 msgid "Account unavailable" msgstr "账号无效" @@ -7285,6 +7267,26 @@ msgstr "旗舰版" msgid "Community edition" msgstr "社区版" +#~ msgid "Clean audits log" +#~ msgstr "清理审计日志" + +#~ msgid "" +#~ "Typically, the port is 9000，the HTTP interface and the native interface " +#~ "use different ports" +#~ msgstr "默认端口为9000, HTTP接口和本机接口使用不同的端口" + +#~ msgid "CMD" +#~ msgstr "CMD" + +#~ msgid "PowerShell" +#~ msgstr "PowerShell" + +#~ msgid "Shell (Windows)" +#~ msgstr "Windows shell" + +#~ msgid "The shell type used when Windows assets perform ansible tasks" +#~ msgstr "windows 资产执行 Ansible 任务时，使用的 Shell 类型。" + #~ msgid "Can change asset account secret" #~ msgstr "可以更改资产账号密码"