github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

feat: 支持纳管百度云资产 (#7921) 

Co-authored-by: ibuler <ibuler@qq.com>
pull/7938/head
jiangweidong 2022-03-21 10:39:47 +08:00 committed by GitHub
parent 60edbb36a1
commit e993f31b6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 77 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
apps/locale/zh/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n" "Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-17 19:16+0800\n" "POT-Creation-Date: 2022-03-21 10:37+0800\n"
"PO-Revision-Date: 2021-05-20 10:54+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n"
"Last-Translator: ibuler <ibuler@qq.com>\n" "Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n" "Language-Team: JumpServer team<ibuler@qq.com>\n"
@ -22,7 +22,7 @@ msgid "Acls"
msgstr "访问控制" msgstr "访问控制"
#: acls/models/base.py:25 acls/serializers/login_asset_acl.py:47 #: acls/models/base.py:25 acls/serializers/login_asset_acl.py:47
#: applications/models/application.py:209 assets/models/asset.py:138 #: applications/models/application.py:212 assets/models/asset.py:138
#: assets/models/base.py:175 assets/models/cluster.py:18 #: assets/models/base.py:175 assets/models/cluster.py:18
#: assets/models/cmd_filter.py:27 assets/models/domain.py:23 #: assets/models/cmd_filter.py:27 assets/models/domain.py:23
#: assets/models/group.py:20 assets/models/label.py:18 ops/mixin.py:24 #: assets/models/group.py:20 assets/models/label.py:18 ops/mixin.py:24
@ -56,7 +56,7 @@ msgstr "优先级可选范围为 1-100 (数值越小越优先)"
msgid "Active" msgid "Active"
msgstr "激活中" msgstr "激活中"
#: acls/models/base.py:32 applications/models/application.py:222 #: acls/models/base.py:32 applications/models/application.py:225
#: assets/models/asset.py:143 assets/models/asset.py:231 #: assets/models/asset.py:143 assets/models/asset.py:231
#: assets/models/backup.py:54 assets/models/base.py:180 #: assets/models/backup.py:54 assets/models/base.py:180
#: assets/models/cluster.py:29 assets/models/cmd_filter.py:48 #: assets/models/cluster.py:29 assets/models/cmd_filter.py:48
@ -274,7 +274,7 @@ msgstr "远程应用"
msgid "Custom" msgid "Custom"
msgstr "自定义" msgstr "自定义"
#: applications/models/account.py:12 applications/models/application.py:226 #: applications/models/account.py:12 applications/models/application.py:229
#: assets/models/backup.py:32 assets/models/cmd_filter.py:45 #: assets/models/backup.py:32 assets/models/cmd_filter.py:45
#: perms/models/application_permission.py:28 #: perms/models/application_permission.py:28
msgid "Application" msgid "Application"
@ -314,7 +314,7 @@ msgstr "可以查看应用账号密码"
msgid "Can change application account secret" msgid "Can change application account secret"
msgstr "可以查看应用账号密码" msgstr "可以查看应用账号密码"
#: applications/models/application.py:211 #: applications/models/application.py:214
#: applications/serializers/application.py:99 assets/models/label.py:21 #: applications/serializers/application.py:99 assets/models/label.py:21
#: perms/models/application_permission.py:21 #: perms/models/application_permission.py:21
#: perms/serializers/application/user_permission.py:33 #: perms/serializers/application/user_permission.py:33
@ -323,7 +323,7 @@ msgstr "可以查看应用账号密码"
msgid "Category" msgid "Category"
msgstr "类别" msgstr "类别"
#: applications/models/application.py:214 #: applications/models/application.py:217
#: applications/serializers/application.py:101 assets/models/backup.py:49 #: applications/serializers/application.py:101 assets/models/backup.py:49
#: assets/models/cmd_filter.py:82 assets/models/user.py:233 #: assets/models/cmd_filter.py:82 assets/models/user.py:233
#: perms/models/application_permission.py:24 #: perms/models/application_permission.py:24
@ -336,21 +336,21 @@ msgstr "类别"
msgid "Type" msgid "Type"
msgstr "类型" msgstr "类型"
#: applications/models/application.py:218 assets/models/asset.py:217 #: applications/models/application.py:221 assets/models/asset.py:217
#: assets/models/domain.py:29 assets/models/domain.py:63 #: assets/models/domain.py:29 assets/models/domain.py:63
msgid "Domain" msgid "Domain"
msgstr "网域" msgstr "网域"
#: applications/models/application.py:220 xpack/plugins/cloud/models.py:33 #: applications/models/application.py:223 xpack/plugins/cloud/models.py:33
#: xpack/plugins/cloud/serializers/account.py:57 #: xpack/plugins/cloud/serializers/account.py:58
msgid "Attrs" msgid "Attrs"
msgstr "属性" msgstr "属性"
#: applications/models/application.py:230 #: applications/models/application.py:233
msgid "Can match application" msgid "Can match application"
msgstr "匹配应用" msgstr "匹配应用"
#: applications/models/application.py:278 #: applications/models/application.py:281
msgid "Application user" msgid "Application user"
msgstr "应用用户" msgstr "应用用户"
@ -766,7 +766,7 @@ msgstr "成功"
#: assets/models/base.py:32 audits/models.py:116 #: assets/models/base.py:32 audits/models.py:116
#: xpack/plugins/change_auth_plan/serializers/app.py:88 #: xpack/plugins/change_auth_plan/serializers/app.py:88
#: xpack/plugins/change_auth_plan/serializers/asset.py:198 #: xpack/plugins/change_auth_plan/serializers/asset.py:198
#: xpack/plugins/cloud/const.py:29 #: xpack/plugins/cloud/const.py:30
msgid "Failed" msgid "Failed"
msgstr "失败" msgstr "失败"
@ -1380,7 +1380,7 @@ msgstr "日志审计"
#: audits/models.py:27 audits/models.py:57 #: audits/models.py:27 audits/models.py:57
#: authentication/templates/authentication/_access_key_modal.html:65 #: authentication/templates/authentication/_access_key_modal.html:65
#: rbac/tree.py:167 users/templates/users/user_asset_permission.html:128 #: rbac/tree.py:166 users/templates/users/user_asset_permission.html:128
#: users/templates/users/user_database_app_permission.html:111 #: users/templates/users/user_database_app_permission.html:111
msgid "Delete" msgid "Delete"
msgstr "删除" msgstr "删除"
@ -1434,11 +1434,11 @@ msgstr "文件管理"
#: audits/models.py:55 #: audits/models.py:55
#: authentication/templates/authentication/_access_key_modal.html:22 #: authentication/templates/authentication/_access_key_modal.html:22
#: rbac/tree.py:164 #: rbac/tree.py:163
msgid "Create" msgid "Create"
msgstr "创建" msgstr "创建"
#: audits/models.py:56 rbac/tree.py:166 templates/_csv_import_export.html:18 #: audits/models.py:56 rbac/tree.py:165 templates/_csv_import_export.html:18
#: templates/_csv_update_modal.html:6 #: templates/_csv_update_modal.html:6
#: users/templates/users/user_asset_permission.html:127 #: users/templates/users/user_asset_permission.html:127
#: users/templates/users/user_database_app_permission.html:110 #: users/templates/users/user_database_app_permission.html:110
@ -2875,7 +2875,7 @@ msgstr "当前组织 ({}) 不能被删除"
msgid "The organization have resource ({}) cannot be deleted" msgid "The organization have resource ({}) cannot be deleted"
msgstr "组织存在资源 ({}) 不能被删除" msgstr "组织存在资源 ({}) 不能被删除"
#: orgs/apps.py:7 rbac/tree.py:113 #: orgs/apps.py:7 rbac/tree.py:112
msgid "App organizations" msgid "App organizations"
msgstr "组织管理" msgstr "组织管理"
@ -3288,27 +3288,27 @@ msgstr "我的资产"
msgid "My apps" msgid "My apps"
msgstr "我的应用" msgstr "我的应用"
#: rbac/tree.py:114 #: rbac/tree.py:113
msgid "Ticket comment" msgid "Ticket comment"
msgstr "工单评论" msgstr "工单评论"
#: rbac/tree.py:115 tickets/models/ticket.py:163 #: rbac/tree.py:114 tickets/models/ticket.py:163
msgid "Ticket" msgid "Ticket"
msgstr "工单管理" msgstr "工单管理"
#: rbac/tree.py:116 #: rbac/tree.py:115
msgid "Common setting" msgid "Common setting"
msgstr "一般设置" msgstr "一般设置"
#: rbac/tree.py:117 #: rbac/tree.py:116
msgid "View permission tree" msgid "View permission tree"
msgstr "查看授权树" msgstr "查看授权树"
#: rbac/tree.py:118 #: rbac/tree.py:117
msgid "Execute batch command" msgid "Execute batch command"
msgstr "执行批量命令" msgstr "执行批量命令"
#: rbac/tree.py:165 #: rbac/tree.py:164
msgid "View" msgid "View"
msgstr "查看" msgstr "查看"
@ -6378,58 +6378,62 @@ msgid "Huawei Cloud"
msgstr "华为云" msgstr "华为云"
#: xpack/plugins/cloud/const.py:14 #: xpack/plugins/cloud/const.py:14
msgid "Baidu Cloud"
msgstr "百度云"
#: xpack/plugins/cloud/const.py:15
msgid "Tencent Cloud" msgid "Tencent Cloud"
msgstr "腾讯云" msgstr "腾讯云"
#: xpack/plugins/cloud/const.py:15 #: xpack/plugins/cloud/const.py:16
msgid "VMware" msgid "VMware"
msgstr "" msgstr ""
#: xpack/plugins/cloud/const.py:16 xpack/plugins/cloud/providers/nutanix.py:13 #: xpack/plugins/cloud/const.py:17 xpack/plugins/cloud/providers/nutanix.py:13
msgid "Nutanix" msgid "Nutanix"
msgstr "" msgstr ""
#: xpack/plugins/cloud/const.py:17 #: xpack/plugins/cloud/const.py:18
msgid "Huawei Private Cloud" msgid "Huawei Private Cloud"
msgstr "华为私有云" msgstr "华为私有云"
#: xpack/plugins/cloud/const.py:18 #: xpack/plugins/cloud/const.py:19
msgid "Qingyun Private Cloud" msgid "Qingyun Private Cloud"
msgstr "青云私有云" msgstr "青云私有云"
#: xpack/plugins/cloud/const.py:19 #: xpack/plugins/cloud/const.py:20
msgid "OpenStack" msgid "OpenStack"
msgstr "OpenStack" msgstr "OpenStack"
#: xpack/plugins/cloud/const.py:20 #: xpack/plugins/cloud/const.py:21
msgid "Google Cloud Platform" msgid "Google Cloud Platform"
msgstr "谷歌云" msgstr "谷歌云"
#: xpack/plugins/cloud/const.py:24 #: xpack/plugins/cloud/const.py:25
msgid "Instance name" msgid "Instance name"
msgstr "实例名称" msgstr "实例名称"
#: xpack/plugins/cloud/const.py:25 #: xpack/plugins/cloud/const.py:26
msgid "Instance name and Partial IP" msgid "Instance name and Partial IP"
msgstr "实例名称和部分IP" msgstr "实例名称和部分IP"
#: xpack/plugins/cloud/const.py:30 #: xpack/plugins/cloud/const.py:31
msgid "Succeed" msgid "Succeed"
msgstr "成功" msgstr "成功"
#: xpack/plugins/cloud/const.py:34 #: xpack/plugins/cloud/const.py:35
msgid "Unsync" msgid "Unsync"
msgstr "未同步" msgstr "未同步"
#: xpack/plugins/cloud/const.py:35 #: xpack/plugins/cloud/const.py:36
msgid "New Sync" msgid "New Sync"
msgstr "新同步" msgstr "新同步"
#: xpack/plugins/cloud/const.py:36 #: xpack/plugins/cloud/const.py:37
msgid "Synced" msgid "Synced"
msgstr "已同步" msgstr "已同步"
#: xpack/plugins/cloud/const.py:37 #: xpack/plugins/cloud/const.py:38
msgid "Released" msgid "Released"
msgstr "已释放" msgstr "已释放"
@ -6601,6 +6605,41 @@ msgstr "中东（巴林）"
msgid "South America (São Paulo)" msgid "South America (São Paulo)"
msgstr "南美洲（圣保罗）" msgstr "南美洲（圣保罗）"
#: xpack/plugins/cloud/providers/baiducloud.py:54
msgid "CN North-Beijing"
msgstr "华北-北京"
#: xpack/plugins/cloud/providers/baiducloud.py:55
#: xpack/plugins/cloud/providers/huaweicloud.py:40
msgid "CN South-Guangzhou"
msgstr "华南-广州"
#: xpack/plugins/cloud/providers/baiducloud.py:56
msgid "CN East-Suzhou"
msgstr "华东-苏州"
#: xpack/plugins/cloud/providers/baiducloud.py:57
#: xpack/plugins/cloud/providers/huaweicloud.py:48
msgid "CN-Hong Kong"
msgstr "中国-香港"
#: xpack/plugins/cloud/providers/baiducloud.py:58
msgid "CN Center-Wuhan"
msgstr "华中-武汉"
#: xpack/plugins/cloud/providers/baiducloud.py:59
msgid "CN North-Baoding"
msgstr "华北-保定"
#: xpack/plugins/cloud/providers/baiducloud.py:60
msgid "CN East-Shanghai"
msgstr "华东-上海"
#: xpack/plugins/cloud/providers/baiducloud.py:61
#: xpack/plugins/cloud/providers/huaweicloud.py:47
msgid "AP-Singapore"
msgstr "亚太-新加坡"
#: xpack/plugins/cloud/providers/huaweicloud.py:35 #: xpack/plugins/cloud/providers/huaweicloud.py:35
msgid "AF-Johannesburg" msgid "AF-Johannesburg"
msgstr "非洲-约翰内斯堡" msgstr "非洲-约翰内斯堡"
@ -6621,10 +6660,6 @@ msgstr "华东-上海2"
msgid "CN East-Shanghai1" msgid "CN East-Shanghai1"
msgstr "华东-上海1" msgstr "华东-上海1"
#: xpack/plugins/cloud/providers/huaweicloud.py:40
msgid "CN South-Guangzhou"
msgstr "华南-广州"
#: xpack/plugins/cloud/providers/huaweicloud.py:41 #: xpack/plugins/cloud/providers/huaweicloud.py:41
msgid "LA-Mexico City1" msgid "LA-Mexico City1"
msgstr "拉美-墨西哥城一" msgstr "拉美-墨西哥城一"
@ -6649,14 +6684,6 @@ msgstr "西南-贵阳1"
msgid "AP-Bangkok" msgid "AP-Bangkok"
msgstr "亚太-曼谷" msgstr "亚太-曼谷"
#: xpack/plugins/cloud/providers/huaweicloud.py:47
msgid "AP-Singapore"
msgstr "亚太-新加坡"
#: xpack/plugins/cloud/providers/huaweicloud.py:48
msgid "CN-Hong Kong"
msgstr "中国-香港"
#: xpack/plugins/cloud/providers/huaweicloud.py:50 #: xpack/plugins/cloud/providers/huaweicloud.py:50
msgid "CN Northeast-Dalian" msgid "CN Northeast-Dalian"
msgstr "华北-大连" msgstr "华北-大连"
@ -6669,11 +6696,11 @@ msgstr "华北-乌兰察布一"
msgid "CN South-Guangzhou-InvitationOnly" msgid "CN South-Guangzhou-InvitationOnly"
msgstr "华南-广州-友好用户环境" msgstr "华南-广州-友好用户环境"
#: xpack/plugins/cloud/serializers/account.py:58 #: xpack/plugins/cloud/serializers/account.py:59
msgid "Validity display" msgid "Validity display"
msgstr "有效性显示" msgstr "有效性显示"
#: xpack/plugins/cloud/serializers/account.py:59 #: xpack/plugins/cloud/serializers/account.py:60
msgid "Provider display" msgid "Provider display"
msgstr "服务商显示" msgstr "服务商显示"

1
requirements/requirements.txt
View File

@ -130,3 +130,4 @@ numpy==1.22.0
pandas==1.3.5 pandas==1.3.5
pyjwkest==1.4.2 pyjwkest==1.4.2
jsonfield2==4.0.0.post0 jsonfield2==4.0.0.post0
bce-python-sdk==0.8.64