From 1b99a7e06fb2817beee273d7730e4b80449d905a Mon Sep 17 00:00:00 2001 From: halo Date: Thu, 17 Nov 2022 15:27:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=B4=A6=E6=88=B7=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E6=89=BE=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E6=96=87=E4=BB=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/notifications.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/assets/notifications.py b/apps/assets/notifications.py index 58c02686c..cded5a005 100644 --- a/apps/assets/notifications.py +++ b/apps/assets/notifications.py @@ -20,6 +20,6 @@ class AccountBackupExecutionTaskMsg(object): "please go to personal information -> file encryption password to set the encryption password").format(name) def publish(self, attachment_list=None): - send_mail_attachment_async.delay( + send_mail_attachment_async( self.subject, self.message, [self.user.email], attachment_list ) From e629e6fb3f5c4ae1300228dc027d9c658aefa231 Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Thu, 17 Nov 2022 17:37:50 +0800 Subject: [PATCH 2/2] fix: i18n --- apps/locale/ja/LC_MESSAGES/django.po | 39 ++++++++++++++-------------- apps/locale/zh/LC_MESSAGES/django.po | 34 ++++++++++++------------ 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index c7b3c58a2..811755a88 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: 2022-11-16 20:24+0800\n" +"POT-Creation-Date: 2022-11-17 17:34+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -215,7 +215,7 @@ msgid "Unsupported protocols: {}" msgstr "サポートされていないプロトコル: {}" #: acls/serializers/login_asset_acl.py:98 -#: tickets/serializers/ticket/ticket.py:85 +#: tickets/serializers/ticket/ticket.py:96 msgid "The organization `{}` does not exist" msgstr "組織 '{}'は存在しません" @@ -348,7 +348,7 @@ msgstr "カテゴリ表示" #: assets/serializers/cmd_filter.py:34 assets/serializers/system_user.py:34 #: audits/serializers.py:29 authentication/serializers/connection_token.py:22 #: perms/serializers/application/permission.py:19 -#: tickets/serializers/flow.py:49 tickets/serializers/ticket/ticket.py:17 +#: tickets/serializers/flow.py:49 tickets/serializers/ticket/ticket.py:18 msgid "Type display" msgstr "タイプ表示" @@ -1016,7 +1016,7 @@ msgid "Parent key" msgstr "親キー" #: assets/models/node.py:566 assets/serializers/system_user.py:267 -#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers/task.py:72 +#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers/task.py:75 msgid "Node" msgstr "ノード" @@ -1605,7 +1605,7 @@ msgstr "ユーザーログインログ" msgid "Operate display" msgstr "ディスプレイを操作する" -#: audits/serializers.py:30 tickets/serializers/ticket/ticket.py:18 +#: audits/serializers.py:30 tickets/serializers/ticket/ticket.py:19 msgid "Status display" msgstr "ステータス表示" @@ -3024,7 +3024,7 @@ msgstr "アプリ組織" #: orgs/mixins/models.py:56 orgs/mixins/serializers.py:25 orgs/models.py:85 #: orgs/models.py:217 rbac/const.py:7 rbac/models/rolebinding.py:48 #: rbac/serializers/rolebinding.py:40 settings/serializers/auth/ldap.py:63 -#: tickets/models/ticket/general.py:300 tickets/serializers/ticket/ticket.py:71 +#: tickets/models/ticket/general.py:300 tickets/serializers/ticket/ticket.py:72 msgid "Organization" msgstr "組織" @@ -5334,7 +5334,7 @@ msgstr "見つかりません" msgid "view" msgstr "表示" -#: terminal/utils/db_port_mapper.py:64 +#: terminal/utils/db_port_mapper.py:65 msgid "" "No available port is matched. The number of databases may have exceeded the " "number of ports open to the database agent service, Contact the " @@ -5344,7 +5344,7 @@ msgstr "" "サービスによって開かれたポートの数を超えた可能性があります。さらにポートを開" "くには、管理者に連絡してください。" -#: terminal/utils/db_port_mapper.py:90 +#: terminal/utils/db_port_mapper.py:91 msgid "" "No ports can be used, check and modify the limit on the number of ports that " "Magnus listens on in the configuration file." @@ -5352,7 +5352,7 @@ msgstr "" "使用できるポートがありません。設定ファイルで Magnus がリッスンするポート数の" "制限を確認して変更してください. " -#: terminal/utils/db_port_mapper.py:92 +#: terminal/utils/db_port_mapper.py:93 msgid "All available port count: {}, Already use port count: {}" msgstr "使用可能なすべてのポート数: {}、すでに使用しているポート数: {}" @@ -5670,7 +5670,7 @@ msgstr "有効期限は開始日より大きくする必要があります" msgid "Permission named `{}` already exists" msgstr "'{}'という名前の権限は既に存在します" -#: tickets/serializers/ticket/ticket.py:99 +#: tickets/serializers/ticket/ticket.py:110 msgid "The ticket flow `{}` does not exist" msgstr "チケットフロー '{}'が存在しない" @@ -6277,8 +6277,9 @@ msgstr "パスワード無効" msgid "" "Non-local users can log in only from third-party platforms and cannot change " "their passwords: {}" -msgstr "ローカル以外のユーザーは、サードパーティ プラットフォームからのログインのみが許可され、" -"パスワードの変更はサポートされていません: {}" +msgstr "" +"ローカル以外のユーザーは、サードパーティ プラットフォームからのログインのみが" +"許可され、パスワードの変更はサポートされていません: {}" #: users/views/profile/reset.py:149 users/views/profile/reset.py:160 msgid "Token invalid or expired" @@ -6607,7 +6608,7 @@ msgstr "クラウドアカウント" msgid "Test cloud account" msgstr "クラウドアカウントのテスト" -#: xpack/plugins/cloud/models.py:84 xpack/plugins/cloud/serializers/task.py:69 +#: xpack/plugins/cloud/models.py:84 xpack/plugins/cloud/serializers/task.py:72 msgid "Account" msgstr "アカウント" @@ -6619,11 +6620,11 @@ msgstr "リージョン" msgid "Hostname strategy" msgstr "ホスト名戦略" -#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:70 +#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:73 msgid "Unix admin user" msgstr "Unix adminユーザー" -#: xpack/plugins/cloud/models.py:103 xpack/plugins/cloud/serializers/task.py:71 +#: xpack/plugins/cloud/models.py:103 xpack/plugins/cloud/serializers/task.py:74 msgid "Windows admin user" msgstr "Windows管理者" @@ -6631,11 +6632,11 @@ msgstr "Windows管理者" msgid "IP network segment group" msgstr "IPネットワークセグメントグループ" -#: xpack/plugins/cloud/models.py:112 +#: xpack/plugins/cloud/models.py:112 xpack/plugins/cloud/serializers/task.py:52 msgid "Sync IP type" msgstr "同期IPタイプ" -#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/serializers/task.py:74 +#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/serializers/task.py:77 msgid "Always update" msgstr "常に更新" @@ -6974,11 +6975,11 @@ msgstr "実行回数" msgid "Instance count" msgstr "インスタンス数" -#: xpack/plugins/cloud/serializers/task.py:68 +#: xpack/plugins/cloud/serializers/task.py:71 msgid "Linux admin user" msgstr "Linux管理者" -#: xpack/plugins/cloud/serializers/task.py:73 +#: xpack/plugins/cloud/serializers/task.py:76 #: xpack/plugins/gathered_user/serializers.py:20 msgid "Periodic display" msgstr "定期的な表示" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index ac9bd433c..3670a0b59 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: 2022-11-16 20:24+0800\n" +"POT-Creation-Date: 2022-11-17 17:34+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -211,7 +211,7 @@ msgid "Unsupported protocols: {}" msgstr "不支持的协议: {}" #: acls/serializers/login_asset_acl.py:98 -#: tickets/serializers/ticket/ticket.py:85 +#: tickets/serializers/ticket/ticket.py:96 msgid "The organization `{}` does not exist" msgstr "组织 `{}` 不存在" @@ -343,7 +343,7 @@ msgstr "类别名称" #: assets/serializers/cmd_filter.py:34 assets/serializers/system_user.py:34 #: audits/serializers.py:29 authentication/serializers/connection_token.py:22 #: perms/serializers/application/permission.py:19 -#: tickets/serializers/flow.py:49 tickets/serializers/ticket/ticket.py:17 +#: tickets/serializers/flow.py:49 tickets/serializers/ticket/ticket.py:18 msgid "Type display" msgstr "类型名称" @@ -1009,7 +1009,7 @@ msgid "Parent key" msgstr "ssh私钥" #: assets/models/node.py:566 assets/serializers/system_user.py:267 -#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers/task.py:72 +#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers/task.py:75 msgid "Node" msgstr "节点" @@ -1591,7 +1591,7 @@ msgstr "用户登录日志" msgid "Operate display" msgstr "操作名称" -#: audits/serializers.py:30 tickets/serializers/ticket/ticket.py:18 +#: audits/serializers.py:30 tickets/serializers/ticket/ticket.py:19 msgid "Status display" msgstr "状态名称" @@ -2979,7 +2979,7 @@ msgstr "组织管理" #: orgs/mixins/models.py:56 orgs/mixins/serializers.py:25 orgs/models.py:85 #: orgs/models.py:217 rbac/const.py:7 rbac/models/rolebinding.py:48 #: rbac/serializers/rolebinding.py:40 settings/serializers/auth/ldap.py:63 -#: tickets/models/ticket/general.py:300 tickets/serializers/ticket/ticket.py:71 +#: tickets/models/ticket/general.py:300 tickets/serializers/ticket/ticket.py:72 msgid "Organization" msgstr "组织" @@ -5246,7 +5246,7 @@ msgstr "没有发现" msgid "view" msgstr "查看" -#: terminal/utils/db_port_mapper.py:64 +#: terminal/utils/db_port_mapper.py:65 msgid "" "No available port is matched. The number of databases may have exceeded the " "number of ports open to the database agent service, Contact the " @@ -5255,13 +5255,13 @@ msgstr "" "未匹配到可用端口，数据库的数量可能已经超过数据库代理服务开放的端口数量，请联" "系管理员开放更多端口。" -#: terminal/utils/db_port_mapper.py:90 +#: terminal/utils/db_port_mapper.py:91 msgid "" "No ports can be used, check and modify the limit on the number of ports that " "Magnus listens on in the configuration file." msgstr "没有端口可以使用，检查并修改配置文件中 Magnus 监听的端口数量限制。" -#: terminal/utils/db_port_mapper.py:92 +#: terminal/utils/db_port_mapper.py:93 msgid "All available port count: {}, Already use port count: {}" msgstr "所有可用端口数量：{}，已使用端口数量：{}" @@ -5577,7 +5577,7 @@ msgstr "过期时间要大于开始时间" msgid "Permission named `{}` already exists" msgstr "授权名称 `{}` 已存在" -#: tickets/serializers/ticket/ticket.py:99 +#: tickets/serializers/ticket/ticket.py:110 msgid "The ticket flow `{}` does not exist" msgstr "工单流程 `{}` 不存在" @@ -6501,7 +6501,7 @@ msgstr "云账号" msgid "Test cloud account" msgstr "测试云账号" -#: xpack/plugins/cloud/models.py:84 xpack/plugins/cloud/serializers/task.py:69 +#: xpack/plugins/cloud/models.py:84 xpack/plugins/cloud/serializers/task.py:72 msgid "Account" msgstr "账号" @@ -6513,11 +6513,11 @@ msgstr "地域" msgid "Hostname strategy" msgstr "主机名策略" -#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:70 +#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:73 msgid "Unix admin user" msgstr "Unix 管理员" -#: xpack/plugins/cloud/models.py:103 xpack/plugins/cloud/serializers/task.py:71 +#: xpack/plugins/cloud/models.py:103 xpack/plugins/cloud/serializers/task.py:74 msgid "Windows admin user" msgstr "Windows 管理员" @@ -6525,11 +6525,11 @@ msgstr "Windows 管理员" msgid "IP network segment group" msgstr "IP网段组" -#: xpack/plugins/cloud/models.py:112 +#: xpack/plugins/cloud/models.py:112 xpack/plugins/cloud/serializers/task.py:52 msgid "Sync IP type" msgstr "同步IP类型" -#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/serializers/task.py:74 +#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/serializers/task.py:77 msgid "Always update" msgstr "总是更新" @@ -6865,11 +6865,11 @@ msgstr "执行次数" msgid "Instance count" msgstr "实例个数" -#: xpack/plugins/cloud/serializers/task.py:68 +#: xpack/plugins/cloud/serializers/task.py:71 msgid "Linux admin user" msgstr "Linux 管理员" -#: xpack/plugins/cloud/serializers/task.py:73 +#: xpack/plugins/cloud/serializers/task.py:76 #: xpack/plugins/gathered_user/serializers.py:20 msgid "Periodic display" msgstr "定时执行"