From c10db2ab0f94621ebc253c6f843a760c55ffc1b0 Mon Sep 17 00:00:00 2001 From: wangruidong <940853815@qq.com> Date: Wed, 14 Aug 2024 19:50:11 +0800 Subject: [PATCH] perf: LDAP import user Translate --- apps/i18n/core/ja/LC_MESSAGES/django.po | 82 ++++++++++---------- apps/i18n/core/zh/LC_MESSAGES/django.po | 78 +++++++++---------- apps/i18n/core/zh_Hant/LC_MESSAGES/django.po | 78 +++++++++---------- apps/settings/ws.py | 9 ++- 4 files changed, 125 insertions(+), 122 deletions(-) diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index c591ac979..9307e31a6 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/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-13 16:47+0800\n" +"POT-Creation-Date: 2024-08-15 14:04+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -485,7 +485,7 @@ msgstr "アカウントのバックアップスナップショット" #: accounts/serializers/automations/base.py:56 #: assets/models/automations/base.py:122 #: assets/serializers/automations/base.py:40 xpack/plugins/cloud/models.py:240 -#: xpack/plugins/cloud/serializers/task.py:237 +#: xpack/plugins/cloud/serializers/task.py:243 msgid "Trigger mode" msgstr "トリガーモード" @@ -703,7 +703,7 @@ msgstr "パスワードルール" #: assets/models/domain.py:19 assets/models/label.py:18 #: assets/models/platform.py:15 assets/models/platform.py:94 #: assets/serializers/asset/common.py:149 assets/serializers/platform.py:153 -#: assets/serializers/platform.py:282 +#: assets/serializers/platform.py:273 #: authentication/backends/passkey/models.py:10 #: authentication/models/ssh_key.py:12 #: authentication/serializers/connect_token_secret.py:113 @@ -856,8 +856,8 @@ msgstr "アカウントの存在ポリシー" #: accounts/serializers/account/account.py:206 assets/models/label.py:21 #: assets/models/platform.py:95 assets/serializers/asset/common.py:125 -#: assets/serializers/cagegory.py:12 assets/serializers/platform.py:177 -#: assets/serializers/platform.py:283 perms/serializers/user_permission.py:26 +#: assets/serializers/cagegory.py:12 assets/serializers/platform.py:168 +#: assets/serializers/platform.py:274 perms/serializers/user_permission.py:26 #: settings/models.py:36 tickets/models/ticket/apply_application.py:13 #: users/models/preference.py:12 msgid "Category" @@ -868,14 +868,14 @@ msgstr "カテゴリ" #: acls/serializers/command_acl.py:19 assets/models/automations/base.py:20 #: assets/models/cmd_filter.py:74 assets/models/platform.py:96 #: assets/serializers/asset/common.py:126 assets/serializers/platform.py:155 -#: assets/serializers/platform.py:176 audits/serializers.py:53 +#: assets/serializers/platform.py:167 audits/serializers.py:53 #: audits/serializers.py:170 #: authentication/serializers/connect_token_secret.py:126 ops/models/job.py:150 #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:40 #: terminal/models/component/storage.py:58 #: terminal/models/component/storage.py:154 terminal/serializers/applet.py:29 -#: terminal/serializers/session.py:23 terminal/serializers/storage.py:278 -#: terminal/serializers/storage.py:291 tickets/models/comment.py:26 +#: terminal/serializers/session.py:23 terminal/serializers/storage.py:281 +#: terminal/serializers/storage.py:294 tickets/models/comment.py:26 #: tickets/models/flow.py:42 tickets/models/ticket/apply_application.py:16 #: tickets/models/ticket/general.py:276 tickets/serializers/flow.py:25 #: tickets/serializers/ticket/ticket.py:19 @@ -905,7 +905,7 @@ msgstr "編集済み" #: acls/templates/acls/asset_login_reminder.html:9 #: assets/models/automations/base.py:19 #: assets/serializers/automations/base.py:20 assets/serializers/domain.py:34 -#: assets/serializers/platform.py:185 assets/serializers/platform.py:217 +#: assets/serializers/platform.py:176 assets/serializers/platform.py:208 #: authentication/api/connection_token.py:410 ops/models/base.py:17 #: ops/models/job.py:152 ops/serializers/job.py:19 #: perms/serializers/permission.py:35 @@ -1846,7 +1846,7 @@ msgstr "ポート" msgid "Address" msgstr "アドレス" -#: assets/models/asset/common.py:161 assets/models/platform.py:138 +#: assets/models/asset/common.py:161 assets/models/platform.py:149 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 #: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:385 @@ -2170,23 +2170,23 @@ msgstr "メタ" msgid "Internal" msgstr "ビルトイン" -#: assets/models/platform.py:102 assets/serializers/platform.py:175 +#: assets/models/platform.py:102 assets/serializers/platform.py:166 msgid "Charset" msgstr "シャーセット" -#: assets/models/platform.py:104 assets/serializers/platform.py:213 +#: assets/models/platform.py:104 assets/serializers/platform.py:204 msgid "Gateway enabled" msgstr "ゲートウェイが有効になりました" -#: assets/models/platform.py:106 assets/serializers/platform.py:206 +#: assets/models/platform.py:106 assets/serializers/platform.py:197 msgid "Su enabled" msgstr "アカウントの切り替えを有効にする" -#: assets/models/platform.py:107 assets/serializers/platform.py:181 +#: assets/models/platform.py:107 assets/serializers/platform.py:172 msgid "Su method" msgstr "アカウントの切り替え方法" -#: assets/models/platform.py:108 assets/serializers/platform.py:184 +#: assets/models/platform.py:108 assets/serializers/platform.py:175 msgid "Custom fields" msgstr "カスタムフィールド" @@ -2203,7 +2203,7 @@ msgstr "" "プラットフォームタイプがスキップされた資産に合致しない、資産内の一括更新プ" "ラットフォーム" -#: assets/serializers/asset/common.py:127 assets/serializers/platform.py:178 +#: assets/serializers/asset/common.py:127 assets/serializers/platform.py:169 #: authentication/serializers/connect_token_secret.py:30 #: authentication/serializers/connect_token_secret.py:75 #: perms/models/asset_permission.py:76 perms/serializers/permission.py:45 @@ -2324,7 +2324,7 @@ msgstr "" "ゲートウェイはドメインのネットワーク代理であり、ドメイン内のリソースに接続す" "る際には、接続はゲートウェイを通してルーティングされます。" -#: assets/serializers/domain.py:24 assets/serializers/platform.py:186 +#: assets/serializers/domain.py:24 assets/serializers/platform.py:177 #: orgs/serializers.py:13 perms/serializers/permission.py:39 msgid "Assets amount" msgstr "資産数量" @@ -2418,11 +2418,11 @@ msgstr "ヘルプ" msgid "Choices" msgstr "せんたく" -#: assets/serializers/platform.py:179 +#: assets/serializers/platform.py:170 msgid "Automation" msgstr "オートメーション" -#: assets/serializers/platform.py:208 +#: assets/serializers/platform.py:199 msgid "" "Login with account when accessing assets, then automatically switch to " "another, similar to logging in with a regular account and then switching to " @@ -2432,19 +2432,19 @@ msgstr "" "切り替えます。これは、通常のアカウントでログインした後に root に切り替えるの" "と似ています" -#: assets/serializers/platform.py:214 +#: assets/serializers/platform.py:205 msgid "Assets can be connected using a zone gateway" msgstr "資産はゾーンゲートウェイを使用して接続できます" -#: assets/serializers/platform.py:216 +#: assets/serializers/platform.py:207 msgid "Default Domain" msgstr "デフォルト ドメイン" -#: assets/serializers/platform.py:238 +#: assets/serializers/platform.py:229 msgid "type is required" msgstr "タイプ このフィールドは必須です." -#: assets/serializers/platform.py:253 +#: assets/serializers/platform.py:244 msgid "Protocols is required" msgstr "同意が必要です" @@ -3499,7 +3499,9 @@ msgstr "タイプを作成" msgid "" "Please download the private key after creation. Each private key can only be " "downloaded once" -msgstr "作成完了後、秘密鍵をダウンロードしてください。各秘密鍵のダウンロードは一度きりです" +msgstr "" +"作成完了後、秘密鍵をダウンロードしてください。各秘密鍵のダウンロードは一度き" +"りです" #: authentication/serializers/ssh_key.py:57 users/forms/profile.py:161 #: users/serializers/profile.py:133 users/serializers/profile.py:160 @@ -3750,22 +3752,22 @@ msgstr "再試行しますか?" msgid "LAN" msgstr "ローカルエリアネットワーク" -#: authentication/views/base.py:74 +#: authentication/views/base.py:71 #: perms/templates/perms/_msg_permed_items_expire.html:21 msgid "If you have any question, please contact the administrator" msgstr "質問があったら、管理者に連絡して下さい" -#: authentication/views/base.py:147 +#: authentication/views/base.py:141 #, python-format msgid "%s query user failed" msgstr "%sユーザーのクエリに失敗しました" -#: authentication/views/base.py:155 +#: authentication/views/base.py:149 #, python-format msgid "The %s is already bound to another user" msgstr "%sが別のユーザーにバインドされています。" -#: authentication/views/base.py:161 +#: authentication/views/base.py:155 #, python-format msgid "Binding %s successfully" msgstr "バインド%s成功" @@ -6798,13 +6800,13 @@ msgstr "認証に失敗しました (不明): {}" msgid "Authentication success: {}" msgstr "認証成功: {}" -#: settings/ws.py:195 +#: settings/ws.py:198 msgid "Get ldap users is None" msgstr "Ldapユーザーを取得するにはNone" -#: settings/ws.py:201 -msgid "Imported total: {} new: {}, failed: {} Organization: {}" -msgstr "インポートされた合計: {}、新規: {}、失敗: {}、組織: {}" +#: settings/ws.py:204 +msgid "Total {}, success {}, failure {}" +msgstr "合計 {},成功 {},失敗 {}" #: templates/_csv_import_export.html:8 msgid "Export" @@ -7559,7 +7561,7 @@ msgid "Command and replay storage" msgstr "コマンド及び録画記憶" #: terminal/notifications.py:240 terminal/tasks.py:153 -#: xpack/plugins/cloud/api.py:154 +#: xpack/plugins/cloud/api.py:160 #: xpack/plugins/cloud/serializers/account.py:121 #: xpack/plugins/cloud/serializers/account.py:123 msgid "Test failure: Account invalid" @@ -7875,11 +7877,11 @@ msgstr "Docタイプ" msgid "Store locally" msgstr "ローカルに保存する" -#: terminal/serializers/storage.py:257 +#: terminal/serializers/storage.py:258 msgid "Do not save" msgstr "保存しない" -#: terminal/serializers/storage.py:270 +#: terminal/serializers/storage.py:273 msgid "" "set as the default storage, will make new Component use the current storage " "by default, without affecting existing Component" @@ -9160,15 +9162,15 @@ msgid "" "strategy will skipped." msgstr "現在のタスク構成に基づいて、未一致ポリシーの資産はスキップされます" -#: xpack/plugins/cloud/api.py:66 +#: xpack/plugins/cloud/api.py:72 msgid "Test connection successful" msgstr "テスト接続成功" -#: xpack/plugins/cloud/api.py:68 +#: xpack/plugins/cloud/api.py:74 msgid "Test connection failed: {}" msgstr "テスト接続に失敗しました: {}" -#: xpack/plugins/cloud/api.py:165 +#: xpack/plugins/cloud/api.py:171 msgid "User {} deleted the current resource and released the assets" msgstr "ユーザー {} が現在のリソースを削除し、アセットを解放しました" @@ -9399,7 +9401,7 @@ msgstr "アカウント \"%s\" の設定" msgid "Set protocols \"%s\"" msgstr "プロトコル \"%s\" の設定" -#: xpack/plugins/cloud/manager.py:485 xpack/plugins/cloud/tasks.py:28 +#: xpack/plugins/cloud/manager.py:485 xpack/plugins/cloud/tasks.py:30 msgid "Run sync instance task" msgstr "同期インスタンス タスクを実行する" @@ -9875,7 +9877,7 @@ msgstr "実行回数" msgid "Instance count" msgstr "インスタンス数" -#: xpack/plugins/cloud/tasks.py:42 +#: xpack/plugins/cloud/tasks.py:44 msgid "Period clean sync instance task execution" msgstr "同期インスタンス タスクの実行記録を定期的にクリアする" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 8b40a7007..27bbfc480 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/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-13 16:47+0800\n" +"POT-Creation-Date: 2024-08-15 14:04+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -484,7 +484,7 @@ msgstr "账号备份快照" #: accounts/serializers/automations/base.py:56 #: assets/models/automations/base.py:122 #: assets/serializers/automations/base.py:40 xpack/plugins/cloud/models.py:240 -#: xpack/plugins/cloud/serializers/task.py:237 +#: xpack/plugins/cloud/serializers/task.py:243 msgid "Trigger mode" msgstr "触发模式" @@ -702,7 +702,7 @@ msgstr "密码规则" #: assets/models/domain.py:19 assets/models/label.py:18 #: assets/models/platform.py:15 assets/models/platform.py:94 #: assets/serializers/asset/common.py:149 assets/serializers/platform.py:153 -#: assets/serializers/platform.py:282 +#: assets/serializers/platform.py:273 #: authentication/backends/passkey/models.py:10 #: authentication/models/ssh_key.py:12 #: authentication/serializers/connect_token_secret.py:113 @@ -854,8 +854,8 @@ msgstr "账号存在策略" #: accounts/serializers/account/account.py:206 assets/models/label.py:21 #: assets/models/platform.py:95 assets/serializers/asset/common.py:125 -#: assets/serializers/cagegory.py:12 assets/serializers/platform.py:177 -#: assets/serializers/platform.py:283 perms/serializers/user_permission.py:26 +#: assets/serializers/cagegory.py:12 assets/serializers/platform.py:168 +#: assets/serializers/platform.py:274 perms/serializers/user_permission.py:26 #: settings/models.py:36 tickets/models/ticket/apply_application.py:13 #: users/models/preference.py:12 msgid "Category" @@ -866,14 +866,14 @@ msgstr "类别" #: acls/serializers/command_acl.py:19 assets/models/automations/base.py:20 #: assets/models/cmd_filter.py:74 assets/models/platform.py:96 #: assets/serializers/asset/common.py:126 assets/serializers/platform.py:155 -#: assets/serializers/platform.py:176 audits/serializers.py:53 +#: assets/serializers/platform.py:167 audits/serializers.py:53 #: audits/serializers.py:170 #: authentication/serializers/connect_token_secret.py:126 ops/models/job.py:150 #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:40 #: terminal/models/component/storage.py:58 #: terminal/models/component/storage.py:154 terminal/serializers/applet.py:29 -#: terminal/serializers/session.py:23 terminal/serializers/storage.py:278 -#: terminal/serializers/storage.py:291 tickets/models/comment.py:26 +#: terminal/serializers/session.py:23 terminal/serializers/storage.py:281 +#: terminal/serializers/storage.py:294 tickets/models/comment.py:26 #: tickets/models/flow.py:42 tickets/models/ticket/apply_application.py:16 #: tickets/models/ticket/general.py:276 tickets/serializers/flow.py:25 #: tickets/serializers/ticket/ticket.py:19 @@ -903,7 +903,7 @@ msgstr "已修改" #: acls/templates/acls/asset_login_reminder.html:9 #: assets/models/automations/base.py:19 #: assets/serializers/automations/base.py:20 assets/serializers/domain.py:34 -#: assets/serializers/platform.py:185 assets/serializers/platform.py:217 +#: assets/serializers/platform.py:176 assets/serializers/platform.py:208 #: authentication/api/connection_token.py:410 ops/models/base.py:17 #: ops/models/job.py:152 ops/serializers/job.py:19 #: perms/serializers/permission.py:35 @@ -1831,7 +1831,7 @@ msgstr "端口" msgid "Address" msgstr "地址" -#: assets/models/asset/common.py:161 assets/models/platform.py:138 +#: assets/models/asset/common.py:161 assets/models/platform.py:149 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 #: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:385 @@ -2157,23 +2157,23 @@ msgstr "元数据" msgid "Internal" msgstr "内置" -#: assets/models/platform.py:102 assets/serializers/platform.py:175 +#: assets/models/platform.py:102 assets/serializers/platform.py:166 msgid "Charset" msgstr "编码" -#: assets/models/platform.py:104 assets/serializers/platform.py:213 +#: assets/models/platform.py:104 assets/serializers/platform.py:204 msgid "Gateway enabled" msgstr "启用网域" -#: assets/models/platform.py:106 assets/serializers/platform.py:206 +#: assets/models/platform.py:106 assets/serializers/platform.py:197 msgid "Su enabled" msgstr "启用账号切换" -#: assets/models/platform.py:107 assets/serializers/platform.py:181 +#: assets/models/platform.py:107 assets/serializers/platform.py:172 msgid "Su method" msgstr "账号切换方式" -#: assets/models/platform.py:108 assets/serializers/platform.py:184 +#: assets/models/platform.py:108 assets/serializers/platform.py:175 msgid "Custom fields" msgstr "自定义属性" @@ -2188,7 +2188,7 @@ msgid "" "type" msgstr "资产中批量更新平台,不符合平台类型跳过的资产" -#: assets/serializers/asset/common.py:127 assets/serializers/platform.py:178 +#: assets/serializers/asset/common.py:127 assets/serializers/platform.py:169 #: authentication/serializers/connect_token_secret.py:30 #: authentication/serializers/connect_token_secret.py:75 #: perms/models/asset_permission.py:76 perms/serializers/permission.py:45 @@ -2307,7 +2307,7 @@ msgid "" "the zone, the connection is routed through the gateway." msgstr "网关是网域的网络代理,当连接网域内的资产时,连接将通过网关进行路由。" -#: assets/serializers/domain.py:24 assets/serializers/platform.py:186 +#: assets/serializers/domain.py:24 assets/serializers/platform.py:177 #: orgs/serializers.py:13 perms/serializers/permission.py:39 msgid "Assets amount" msgstr "资产数量" @@ -2396,11 +2396,11 @@ msgstr "帮助" msgid "Choices" msgstr "选择" -#: assets/serializers/platform.py:179 +#: assets/serializers/platform.py:170 msgid "Automation" msgstr "自动化" -#: assets/serializers/platform.py:208 +#: assets/serializers/platform.py:199 msgid "" "Login with account when accessing assets, then automatically switch to " "another, similar to logging in with a regular account and then switching to " @@ -2409,19 +2409,19 @@ msgstr "" "在访问资产时使用账户登录,然后自动切换到另一个账户,就像用普通账户登录然后切" "换到 root 一样" -#: assets/serializers/platform.py:214 +#: assets/serializers/platform.py:205 msgid "Assets can be connected using a zone gateway" msgstr "资产可以使用区域网关进行连接" -#: assets/serializers/platform.py:216 +#: assets/serializers/platform.py:207 msgid "Default Domain" msgstr "默认网域" -#: assets/serializers/platform.py:238 +#: assets/serializers/platform.py:229 msgid "type is required" msgstr "类型 该字段是必填项。" -#: assets/serializers/platform.py:253 +#: assets/serializers/platform.py:244 msgid "Protocols is required" msgstr "协议是必填的" @@ -3698,22 +3698,22 @@ msgstr "是否重试 ?" msgid "LAN" msgstr "局域网" -#: authentication/views/base.py:74 +#: authentication/views/base.py:71 #: perms/templates/perms/_msg_permed_items_expire.html:21 msgid "If you have any question, please contact the administrator" msgstr "如果有疑问或需求,请联系系统管理员" -#: authentication/views/base.py:147 +#: authentication/views/base.py:141 #, python-format msgid "%s query user failed" msgstr "%s 查询用户失败" -#: authentication/views/base.py:155 +#: authentication/views/base.py:149 #, python-format msgid "The %s is already bound to another user" msgstr "%s 已绑定到另一个用户" -#: authentication/views/base.py:161 +#: authentication/views/base.py:155 #, python-format msgid "Binding %s successfully" msgstr "绑定 %s 成功" @@ -6672,13 +6672,13 @@ msgstr "认证失败: (未知): {}" msgid "Authentication success: {}" msgstr "认证成功: {}" -#: settings/ws.py:195 +#: settings/ws.py:198 msgid "Get ldap users is None" msgstr "获取 LDAP 用户为 None" -#: settings/ws.py:201 -msgid "Imported total: {} new: {}, failed: {} Organization: {}" -msgstr "导入总计: {},新增: {},失败: {},组织: {}" +#: settings/ws.py:204 +msgid "Total {}, success {}, failure {}" +msgstr "总共 {},成功 {},失败 {}" #: templates/_csv_import_export.html:8 msgid "Export" @@ -7423,7 +7423,7 @@ msgid "Command and replay storage" msgstr "命令及录像存储" #: terminal/notifications.py:240 terminal/tasks.py:153 -#: xpack/plugins/cloud/api.py:154 +#: xpack/plugins/cloud/api.py:160 #: xpack/plugins/cloud/serializers/account.py:121 #: xpack/plugins/cloud/serializers/account.py:123 msgid "Test failure: Account invalid" @@ -7732,11 +7732,11 @@ msgstr "文档类型" msgid "Store locally" msgstr "本地存储" -#: terminal/serializers/storage.py:257 +#: terminal/serializers/storage.py:258 msgid "Do not save" msgstr "不保存" -#: terminal/serializers/storage.py:270 +#: terminal/serializers/storage.py:273 msgid "" "set as the default storage, will make new Component use the current storage " "by default, without affecting existing Component" @@ -8983,15 +8983,15 @@ msgid "" "strategy will skipped." msgstr "根据当前任务配置,不符合“”策略的资产将被跳过。" -#: xpack/plugins/cloud/api.py:66 +#: xpack/plugins/cloud/api.py:72 msgid "Test connection successful" msgstr "测试成功" -#: xpack/plugins/cloud/api.py:68 +#: xpack/plugins/cloud/api.py:74 msgid "Test connection failed: {}" msgstr "测试连接失败:{}" -#: xpack/plugins/cloud/api.py:165 +#: xpack/plugins/cloud/api.py:171 msgid "User {} deleted the current resource and released the assets" msgstr "用户 {} 删除了当前资源已释放的资产" @@ -9220,7 +9220,7 @@ msgstr "删除账号: %s" msgid "Set protocols \"%s\"" msgstr "设置协议 \"%s\"" -#: xpack/plugins/cloud/manager.py:485 xpack/plugins/cloud/tasks.py:28 +#: xpack/plugins/cloud/manager.py:485 xpack/plugins/cloud/tasks.py:30 msgid "Run sync instance task" msgstr "执行同步实例任务" @@ -9695,7 +9695,7 @@ msgstr "执行次数" msgid "Instance count" msgstr "实例个数" -#: xpack/plugins/cloud/tasks.py:42 +#: xpack/plugins/cloud/tasks.py:44 msgid "Period clean sync instance task execution" msgstr "定期清除同步实例任务执行记录" diff --git a/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po b/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po index f085f8710..ea76cf31f 100644 --- a/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po +++ b/apps/i18n/core/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-13 16:47+0800\n" +"POT-Creation-Date: 2024-08-15 14:04+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -486,7 +486,7 @@ msgstr "帳號備份快照" #: accounts/serializers/automations/base.py:56 #: assets/models/automations/base.py:122 #: assets/serializers/automations/base.py:40 xpack/plugins/cloud/models.py:240 -#: xpack/plugins/cloud/serializers/task.py:237 +#: xpack/plugins/cloud/serializers/task.py:243 msgid "Trigger mode" msgstr "觸發模式" @@ -704,7 +704,7 @@ msgstr "密碼規則" #: assets/models/domain.py:19 assets/models/label.py:18 #: assets/models/platform.py:15 assets/models/platform.py:94 #: assets/serializers/asset/common.py:149 assets/serializers/platform.py:153 -#: assets/serializers/platform.py:282 +#: assets/serializers/platform.py:273 #: authentication/backends/passkey/models.py:10 #: authentication/models/ssh_key.py:12 #: authentication/serializers/connect_token_secret.py:113 @@ -856,8 +856,8 @@ msgstr "帳號存在策略" #: accounts/serializers/account/account.py:206 assets/models/label.py:21 #: assets/models/platform.py:95 assets/serializers/asset/common.py:125 -#: assets/serializers/cagegory.py:12 assets/serializers/platform.py:177 -#: assets/serializers/platform.py:283 perms/serializers/user_permission.py:26 +#: assets/serializers/cagegory.py:12 assets/serializers/platform.py:168 +#: assets/serializers/platform.py:274 perms/serializers/user_permission.py:26 #: settings/models.py:36 tickets/models/ticket/apply_application.py:13 #: users/models/preference.py:12 msgid "Category" @@ -868,14 +868,14 @@ msgstr "類別" #: acls/serializers/command_acl.py:19 assets/models/automations/base.py:20 #: assets/models/cmd_filter.py:74 assets/models/platform.py:96 #: assets/serializers/asset/common.py:126 assets/serializers/platform.py:155 -#: assets/serializers/platform.py:176 audits/serializers.py:53 +#: assets/serializers/platform.py:167 audits/serializers.py:53 #: audits/serializers.py:170 #: authentication/serializers/connect_token_secret.py:126 ops/models/job.py:150 #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:40 #: terminal/models/component/storage.py:58 #: terminal/models/component/storage.py:154 terminal/serializers/applet.py:29 -#: terminal/serializers/session.py:23 terminal/serializers/storage.py:278 -#: terminal/serializers/storage.py:291 tickets/models/comment.py:26 +#: terminal/serializers/session.py:23 terminal/serializers/storage.py:281 +#: terminal/serializers/storage.py:294 tickets/models/comment.py:26 #: tickets/models/flow.py:42 tickets/models/ticket/apply_application.py:16 #: tickets/models/ticket/general.py:276 tickets/serializers/flow.py:25 #: tickets/serializers/ticket/ticket.py:19 @@ -905,7 +905,7 @@ msgstr "已修改" #: acls/templates/acls/asset_login_reminder.html:9 #: assets/models/automations/base.py:19 #: assets/serializers/automations/base.py:20 assets/serializers/domain.py:34 -#: assets/serializers/platform.py:185 assets/serializers/platform.py:217 +#: assets/serializers/platform.py:176 assets/serializers/platform.py:208 #: authentication/api/connection_token.py:410 ops/models/base.py:17 #: ops/models/job.py:152 ops/serializers/job.py:19 #: perms/serializers/permission.py:35 @@ -1833,7 +1833,7 @@ msgstr "埠" msgid "Address" msgstr "地址" -#: assets/models/asset/common.py:161 assets/models/platform.py:138 +#: assets/models/asset/common.py:161 assets/models/platform.py:149 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 #: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:385 @@ -2159,23 +2159,23 @@ msgstr "元數據" msgid "Internal" msgstr "內建" -#: assets/models/platform.py:102 assets/serializers/platform.py:175 +#: assets/models/platform.py:102 assets/serializers/platform.py:166 msgid "Charset" msgstr "編碼" -#: assets/models/platform.py:104 assets/serializers/platform.py:213 +#: assets/models/platform.py:104 assets/serializers/platform.py:204 msgid "Gateway enabled" msgstr "啟用網域" -#: assets/models/platform.py:106 assets/serializers/platform.py:206 +#: assets/models/platform.py:106 assets/serializers/platform.py:197 msgid "Su enabled" msgstr "啟用帳號切換" -#: assets/models/platform.py:107 assets/serializers/platform.py:181 +#: assets/models/platform.py:107 assets/serializers/platform.py:172 msgid "Su method" msgstr "帳號切換方式" -#: assets/models/platform.py:108 assets/serializers/platform.py:184 +#: assets/models/platform.py:108 assets/serializers/platform.py:175 msgid "Custom fields" msgstr "自訂屬性" @@ -2190,7 +2190,7 @@ msgid "" "type" msgstr "資產中批次更新平台,不符合平台類型跳過的資產" -#: assets/serializers/asset/common.py:127 assets/serializers/platform.py:178 +#: assets/serializers/asset/common.py:127 assets/serializers/platform.py:169 #: authentication/serializers/connect_token_secret.py:30 #: authentication/serializers/connect_token_secret.py:75 #: perms/models/asset_permission.py:76 perms/serializers/permission.py:45 @@ -2309,7 +2309,7 @@ msgid "" "the zone, the connection is routed through the gateway." msgstr "網關是網域的網路代理,當連接網域內的資產時,連接將由網關進行路由。" -#: assets/serializers/domain.py:24 assets/serializers/platform.py:186 +#: assets/serializers/domain.py:24 assets/serializers/platform.py:177 #: orgs/serializers.py:13 perms/serializers/permission.py:39 msgid "Assets amount" msgstr "資產數量" @@ -2398,11 +2398,11 @@ msgstr "幫助" msgid "Choices" msgstr "選擇" -#: assets/serializers/platform.py:179 +#: assets/serializers/platform.py:170 msgid "Automation" msgstr "自動化" -#: assets/serializers/platform.py:208 +#: assets/serializers/platform.py:199 msgid "" "Login with account when accessing assets, then automatically switch to " "another, similar to logging in with a regular account and then switching to " @@ -2411,19 +2411,19 @@ msgstr "" "在訪問資產時使用帳戶登入,然後自動切換到另一個帳戶,就像用普通帳戶登入然後切" "換到 root 一樣" -#: assets/serializers/platform.py:214 +#: assets/serializers/platform.py:205 msgid "Assets can be connected using a zone gateway" msgstr "資產可以使用區域網關進行連接" -#: assets/serializers/platform.py:216 +#: assets/serializers/platform.py:207 msgid "Default Domain" msgstr "默認網域" -#: assets/serializers/platform.py:238 +#: assets/serializers/platform.py:229 msgid "type is required" msgstr "類型 該欄位是必填項。" -#: assets/serializers/platform.py:253 +#: assets/serializers/platform.py:244 msgid "Protocols is required" msgstr "協議是必填的" @@ -3700,22 +3700,22 @@ msgstr "是否重試 ?" msgid "LAN" msgstr "區域網路" -#: authentication/views/base.py:74 +#: authentication/views/base.py:71 #: perms/templates/perms/_msg_permed_items_expire.html:21 msgid "If you have any question, please contact the administrator" msgstr "如果有疑問或需求,請聯絡系統管理員" -#: authentication/views/base.py:147 +#: authentication/views/base.py:141 #, python-format msgid "%s query user failed" msgstr "%s 查詢用戶失敗" -#: authentication/views/base.py:155 +#: authentication/views/base.py:149 #, python-format msgid "The %s is already bound to another user" msgstr "%s 已綁定到另一個用戶" -#: authentication/views/base.py:161 +#: authentication/views/base.py:155 #, python-format msgid "Binding %s successfully" msgstr "綁定 %s 成功" @@ -6675,13 +6675,13 @@ msgstr "認證失敗: (未知): {}" msgid "Authentication success: {}" msgstr "認證成功: {}" -#: settings/ws.py:195 +#: settings/ws.py:198 msgid "Get ldap users is None" msgstr "獲取 LDAP 用戶為 None" -#: settings/ws.py:201 -msgid "Imported total: {} new: {}, failed: {} Organization: {}" -msgstr "導入總計: {},新增: {},失敗: {},組織: {}" +#: settings/ws.py:204 +msgid "Total {}, success {}, failure {}" +msgstr "總共 {},成功 {},失敗 {}" #: templates/_csv_import_export.html:8 msgid "Export" @@ -7426,7 +7426,7 @@ msgid "Command and replay storage" msgstr "命令及錄影儲存" #: terminal/notifications.py:240 terminal/tasks.py:153 -#: xpack/plugins/cloud/api.py:154 +#: xpack/plugins/cloud/api.py:160 #: xpack/plugins/cloud/serializers/account.py:121 #: xpack/plugins/cloud/serializers/account.py:123 msgid "Test failure: Account invalid" @@ -7735,11 +7735,11 @@ msgstr "文件類型" msgid "Store locally" msgstr "本地儲存" -#: terminal/serializers/storage.py:257 +#: terminal/serializers/storage.py:258 msgid "Do not save" msgstr "不儲存" -#: terminal/serializers/storage.py:270 +#: terminal/serializers/storage.py:273 msgid "" "set as the default storage, will make new Component use the current storage " "by default, without affecting existing Component" @@ -8995,15 +8995,15 @@ msgstr "" "According to the current task configuration, assets that do not conform to " "the \"\" policy will be skipped." -#: xpack/plugins/cloud/api.py:66 +#: xpack/plugins/cloud/api.py:72 msgid "Test connection successful" msgstr "測試成功" -#: xpack/plugins/cloud/api.py:68 +#: xpack/plugins/cloud/api.py:74 msgid "Test connection failed: {}" msgstr "測試連接失敗:{}" -#: xpack/plugins/cloud/api.py:165 +#: xpack/plugins/cloud/api.py:171 msgid "User {} deleted the current resource and released the assets" msgstr "" "User {} deleted the assets that have been released by the current resource" @@ -9236,7 +9236,7 @@ msgstr "刪除帳號: %s" msgid "Set protocols \"%s\"" msgstr "設定協議 \"%s\"" -#: xpack/plugins/cloud/manager.py:485 xpack/plugins/cloud/tasks.py:28 +#: xpack/plugins/cloud/manager.py:485 xpack/plugins/cloud/tasks.py:30 msgid "Run sync instance task" msgstr "執行同步實例任務" @@ -9711,7 +9711,7 @@ msgstr "執行次數" msgid "Instance count" msgstr "實例個數" -#: xpack/plugins/cloud/tasks.py:42 +#: xpack/plugins/cloud/tasks.py:44 msgid "Period clean sync instance task execution" msgstr "定期清除同步實例任務執行記錄" diff --git a/apps/settings/ws.py b/apps/settings/ws.py index 7d2c94383..fa2a4cf45 100644 --- a/apps/settings/ws.py +++ b/apps/settings/ws.py @@ -3,10 +3,11 @@ import json import asyncio +from asgiref.sync import sync_to_async from channels.generic.websocket import AsyncJsonWebsocketConsumer from django.core.cache import cache from django.conf import settings -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import gettext_lazy as _, activate from common.db.utils import close_old_connections from common.utils import get_logger @@ -196,10 +197,10 @@ class LdapWebsocket(AsyncJsonWebsocketConsumer): orgs = self.get_orgs(org_ids) new_users, error_msg = LDAPImportUtil().perform_import(users, orgs) - orgs_name = ', '.join([str(org) for org in orgs]) ok = True - msg = _('Imported total: {} new: {}, failed: {} Organization: {}').format( - len(users), len(new_users), len(error_msg), orgs_name + success_count = len(users) - len(error_msg) + msg = _('Total {}, success {}, failure {}').format( + len(users), success_count, len(error_msg) ) except Exception as e: msg = str(e)