diff --git a/apps/accounts/automations/remove_account/database/mysql/main.yml b/apps/accounts/automations/remove_account/database/mysql/main.yml index 563a7d74b..a8700850f 100644 --- a/apps/accounts/automations/remove_account/database/mysql/main.yml +++ b/apps/accounts/automations/remove_account/database/mysql/main.yml @@ -2,6 +2,7 @@ gather_facts: no vars: ansible_python_interpreter: /opt/py3/bin/python + check_ssl: "{{ jms_asset.spec_info.use_ssl and not jms_asset.spec_info.allow_invalid_cert }}" tasks: - name: "Remove account" diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index c011a6ac9..390f2c147 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/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-06-25 16:48+0800\n" +"POT-Creation-Date: 2024-06-26 14:59+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -89,7 +89,7 @@ msgstr "" msgid "Specified account" msgstr "" -#: accounts/const/account.py:26 users/models/user.py:790 +#: accounts/const/account.py:26 users/models/user.py:791 msgid "Local" msgstr "" @@ -216,7 +216,7 @@ msgstr "" #: authentication/serializers/password_mfa.py:24 #: notifications/backends/__init__.py:10 settings/serializers/msg.py:21 #: settings/serializers/msg.py:58 users/forms/profile.py:100 -#: users/forms/profile.py:108 users/models/user.py:901 +#: users/forms/profile.py:108 users/models/user.py:902 #: users/templates/users/forgot_password.html:162 #: users/views/profile/reset.py:94 msgid "Email" @@ -303,7 +303,7 @@ msgid "Version" msgstr "" #: accounts/models/account.py:57 accounts/serializers/account/account.py:217 -#: users/models/user.py:962 +#: users/models/user.py:963 msgid "Source" msgstr "" @@ -551,7 +551,7 @@ msgstr "" #: authentication/templates/authentication/_msg_different_city.html:9 #: authentication/templates/authentication/_msg_oauth_bind.html:9 #: terminal/serializers/storage.py:136 users/forms/profile.py:31 -#: users/forms/profile.py:114 users/models/user.py:899 +#: users/forms/profile.py:114 users/models/user.py:900 #: users/templates/users/_msg_user_created.html:12 #: xpack/plugins/cloud/serializers/account_attrs.py:26 msgid "Username" @@ -648,7 +648,7 @@ msgstr "" #: terminal/models/virtualapp/provider.py:10 #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:32 users/models/group.py:13 -#: users/models/preference.py:11 users/models/user.py:900 +#: users/models/preference.py:11 users/models/user.py:901 #: xpack/plugins/cloud/models.py:33 xpack/plugins/cloud/models.py:296 #: xpack/plugins/cloud/serializers/task.py:74 msgid "Name" @@ -873,8 +873,8 @@ msgstr "" #: terminal/serializers/command.py:16 #: terminal/templates/terminal/_msg_command_warning.html:6 #: terminal/templates/terminal/_msg_session_sharing.html:6 -#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1110 -#: users/models/user.py:1154 +#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1111 +#: users/models/user.py:1155 msgid "User" msgstr "" @@ -961,7 +961,7 @@ msgstr "" #: terminal/models/component/endpoint.py:119 #: terminal/models/session/session.py:47 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 -#: tickets/models/ticket/general.py:295 users/models/user.py:934 +#: tickets/models/ticket/general.py:295 users/models/user.py:935 #: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:121 msgid "Comment" msgstr "Description" @@ -1457,7 +1457,7 @@ msgid "Unknown" msgstr "" #: assets/const/automation.py:7 -msgid "Ok" +msgid "OK" msgstr "" #: assets/const/automation.py:12 @@ -1473,7 +1473,7 @@ msgid "Gather facts" msgstr "" #: assets/const/base.py:32 audits/const.py:58 -#: terminal/serializers/applet_host.py:32 users/models/user.py:687 +#: terminal/serializers/applet_host.py:32 users/models/user.py:688 msgid "Disabled" msgstr "" @@ -1792,7 +1792,7 @@ msgstr "" #: assets/models/automations/base.py:114 assets/models/cmd_filter.py:41 #: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:241 -#: users/models/user.py:1157 +#: users/models/user.py:1158 msgid "Date created" msgstr "" @@ -1813,17 +1813,17 @@ msgid "Date verified" msgstr "" #: assets/models/cmd_filter.py:28 perms/models/asset_permission.py:66 -#: users/models/group.py:25 users/models/user.py:906 +#: users/models/group.py:25 users/models/user.py:907 msgid "User group" msgstr "" #: assets/models/cmd_filter.py:42 common/db/models.py:35 -#: users/models/user.py:982 +#: users/models/user.py:983 msgid "Date updated" msgstr "" #: assets/models/cmd_filter.py:44 assets/models/cmd_filter.py:91 -#: common/db/models.py:32 users/models/user.py:944 +#: common/db/models.py:32 users/models/user.py:945 #: users/serializers/group.py:32 msgid "Created by" msgstr "" @@ -1860,7 +1860,7 @@ msgstr "" msgid "Gateway" msgstr "" -#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1136 +#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1137 msgid "System" msgstr "" @@ -1933,7 +1933,7 @@ msgstr "" #: assets/models/platform.py:38 audits/const.py:59 #: authentication/backends/passkey/models.py:11 settings/models.py:38 -#: terminal/serializers/applet_host.py:33 users/models/user.py:688 +#: terminal/serializers/applet_host.py:33 users/models/user.py:689 msgid "Enabled" msgstr "" @@ -2569,8 +2569,8 @@ msgstr "" #: audits/models.py:200 audits/serializers.py:52 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms/profile.py:63 users/models/user.py:922 -#: users/serializers/profile.py:102 +#: users/forms/profile.py:63 users/models/user.py:923 +#: users/serializers/profile.py:97 msgid "MFA" msgstr "" @@ -2627,7 +2627,7 @@ msgstr "" #: audits/serializers.py:172 authentication/models/connection_token.py:47 #: authentication/models/temp_token.py:13 perms/models/asset_permission.py:80 #: tickets/models/ticket/apply_application.py:31 -#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:941 +#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:942 msgid "Date expired" msgstr "" @@ -2661,29 +2661,29 @@ msgstr "" #: audits/signal_handlers/login_log.py:37 authentication/notifications.py:73 #: authentication/views/login.py:77 notifications/backends/__init__.py:11 #: settings/serializers/auth/wecom.py:10 settings/serializers/auth/wecom.py:15 -#: users/models/user.py:797 users/models/user.py:965 +#: users/models/user.py:798 users/models/user.py:966 msgid "WeCom" msgstr "" #: audits/signal_handlers/login_log.py:38 authentication/views/feishu.py:105 #: authentication/views/login.py:89 notifications/backends/__init__.py:14 #: settings/serializers/auth/feishu.py:10 -#: settings/serializers/auth/feishu.py:12 users/models/user.py:799 -#: users/models/user.py:971 +#: settings/serializers/auth/feishu.py:12 users/models/user.py:800 +#: users/models/user.py:972 msgid "FeiShu" msgstr "" #: audits/signal_handlers/login_log.py:40 authentication/views/login.py:101 #: authentication/views/slack.py:87 notifications/backends/__init__.py:16 #: settings/serializers/auth/slack.py:10 settings/serializers/auth/slack.py:12 -#: users/models/user.py:801 users/models/user.py:977 +#: users/models/user.py:802 users/models/user.py:978 msgid "Slack" msgstr "" #: audits/signal_handlers/login_log.py:41 authentication/views/dingtalk.py:161 #: authentication/views/login.py:83 notifications/backends/__init__.py:12 -#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:798 -#: users/models/user.py:968 +#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:799 +#: users/models/user.py:969 msgid "DingTalk" msgstr "" @@ -3235,7 +3235,7 @@ msgid "Options" msgstr "" #: authentication/serializers/connect_token_secret.py:127 -#: ops/notifications.py:18 +#: ops/notifications.py:18 rbac/tree.py:60 msgid "Component" msgstr "" @@ -3778,7 +3778,7 @@ msgstr "" msgid "discard time" msgstr "" -#: common/db/models.py:33 users/models/user.py:947 +#: common/db/models.py:33 users/models/user.py:948 msgid "Updated by" msgstr "" @@ -4850,7 +4850,7 @@ msgid "Scope" msgstr "" #: rbac/models/role.py:46 rbac/models/rolebinding.py:52 -#: users/models/user.py:909 +#: users/models/user.py:910 msgid "Role" msgstr "" @@ -4884,7 +4884,7 @@ msgstr "" msgid "System role binding" msgstr "" -#: rbac/serializers/permission.py:25 users/serializers/profile.py:108 +#: rbac/serializers/permission.py:25 users/serializers/profile.py:103 msgid "Perms" msgstr "" @@ -4934,7 +4934,7 @@ msgid "Gather account" msgstr "" #: rbac/tree.py:53 -msgid "Asset change auth" +msgid "Account change secret" msgstr "" #: rbac/tree.py:54 @@ -4945,8 +4945,8 @@ msgstr "" msgid "App ops" msgstr "Ops" -#: rbac/tree.py:57 -msgid "Features" +#: rbac/tree.py:57 settings/serializers/feature.py:132 +msgid "Feature" msgstr "" #: rbac/tree.py:58 settings/serializers/auth/base.py:10 @@ -4957,12 +4957,6 @@ msgstr "" msgid "Storage" msgstr "" -#: rbac/tree.py:60 -#, fuzzy -#| msgid "SystemComponent" -msgid "Components" -msgstr "System Component" - #: rbac/tree.py:61 terminal/models/applet/applet.py:52 #: terminal/models/applet/applet.py:317 terminal/models/applet/host.py:30 #: terminal/serializers/applet.py:15 @@ -5249,7 +5243,7 @@ msgstr "" msgid "Dingtalk" msgstr "" -#: settings/serializers/auth/lark.py:12 users/models/user.py:800 +#: settings/serializers/auth/lark.py:12 users/models/user.py:801 msgid "Lark" msgstr "" @@ -5567,7 +5561,7 @@ msgstr "" msgid "Template code" msgstr "" -#: settings/serializers/auth/sms.py:40 users/models/user.py:919 +#: settings/serializers/auth/sms.py:40 users/models/user.py:920 #: users/serializers/user.py:154 msgid "Phone" msgstr "" @@ -5821,10 +5815,6 @@ msgstr "" msgid "The unit of period" msgstr "Period" -#: settings/serializers/feature.py:132 -msgid "Feature" -msgstr "" - #: settings/serializers/feature.py:136 msgid "" "Allow users to execute batch commands in the Workbench - Job Center - Adhoc" @@ -6217,7 +6207,7 @@ msgid "" msgstr "" #: settings/serializers/terminal.py:34 users/forms/profile.py:172 -#: users/models/user.py:932 +#: users/models/user.py:933 #: xpack/plugins/cloud/serializers/account_attrs.py:210 msgid "Public key" msgstr "" @@ -7365,7 +7355,7 @@ msgstr "" msgid "HOST" msgstr "" -#: terminal/serializers/storage.py:146 users/models/user.py:929 +#: terminal/serializers/storage.py:146 users/models/user.py:930 #: xpack/plugins/cloud/serializers/account_attrs.py:213 msgid "Private key" msgstr "" @@ -8091,7 +8081,7 @@ msgid "Public key should not be the same as your old one." msgstr "" #: users/forms/profile.py:161 users/serializers/profile.py:76 -#: users/serializers/profile.py:165 users/serializers/profile.py:192 +#: users/serializers/profile.py:160 users/serializers/profile.py:187 msgid "Not a valid ssh public key" msgstr "" @@ -8099,70 +8089,70 @@ msgstr "" msgid "Preference" msgstr "" -#: users/models/user.py:689 +#: users/models/user.py:690 #, fuzzy #| msgid "Su enabled" msgid "Force enabled" msgstr "Switch account enabled" -#: users/models/user.py:912 users/serializers/user.py:269 +#: users/models/user.py:913 users/serializers/user.py:269 msgid "Is service account" msgstr "Is service account" -#: users/models/user.py:914 +#: users/models/user.py:915 msgid "Avatar" msgstr "" -#: users/models/user.py:916 +#: users/models/user.py:917 msgid "Wechat" msgstr "" -#: users/models/user.py:925 +#: users/models/user.py:926 msgid "OTP secret key" msgstr "" -#: users/models/user.py:935 users/serializers/profile.py:129 +#: users/models/user.py:936 users/serializers/profile.py:124 #: users/serializers/user.py:266 msgid "Is first login" msgstr "First login" -#: users/models/user.py:953 +#: users/models/user.py:954 msgid "Date password last updated" msgstr "Password updated" -#: users/models/user.py:956 +#: users/models/user.py:957 msgid "Need update password" msgstr "" -#: users/models/user.py:980 +#: users/models/user.py:981 msgid "Date api key used" msgstr "" -#: users/models/user.py:1105 +#: users/models/user.py:1106 msgid "Can not delete admin user" msgstr "" -#: users/models/user.py:1119 +#: users/models/user.py:1120 msgid "Can invite user" msgstr "" -#: users/models/user.py:1120 +#: users/models/user.py:1121 msgid "Can remove user" msgstr "" -#: users/models/user.py:1121 +#: users/models/user.py:1122 msgid "Can match user" msgstr "" -#: users/models/user.py:1132 +#: users/models/user.py:1133 msgid "Administrator" msgstr "" -#: users/models/user.py:1135 +#: users/models/user.py:1136 msgid "Administrator is the super user of system" msgstr "" -#: users/models/user.py:1167 +#: users/models/user.py:1168 msgid "User password history" msgstr "" @@ -8283,7 +8273,7 @@ msgstr "" msgid "The old password is incorrect" msgstr "" -#: users/serializers/profile.py:36 users/serializers/profile.py:179 +#: users/serializers/profile.py:36 users/serializers/profile.py:174 msgid "Password does not match security rules" msgstr "" @@ -8291,18 +8281,6 @@ msgstr "" msgid "The new password cannot be the last {} passwords" msgstr "" -#: users/serializers/profile.py:92 -msgid "Off" -msgstr "" - -#: users/serializers/profile.py:93 -msgid "On" -msgstr "" - -#: users/serializers/profile.py:94 -msgid "Forced enabled" -msgstr "" - #: users/serializers/user.py:50 msgid "System roles" msgstr "" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 622abed15..61e3e6661 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-06-25 16:48+0800\n" +"POT-Creation-Date: 2024-06-26 14:59+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -89,7 +89,7 @@ msgstr "匿名ユーザー" msgid "Specified account" msgstr "特定のアカウント" -#: accounts/const/account.py:26 users/models/user.py:790 +#: accounts/const/account.py:26 users/models/user.py:791 msgid "Local" msgstr "ローカル" @@ -216,7 +216,7 @@ msgstr "作成のみ" #: authentication/serializers/password_mfa.py:24 #: notifications/backends/__init__.py:10 settings/serializers/msg.py:21 #: settings/serializers/msg.py:58 users/forms/profile.py:100 -#: users/forms/profile.py:108 users/models/user.py:901 +#: users/forms/profile.py:108 users/models/user.py:902 #: users/templates/users/forgot_password.html:162 #: users/views/profile/reset.py:94 msgid "Email" @@ -303,7 +303,7 @@ msgid "Version" msgstr "バージョン" #: accounts/models/account.py:57 accounts/serializers/account/account.py:217 -#: users/models/user.py:962 +#: users/models/user.py:963 msgid "Source" msgstr "ソース" @@ -551,7 +551,7 @@ msgstr "最終ログイン日" #: authentication/templates/authentication/_msg_different_city.html:9 #: authentication/templates/authentication/_msg_oauth_bind.html:9 #: terminal/serializers/storage.py:136 users/forms/profile.py:31 -#: users/forms/profile.py:114 users/models/user.py:899 +#: users/forms/profile.py:114 users/models/user.py:900 #: users/templates/users/_msg_user_created.html:12 #: xpack/plugins/cloud/serializers/account_attrs.py:26 msgid "Username" @@ -648,7 +648,7 @@ msgstr "パスワードルール" #: terminal/models/virtualapp/provider.py:10 #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:32 users/models/group.py:13 -#: users/models/preference.py:11 users/models/user.py:900 +#: users/models/preference.py:11 users/models/user.py:901 #: xpack/plugins/cloud/models.py:33 xpack/plugins/cloud/models.py:296 #: xpack/plugins/cloud/serializers/task.py:74 msgid "Name" @@ -883,8 +883,8 @@ msgstr "ID" #: terminal/serializers/command.py:16 #: terminal/templates/terminal/_msg_command_warning.html:6 #: terminal/templates/terminal/_msg_session_sharing.html:6 -#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1110 -#: users/models/user.py:1154 +#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1111 +#: users/models/user.py:1155 msgid "User" msgstr "ユーザー" @@ -973,7 +973,7 @@ msgstr "关联平台,可以配置推送参数,如果不关联,则使用默 #: terminal/models/component/endpoint.py:119 #: terminal/models/session/session.py:47 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 -#: tickets/models/ticket/general.py:295 users/models/user.py:934 +#: tickets/models/ticket/general.py:295 users/models/user.py:935 #: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:121 msgid "Comment" msgstr "コメント" @@ -1484,8 +1484,8 @@ msgid "Unknown" msgstr "不明" #: assets/const/automation.py:7 -msgid "Ok" -msgstr "OK" +msgid "OK" +msgstr "" #: assets/const/automation.py:12 msgid "Ping" @@ -1500,7 +1500,7 @@ msgid "Gather facts" msgstr "資産情報の収集" #: assets/const/base.py:32 audits/const.py:58 -#: terminal/serializers/applet_host.py:32 users/models/user.py:687 +#: terminal/serializers/applet_host.py:32 users/models/user.py:688 msgid "Disabled" msgstr "無効" @@ -1824,7 +1824,7 @@ msgstr "アセットの自動化タスク" #: assets/models/automations/base.py:114 assets/models/cmd_filter.py:41 #: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:241 -#: users/models/user.py:1157 +#: users/models/user.py:1158 msgid "Date created" msgstr "作成された日付" @@ -1845,17 +1845,17 @@ msgid "Date verified" msgstr "確認済みの日付" #: assets/models/cmd_filter.py:28 perms/models/asset_permission.py:66 -#: users/models/group.py:25 users/models/user.py:906 +#: users/models/group.py:25 users/models/user.py:907 msgid "User group" msgstr "ユーザーグループ" #: assets/models/cmd_filter.py:42 common/db/models.py:35 -#: users/models/user.py:982 +#: users/models/user.py:983 msgid "Date updated" msgstr "更新日" #: assets/models/cmd_filter.py:44 assets/models/cmd_filter.py:91 -#: common/db/models.py:32 users/models/user.py:944 +#: common/db/models.py:32 users/models/user.py:945 #: users/serializers/group.py:32 msgid "Created by" msgstr "によって作成された" @@ -1892,7 +1892,7 @@ msgstr "お気に入りのアセット" msgid "Gateway" msgstr "ゲートウェイ" -#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1136 +#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1137 msgid "System" msgstr "システム" @@ -1965,7 +1965,7 @@ msgstr "設定" #: assets/models/platform.py:38 audits/const.py:59 #: authentication/backends/passkey/models.py:11 settings/models.py:38 -#: terminal/serializers/applet_host.py:33 users/models/user.py:688 +#: terminal/serializers/applet_host.py:33 users/models/user.py:689 msgid "Enabled" msgstr "有効化" @@ -2615,8 +2615,8 @@ msgstr "ログインIP" #: audits/models.py:200 audits/serializers.py:52 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms/profile.py:63 users/models/user.py:922 -#: users/serializers/profile.py:102 +#: users/forms/profile.py:63 users/models/user.py:923 +#: users/serializers/profile.py:97 msgid "MFA" msgstr "MFA" @@ -2673,7 +2673,7 @@ msgstr "ユーザー %s %s が現在のリソースをサブスクライブし #: audits/serializers.py:172 authentication/models/connection_token.py:47 #: authentication/models/temp_token.py:13 perms/models/asset_permission.py:80 #: tickets/models/ticket/apply_application.py:31 -#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:941 +#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:942 msgid "Date expired" msgstr "期限切れの日付" @@ -2707,29 +2707,29 @@ msgstr "認証トークン" #: audits/signal_handlers/login_log.py:37 authentication/notifications.py:73 #: authentication/views/login.py:77 notifications/backends/__init__.py:11 #: settings/serializers/auth/wecom.py:10 settings/serializers/auth/wecom.py:15 -#: users/models/user.py:797 users/models/user.py:965 +#: users/models/user.py:798 users/models/user.py:966 msgid "WeCom" msgstr "企業微信" #: audits/signal_handlers/login_log.py:38 authentication/views/feishu.py:105 #: authentication/views/login.py:89 notifications/backends/__init__.py:14 #: settings/serializers/auth/feishu.py:10 -#: settings/serializers/auth/feishu.py:12 users/models/user.py:799 -#: users/models/user.py:971 +#: settings/serializers/auth/feishu.py:12 users/models/user.py:800 +#: users/models/user.py:972 msgid "FeiShu" msgstr "本を飛ばす" #: audits/signal_handlers/login_log.py:40 authentication/views/login.py:101 #: authentication/views/slack.py:87 notifications/backends/__init__.py:16 #: settings/serializers/auth/slack.py:10 settings/serializers/auth/slack.py:12 -#: users/models/user.py:801 users/models/user.py:977 +#: users/models/user.py:802 users/models/user.py:978 msgid "Slack" msgstr "" #: audits/signal_handlers/login_log.py:41 authentication/views/dingtalk.py:161 #: authentication/views/login.py:83 notifications/backends/__init__.py:12 -#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:798 -#: users/models/user.py:968 +#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:799 +#: users/models/user.py:969 msgid "DingTalk" msgstr "DingTalk" @@ -3301,7 +3301,7 @@ msgid "Options" msgstr "オプション" #: authentication/serializers/connect_token_secret.py:127 -#: ops/notifications.py:18 +#: ops/notifications.py:18 rbac/tree.py:60 msgid "Component" msgstr "コンポーネント" @@ -3861,7 +3861,7 @@ msgstr "は破棄されます" msgid "discard time" msgstr "時間を捨てる" -#: common/db/models.py:33 users/models/user.py:947 +#: common/db/models.py:33 users/models/user.py:948 msgid "Updated by" msgstr "によって更新" @@ -4956,7 +4956,7 @@ msgid "Scope" msgstr "スコープ" #: rbac/models/role.py:46 rbac/models/rolebinding.py:52 -#: users/models/user.py:909 +#: users/models/user.py:910 msgid "Role" msgstr "ロール" @@ -4991,7 +4991,7 @@ msgstr "組織の役割バインディング" msgid "System role binding" msgstr "システムロールバインディング" -#: rbac/serializers/permission.py:25 users/serializers/profile.py:108 +#: rbac/serializers/permission.py:25 users/serializers/profile.py:103 msgid "Perms" msgstr "パーマ" @@ -5041,8 +5041,8 @@ msgid "Gather account" msgstr "アカウントを集める" #: rbac/tree.py:53 -msgid "Asset change auth" -msgstr "資産の改ざん" +msgid "Account change secret" +msgstr "アカウントの秘密の変更" #: rbac/tree.py:54 msgid "My assets" @@ -5052,10 +5052,8 @@ msgstr "私の資産" msgid "App ops" msgstr "アプリ操作" -#: rbac/tree.py:57 -#, fuzzy -#| msgid "Feature" -msgid "Features" +#: rbac/tree.py:57 settings/serializers/feature.py:132 +msgid "Feature" msgstr "機能" #: rbac/tree.py:58 settings/serializers/auth/base.py:10 @@ -5066,12 +5064,6 @@ msgstr "認証" msgid "Storage" msgstr "" -#: rbac/tree.py:60 -#, fuzzy -#| msgid "Component" -msgid "Components" -msgstr "コンポーネント" - #: rbac/tree.py:61 terminal/models/applet/applet.py:52 #: terminal/models/applet/applet.py:317 terminal/models/applet/host.py:30 #: terminal/serializers/applet.py:15 @@ -5360,7 +5352,7 @@ msgstr "" msgid "Dingtalk" msgstr "ピン認証の有効化" -#: settings/serializers/auth/lark.py:12 users/models/user.py:800 +#: settings/serializers/auth/lark.py:12 users/models/user.py:801 msgid "Lark" msgstr "" @@ -5682,7 +5674,7 @@ msgstr "署名" msgid "Template code" msgstr "テンプレートコード" -#: settings/serializers/auth/sms.py:40 users/models/user.py:919 +#: settings/serializers/auth/sms.py:40 users/models/user.py:920 #: users/serializers/user.py:154 msgid "Phone" msgstr "電話" @@ -5944,10 +5936,6 @@ msgstr "単位" msgid "The unit of period" msgstr "ユーザーの実行" -#: settings/serializers/feature.py:132 -msgid "Feature" -msgstr "機能" - #: settings/serializers/feature.py:136 msgid "" "Allow users to execute batch commands in the Workbench - Job Center - Adhoc" @@ -6377,7 +6365,7 @@ msgid "" msgstr "" #: settings/serializers/terminal.py:34 users/forms/profile.py:172 -#: users/models/user.py:932 +#: users/models/user.py:933 #: xpack/plugins/cloud/serializers/account_attrs.py:210 msgid "Public key" msgstr "公開キー" @@ -7577,7 +7565,7 @@ msgstr "エンドポイントサフィックス" msgid "HOST" msgstr "ホスト" -#: terminal/serializers/storage.py:146 users/models/user.py:929 +#: terminal/serializers/storage.py:146 users/models/user.py:930 #: xpack/plugins/cloud/serializers/account_attrs.py:213 msgid "Private key" msgstr "ssh秘密鍵" @@ -8321,7 +8309,7 @@ msgid "Public key should not be the same as your old one." msgstr "公開鍵は古いものと同じであってはなりません。" #: users/forms/profile.py:161 users/serializers/profile.py:76 -#: users/serializers/profile.py:165 users/serializers/profile.py:192 +#: users/serializers/profile.py:160 users/serializers/profile.py:187 msgid "Not a valid ssh public key" msgstr "有効なssh公開鍵ではありません" @@ -8329,70 +8317,70 @@ msgstr "有効なssh公開鍵ではありません" msgid "Preference" msgstr "ユーザー設定" -#: users/models/user.py:689 +#: users/models/user.py:690 msgid "Force enabled" msgstr "強制有効" -#: users/models/user.py:912 users/serializers/user.py:269 +#: users/models/user.py:913 users/serializers/user.py:269 msgid "Is service account" msgstr "サービスアカウントです" -#: users/models/user.py:914 +#: users/models/user.py:915 msgid "Avatar" msgstr "アバター" -#: users/models/user.py:916 +#: users/models/user.py:917 msgid "Wechat" msgstr "微信" -#: users/models/user.py:925 +#: users/models/user.py:926 msgid "OTP secret key" msgstr "OTP 秘密" # msgid "Private key" # msgstr "ssh秘密鍵" -#: users/models/user.py:935 users/serializers/profile.py:129 +#: users/models/user.py:936 users/serializers/profile.py:124 #: users/serializers/user.py:266 msgid "Is first login" msgstr "最初のログインです" -#: users/models/user.py:953 +#: users/models/user.py:954 msgid "Date password last updated" msgstr "最終更新日パスワード" -#: users/models/user.py:956 +#: users/models/user.py:957 msgid "Need update password" msgstr "更新パスワードが必要" -#: users/models/user.py:980 +#: users/models/user.py:981 msgid "Date api key used" msgstr "API key 最後に使用した日付" -#: users/models/user.py:1105 +#: users/models/user.py:1106 msgid "Can not delete admin user" msgstr "管理者ユーザーを削除できませんでした" -#: users/models/user.py:1119 +#: users/models/user.py:1120 msgid "Can invite user" msgstr "ユーザーを招待できます" -#: users/models/user.py:1120 +#: users/models/user.py:1121 msgid "Can remove user" msgstr "ユーザーを削除できます" -#: users/models/user.py:1121 +#: users/models/user.py:1122 msgid "Can match user" msgstr "ユーザーに一致できます" -#: users/models/user.py:1132 +#: users/models/user.py:1133 msgid "Administrator" msgstr "管理者" -#: users/models/user.py:1135 +#: users/models/user.py:1136 msgid "Administrator is the super user of system" msgstr "管理者はシステムのスーパーユーザーです" -#: users/models/user.py:1167 +#: users/models/user.py:1168 msgid "User password history" msgstr "ユーザーパスワード履歴" @@ -8524,7 +8512,7 @@ msgstr "コマンドライン" msgid "The old password is incorrect" msgstr "古いパスワードが正しくありません" -#: users/serializers/profile.py:36 users/serializers/profile.py:179 +#: users/serializers/profile.py:36 users/serializers/profile.py:174 msgid "Password does not match security rules" msgstr "パスワードがセキュリティルールと一致しない" @@ -8532,18 +8520,6 @@ msgstr "パスワードがセキュリティルールと一致しない" msgid "The new password cannot be the last {} passwords" msgstr "新しいパスワードを最後の {} 個のパスワードにすることはできません" -#: users/serializers/profile.py:92 -msgid "Off" -msgstr "オフライン" - -#: users/serializers/profile.py:93 -msgid "On" -msgstr "オープン" - -#: users/serializers/profile.py:94 -msgid "Forced enabled" -msgstr "強制有効" - #: users/serializers/user.py:50 msgid "System roles" msgstr "システムの役割" @@ -9734,22 +9710,3 @@ msgstr "エンタープライズプロフェッショナル版" #: xpack/plugins/license/models.py:86 msgid "Ultimate edition" msgstr "エンタープライズ・フラッグシップ・エディション" - -#, fuzzy -#~| msgid "permed assets" -#~ msgid "Release assets" -#~ msgstr "パーマ資産" - -#~ msgid "Job center" -#~ msgstr "タスクセンター" - -#, fuzzy -#~| msgid "Task" -#~ msgid "Tasks" -#~ msgstr "タスク" - -#~ msgid "Average time taken" -#~ msgstr "時を過ごす" - -#~ msgid "Terminal setting" -#~ msgstr "ターミナル設定" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index d33cb5585..118d18bb3 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-06-25 16:48+0800\n" +"POT-Creation-Date: 2024-06-26 14:59+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -88,7 +88,7 @@ msgstr "匿名账号" msgid "Specified account" msgstr "指定账号" -#: accounts/const/account.py:26 users/models/user.py:790 +#: accounts/const/account.py:26 users/models/user.py:791 msgid "Local" msgstr "数据库" @@ -215,7 +215,7 @@ msgstr "仅创建" #: authentication/serializers/password_mfa.py:24 #: notifications/backends/__init__.py:10 settings/serializers/msg.py:21 #: settings/serializers/msg.py:58 users/forms/profile.py:100 -#: users/forms/profile.py:108 users/models/user.py:901 +#: users/forms/profile.py:108 users/models/user.py:902 #: users/templates/users/forgot_password.html:162 #: users/views/profile/reset.py:94 msgid "Email" @@ -302,7 +302,7 @@ msgid "Version" msgstr "版本" #: accounts/models/account.py:57 accounts/serializers/account/account.py:217 -#: users/models/user.py:962 +#: users/models/user.py:963 msgid "Source" msgstr "来源" @@ -550,7 +550,7 @@ msgstr "最后登录日期" #: authentication/templates/authentication/_msg_different_city.html:9 #: authentication/templates/authentication/_msg_oauth_bind.html:9 #: terminal/serializers/storage.py:136 users/forms/profile.py:31 -#: users/forms/profile.py:114 users/models/user.py:899 +#: users/forms/profile.py:114 users/models/user.py:900 #: users/templates/users/_msg_user_created.html:12 #: xpack/plugins/cloud/serializers/account_attrs.py:26 msgid "Username" @@ -647,7 +647,7 @@ msgstr "密码规则" #: terminal/models/virtualapp/provider.py:10 #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:32 users/models/group.py:13 -#: users/models/preference.py:11 users/models/user.py:900 +#: users/models/preference.py:11 users/models/user.py:901 #: xpack/plugins/cloud/models.py:33 xpack/plugins/cloud/models.py:296 #: xpack/plugins/cloud/serializers/task.py:74 msgid "Name" @@ -881,8 +881,8 @@ msgstr "ID" #: terminal/serializers/command.py:16 #: terminal/templates/terminal/_msg_command_warning.html:6 #: terminal/templates/terminal/_msg_session_sharing.html:6 -#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1110 -#: users/models/user.py:1154 +#: tickets/models/comment.py:21 users/const.py:14 users/models/user.py:1111 +#: users/models/user.py:1155 msgid "User" msgstr "用户" @@ -971,7 +971,7 @@ msgstr "关联平台,可配置推送参数,如果不关联,将使用默认 #: terminal/models/component/endpoint.py:119 #: terminal/models/session/session.py:47 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 -#: tickets/models/ticket/general.py:295 users/models/user.py:934 +#: tickets/models/ticket/general.py:295 users/models/user.py:935 #: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:121 msgid "Comment" msgstr "备注" @@ -1474,8 +1474,8 @@ msgid "Unknown" msgstr "未知" #: assets/const/automation.py:7 -msgid "Ok" -msgstr "成功" +msgid "OK" +msgstr "" #: assets/const/automation.py:12 msgid "Ping" @@ -1490,7 +1490,7 @@ msgid "Gather facts" msgstr "收集资产信息" #: assets/const/base.py:32 audits/const.py:58 -#: terminal/serializers/applet_host.py:32 users/models/user.py:687 +#: terminal/serializers/applet_host.py:32 users/models/user.py:688 msgid "Disabled" msgstr "禁用" @@ -1814,7 +1814,7 @@ msgstr "资产自动化任务" # msgstr "备注" #: assets/models/automations/base.py:114 assets/models/cmd_filter.py:41 #: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:241 -#: users/models/user.py:1157 +#: users/models/user.py:1158 msgid "Date created" msgstr "创建日期" @@ -1835,17 +1835,17 @@ msgid "Date verified" msgstr "校验日期" #: assets/models/cmd_filter.py:28 perms/models/asset_permission.py:66 -#: users/models/group.py:25 users/models/user.py:906 +#: users/models/group.py:25 users/models/user.py:907 msgid "User group" msgstr "用户组" #: assets/models/cmd_filter.py:42 common/db/models.py:35 -#: users/models/user.py:982 +#: users/models/user.py:983 msgid "Date updated" msgstr "更新日期" #: assets/models/cmd_filter.py:44 assets/models/cmd_filter.py:91 -#: common/db/models.py:32 users/models/user.py:944 +#: common/db/models.py:32 users/models/user.py:945 #: users/serializers/group.py:32 msgid "Created by" msgstr "创建者" @@ -1882,7 +1882,7 @@ msgstr "收藏的资产" msgid "Gateway" msgstr "网关" -#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1136 +#: assets/models/label.py:15 rbac/const.py:6 users/models/user.py:1137 msgid "System" msgstr "系统" @@ -1955,7 +1955,7 @@ msgstr "设置" #: assets/models/platform.py:38 audits/const.py:59 #: authentication/backends/passkey/models.py:11 settings/models.py:38 -#: terminal/serializers/applet_host.py:33 users/models/user.py:688 +#: terminal/serializers/applet_host.py:33 users/models/user.py:689 msgid "Enabled" msgstr "启用" @@ -2595,8 +2595,8 @@ msgstr "登录 IP" #: audits/models.py:200 audits/serializers.py:52 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms/profile.py:63 users/models/user.py:922 -#: users/serializers/profile.py:102 +#: users/forms/profile.py:63 users/models/user.py:923 +#: users/serializers/profile.py:97 msgid "MFA" msgstr "MFA" @@ -2653,7 +2653,7 @@ msgstr "用户 %s %s 了当前资源" #: audits/serializers.py:172 authentication/models/connection_token.py:47 #: authentication/models/temp_token.py:13 perms/models/asset_permission.py:80 #: tickets/models/ticket/apply_application.py:31 -#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:941 +#: tickets/models/ticket/apply_asset.py:20 users/models/user.py:942 msgid "Date expired" msgstr "失效日期" @@ -2687,29 +2687,29 @@ msgstr "认证令牌" #: audits/signal_handlers/login_log.py:37 authentication/notifications.py:73 #: authentication/views/login.py:77 notifications/backends/__init__.py:11 #: settings/serializers/auth/wecom.py:10 settings/serializers/auth/wecom.py:15 -#: users/models/user.py:797 users/models/user.py:965 +#: users/models/user.py:798 users/models/user.py:966 msgid "WeCom" msgstr "企业微信" #: audits/signal_handlers/login_log.py:38 authentication/views/feishu.py:105 #: authentication/views/login.py:89 notifications/backends/__init__.py:14 #: settings/serializers/auth/feishu.py:10 -#: settings/serializers/auth/feishu.py:12 users/models/user.py:799 -#: users/models/user.py:971 +#: settings/serializers/auth/feishu.py:12 users/models/user.py:800 +#: users/models/user.py:972 msgid "FeiShu" msgstr "飞书" #: audits/signal_handlers/login_log.py:40 authentication/views/login.py:101 #: authentication/views/slack.py:87 notifications/backends/__init__.py:16 #: settings/serializers/auth/slack.py:10 settings/serializers/auth/slack.py:12 -#: users/models/user.py:801 users/models/user.py:977 +#: users/models/user.py:802 users/models/user.py:978 msgid "Slack" msgstr "Slack" #: audits/signal_handlers/login_log.py:41 authentication/views/dingtalk.py:161 #: authentication/views/login.py:83 notifications/backends/__init__.py:12 -#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:798 -#: users/models/user.py:968 +#: settings/serializers/auth/dingtalk.py:10 users/models/user.py:799 +#: users/models/user.py:969 msgid "DingTalk" msgstr "钉钉" @@ -3266,7 +3266,7 @@ msgid "Options" msgstr "选项" #: authentication/serializers/connect_token_secret.py:127 -#: ops/notifications.py:18 +#: ops/notifications.py:18 rbac/tree.py:60 msgid "Component" msgstr "组件" @@ -3814,7 +3814,7 @@ msgstr "忽略的" msgid "discard time" msgstr "忽略时间" -#: common/db/models.py:33 users/models/user.py:947 +#: common/db/models.py:33 users/models/user.py:948 msgid "Updated by" msgstr "最后更新者" @@ -4896,7 +4896,7 @@ msgid "Scope" msgstr "范围" #: rbac/models/role.py:46 rbac/models/rolebinding.py:52 -#: users/models/user.py:909 +#: users/models/user.py:910 msgid "Role" msgstr "角色" @@ -4930,7 +4930,7 @@ msgstr "组织角色绑定" msgid "System role binding" msgstr "系统角色绑定" -#: rbac/serializers/permission.py:25 users/serializers/profile.py:108 +#: rbac/serializers/permission.py:25 users/serializers/profile.py:103 msgid "Perms" msgstr "权限" @@ -4980,8 +4980,8 @@ msgid "Gather account" msgstr "收集账号" #: rbac/tree.py:53 -msgid "Asset change auth" -msgstr "资产改密" +msgid "Account change secret" +msgstr "账号改密" #: rbac/tree.py:54 msgid "My assets" @@ -4991,10 +4991,8 @@ msgstr "我的资产" msgid "App ops" msgstr "作业中心" -#: rbac/tree.py:57 -#, fuzzy -#| msgid "Feature" -msgid "Features" +#: rbac/tree.py:57 settings/serializers/feature.py:132 +msgid "Feature" msgstr "功能" #: rbac/tree.py:58 settings/serializers/auth/base.py:10 @@ -5005,12 +5003,6 @@ msgstr "认证" msgid "Storage" msgstr "存储" -#: rbac/tree.py:60 -#, fuzzy -#| msgid "Component" -msgid "Components" -msgstr "组件" - #: rbac/tree.py:61 terminal/models/applet/applet.py:52 #: terminal/models/applet/applet.py:317 terminal/models/applet/host.py:30 #: terminal/serializers/applet.py:15 @@ -5303,7 +5295,7 @@ msgstr "用户认证成功后,若用户不存在,则自动创建用户" msgid "Dingtalk" msgstr "启用钉钉认证" -#: settings/serializers/auth/lark.py:12 users/models/user.py:800 +#: settings/serializers/auth/lark.py:12 users/models/user.py:801 msgid "Lark" msgstr "启用飞书认证" @@ -5632,7 +5624,7 @@ msgstr "签名" msgid "Template code" msgstr "模板" -#: settings/serializers/auth/sms.py:40 users/models/user.py:919 +#: settings/serializers/auth/sms.py:40 users/models/user.py:920 #: users/serializers/user.py:154 msgid "Phone" msgstr "手机" @@ -5885,10 +5877,6 @@ msgstr "单位" msgid "The unit of period" msgstr "执行周期" -#: settings/serializers/feature.py:132 -msgid "Feature" -msgstr "功能" - #: settings/serializers/feature.py:136 msgid "" "Allow users to execute batch commands in the Workbench - Job Center - Adhoc" @@ -6299,7 +6287,7 @@ msgid "" msgstr "* 允许用户通过密码验证登录KoKo组件" #: settings/serializers/terminal.py:34 users/forms/profile.py:172 -#: users/models/user.py:932 +#: users/models/user.py:933 #: xpack/plugins/cloud/serializers/account_attrs.py:210 msgid "Public key" msgstr "SSH公钥" @@ -7490,7 +7478,7 @@ msgstr "端点后缀" msgid "HOST" msgstr "主机" -#: terminal/serializers/storage.py:146 users/models/user.py:929 +#: terminal/serializers/storage.py:146 users/models/user.py:930 #: xpack/plugins/cloud/serializers/account_attrs.py:213 msgid "Private key" msgstr "ssh私钥" @@ -8225,7 +8213,7 @@ msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" #: users/forms/profile.py:161 users/serializers/profile.py:76 -#: users/serializers/profile.py:165 users/serializers/profile.py:192 +#: users/serializers/profile.py:160 users/serializers/profile.py:187 msgid "Not a valid ssh public key" msgstr "SSH密钥不合法" @@ -8233,70 +8221,70 @@ msgstr "SSH密钥不合法" msgid "Preference" msgstr "用户设置" -#: users/models/user.py:689 +#: users/models/user.py:690 msgid "Force enabled" msgstr "强制启用" -#: users/models/user.py:912 users/serializers/user.py:269 +#: users/models/user.py:913 users/serializers/user.py:269 msgid "Is service account" msgstr "服务账号" -#: users/models/user.py:914 +#: users/models/user.py:915 msgid "Avatar" msgstr "头像" -#: users/models/user.py:916 +#: users/models/user.py:917 msgid "Wechat" msgstr "微信" -#: users/models/user.py:925 +#: users/models/user.py:926 msgid "OTP secret key" msgstr "OTP 密钥" # msgid "Private key" # msgstr "ssh私钥" -#: users/models/user.py:935 users/serializers/profile.py:129 +#: users/models/user.py:936 users/serializers/profile.py:124 #: users/serializers/user.py:266 msgid "Is first login" msgstr "首次登录" -#: users/models/user.py:953 +#: users/models/user.py:954 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:956 +#: users/models/user.py:957 msgid "Need update password" msgstr "需要更新密码" -#: users/models/user.py:980 +#: users/models/user.py:981 msgid "Date api key used" msgstr "API key 最后使用日期" -#: users/models/user.py:1105 +#: users/models/user.py:1106 msgid "Can not delete admin user" msgstr "无法删除管理员用户" -#: users/models/user.py:1119 +#: users/models/user.py:1120 msgid "Can invite user" msgstr "可以邀请用户" -#: users/models/user.py:1120 +#: users/models/user.py:1121 msgid "Can remove user" msgstr "可以移除用户" -#: users/models/user.py:1121 +#: users/models/user.py:1122 msgid "Can match user" msgstr "可以匹配用户" -#: users/models/user.py:1132 +#: users/models/user.py:1133 msgid "Administrator" msgstr "管理员" -#: users/models/user.py:1135 +#: users/models/user.py:1136 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" -#: users/models/user.py:1167 +#: users/models/user.py:1168 msgid "User password history" msgstr "用户密码历史" @@ -8423,7 +8411,7 @@ msgstr "命令行" msgid "The old password is incorrect" msgstr "旧密码错误" -#: users/serializers/profile.py:36 users/serializers/profile.py:179 +#: users/serializers/profile.py:36 users/serializers/profile.py:174 msgid "Password does not match security rules" msgstr "密码不满足安全规则" @@ -8431,18 +8419,6 @@ msgstr "密码不满足安全规则" msgid "The new password cannot be the last {} passwords" msgstr "新密码不能是最近 {} 次的密码" -#: users/serializers/profile.py:92 -msgid "Off" -msgstr "离线" - -#: users/serializers/profile.py:93 -msgid "On" -msgstr "打开" - -#: users/serializers/profile.py:94 -msgid "Forced enabled" -msgstr "强制启用" - #: users/serializers/user.py:50 msgid "System roles" msgstr "系统角色" @@ -9620,25 +9596,3 @@ msgstr "企业专业版" #: xpack/plugins/license/models.py:86 msgid "Ultimate edition" msgstr "企业旗舰版" - -#~ msgid "From" -#~ msgstr "表单" - -#, fuzzy -#~| msgid "permed assets" -#~ msgid "Release assets" -#~ msgstr "授权的资产" - -#~ msgid "Job center" -#~ msgstr "任务中心" - -#, fuzzy -#~| msgid "Task" -#~ msgid "Tasks" -#~ msgstr "任务" - -#~ msgid "Average time taken" -#~ msgstr "平均耗时" - -#~ msgid "Terminal setting" -#~ msgstr "终端设置" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 65f26d8d2..4276df3e2 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -1350,5 +1350,32 @@ "UnFavoriteSucceed": "Unfavorite Successful", "TriggerMode": "Trigger mode", "CreateUserContent": "Creating User Content", + "BaseAssetList": "Asset List", + "BaseCloudSync": "Cloud Sync", + "BaseCloudAccountList": "Cloud Account List", + "BaseStrategy": "Strategy", + "BaseAccount": "Account", + "BaseAccountTemplate": "Account Template", + "BaseAccountPush": "Account Push", + "BaseAccountChangeSecret": "Account Change Secret", + "BaseAccountGather": "Account Gather", + "BaseAccountBackup": "Account Backup", + "BaseAssetPermission": "Asset Permission", + "BaseUserLoginAclList": "User Login ACL List", + "BaseCmdACL": "Cmd ACL", + "BaseLoginAssetAcls": "Login Asset ACLs", + "BaseCmdGroups": "Cmd Groups", + "BaseConnectMethodACL": "Connect Method ACL", + "BaseTags": "Tags", + "BaseSessions": "Sessions", + "BaseLoginLog": "Login Log", + "BaseOperateLog": "Operate Log", + "BaseMyAssets": "My Assets", + "BaseJob": "Job", + "BaseFlowSetUp": "Flow Set Up", + "BaseStorage": "Storage", + "BaseTerminal": "Terminal", + "BaseApplets": "Applets", + "BaseSystemTasks": "System Tasks", "Open": "Open" } diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index 6aa69e549..7ca61fd97 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -1350,5 +1350,32 @@ "UnFavoriteSucceed": "取消收藏成功", "TriggerMode": "触发方式", "CreateUserContent": "创建用户内容", + "BaseAssetList": "资产列表", + "BaseCloudSync": "云同步", + "BaseCloudAccountList": "云账号列表", + "BaseStrategy": "策略", + "BaseAccount": "账号", + "BaseAccountTemplate": "账号模版", + "BaseAccountPush": "账号推送", + "BaseAccountChangeSecret": "账号改密", + "BaseAccountGather": "账号采集", + "BaseAccountBackup": "账号备份", + "BaseAssetPermission": "资产授权", + "BaseUserLoginAclList": "用户登录", + "BaseCmdACL": "命令授权", + "BaseLoginAssetAcls": "登录授权", + "BaseCmdGroups": "命令组", + "BaseConnectMethodACL": "连接方式授权", + "BaseTags": "标签", + "BaseSessions": "会话", + "BaseLoginLog": "登录日志", + "BaseOperateLog": "操作日志", + "BaseMyAssets": "我的资产", + "BaseJob": "作业", + "BaseFlowSetUp": "流程设置", + "BaseStorage": "存储", + "BaseTerminal": "终端", + "BaseApplets": "应用", + "BaseSystemTasks": "任务", "Open": "打开" } diff --git a/apps/rbac/tree.py b/apps/rbac/tree.py index 8e0fa07af..370147544 100644 --- a/apps/rbac/tree.py +++ b/apps/rbac/tree.py @@ -50,14 +50,14 @@ extra_nodes_data = [ {"id": "backup_account_node", "name": _("Backup account"), "pId": "accounts"}, {"id": "gather_account_node", "name": _("Gather account"), "pId": "accounts"}, {"id": "push_account_node", "name": _("Push account"), "pId": "accounts"}, - {"id": "asset_change_plan_node", "name": _("Asset change auth"), "pId": "accounts"}, + {"id": "asset_change_plan_node", "name": _("Account change secret"), "pId": "accounts"}, {'id': "my_assets", "name": _("My assets"), "pId": "view_workbench"}, {'id': "operation_center", "name": _('App ops'), "pId": "view_workbench"}, {'id': "notifications", "name": _("Notifications"), "pId": "view_setting"}, - {'id': "features", "name": _("Features"), "pId": "view_setting"}, + {'id': "features", "name": _("Feature"), "pId": "view_setting"}, {'id': "authentication_setting", "name": _("Authentication"), "pId": "view_setting"}, {'id': "storage", "name": _("Storage"), "pId": "view_setting"}, - {'id': "components", "name": _("Components"), "pId": "view_setting"}, + {'id': "components", "name": _("Component"), "pId": "view_setting"}, {'id': "remote_app", "name": _("Applet"), "pId": "view_setting"}, {'id': "security", "name": _("Security"), "pId": "view_setting"}, {'id': "appearance", "name": _("Appearance"), "pId": "view_setting"}, diff --git a/apps/users/models/user.py b/apps/users/models/user.py index deb1022dd..a3a290a5e 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -37,6 +37,7 @@ from ..signals import post_user_change_password, post_user_leave_org, pre_user_l __all__ = [ "User", "UserPasswordHistory", + "MFAMixin" ] logger = get_logger(__file__) diff --git a/apps/users/serializers/profile.py b/apps/users/serializers/profile.py index 3b236bc5e..852dd927c 100644 --- a/apps/users/serializers/profile.py +++ b/apps/users/serializers/profile.py @@ -5,7 +5,7 @@ from rest_framework import serializers from common.serializers.fields import EncryptedField, LabeledChoiceField from common.utils import validate_ssh_public_key from .user import UserSerializer -from ..models import User +from ..models import User, MFAMixin class UserOrgSerializer(serializers.Serializer): @@ -88,18 +88,13 @@ class UserRoleSerializer(serializers.Serializer): class UserProfileSerializer(UserSerializer): - MFA_LEVEL_CHOICES = ( - (0, _('Off')), - (1, _('On')), - (2, _("Forced enabled")), - ) public_key_comment = serializers.CharField( source='get_public_key_comment', required=False, read_only=True, max_length=128 ) public_key_hash_md5 = serializers.CharField( source='get_public_key_hash_md5', required=False, read_only=True, max_length=128 ) - mfa_level = LabeledChoiceField(choices=MFA_LEVEL_CHOICES, label=_("MFA"), required=False) + mfa_level = LabeledChoiceField(choices=MFAMixin.MFA_LEVEL_CHOICES, label=_("MFA"), required=False) guide_url = serializers.SerializerMethodField() receive_backends = serializers.ListField(child=serializers.CharField(), read_only=True) console_orgs = UserOrgSerializer(many=True, read_only=True)