Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
b3716768
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b3716768
编写于
5月 20, 2020
作者:
baltery
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
上级
0cac8d66
3e0f5af8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
123 addition
and
112 deletion
+123
-112
apps/assets/serializers/gathered_user.py
apps/assets/serializers/gathered_user.py
+3
-3
apps/locale/zh/LC_MESSAGES/django.mo
apps/locale/zh/LC_MESSAGES/django.mo
+0
-0
apps/locale/zh/LC_MESSAGES/django.po
apps/locale/zh/LC_MESSAGES/django.po
+118
-107
apps/perms/serializers/asset_permission.py
apps/perms/serializers/asset_permission.py
+2
-2
未找到文件。
apps/assets/serializers/gathered_user.py
浏览文件 @
b3716768
...
...
@@ -16,7 +16,7 @@ class GatheredUserSerializer(OrgResourceModelSerializerMixin):
'present'
,
'date_created'
,
'date_updated'
]
read_only_fields
=
fields
label
s
=
{
'hostname'
:
_
(
"Hostname"
)
,
'ip'
:
"IP"
extra_kwarg
s
=
{
'hostname'
:
{
'label'
:
_
(
"Hostname"
)}
,
'ip'
:
{
'label'
:
'IP'
},
}
apps/locale/zh/LC_MESSAGES/django.mo
浏览文件 @
b3716768
无法预览此类型文件
apps/locale/zh/LC_MESSAGES/django.po
浏览文件 @
b3716768
...
...
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-
11 16:5
3+0800\n"
"POT-Creation-Date: 2020-05-
20 17:4
3+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n"
...
...
@@ -26,7 +26,7 @@ msgstr "自定义"
#: applications/templates/applications/remote_app_list.html:27
#: applications/templates/applications/user_remote_app_list.html:18
#: assets/forms/domain.py:15 assets/forms/label.py:13
#: assets/models/asset.py:35
3
assets/models/authbook.py:27
#: assets/models/asset.py:35
2
assets/models/authbook.py:27
#: assets/models/gathered_user.py:14 assets/serializers/admin_user.py:32
#: assets/serializers/asset_user.py:47 assets/serializers/asset_user.py:84
#: assets/serializers/system_user.py:44 assets/serializers/system_user.py:176
...
...
@@ -112,7 +112,7 @@ msgstr "运行参数"
#: applications/templates/applications/user_database_app_list.html:16
#: applications/templates/applications/user_remote_app_list.html:16
#: assets/forms/asset.py:21 assets/forms/domain.py:77 assets/forms/user.py:74
#: assets/forms/user.py:96 assets/models/asset.py:14
6
assets/models/base.py:232
#: assets/forms/user.py:96 assets/models/asset.py:14
5
assets/models/base.py:232
#: assets/models/cluster.py:18 assets/models/cmd_filter.py:21
#: assets/models/domain.py:20 assets/models/group.py:20
#: assets/models/label.py:18 assets/templates/assets/_node_detail_modal.html:27
...
...
@@ -147,7 +147,7 @@ msgstr "运行参数"
#: terminal/models.py:411 terminal/templates/terminal/base_storage_list.html:31
#: terminal/templates/terminal/terminal_detail.html:43
#: terminal/templates/terminal/terminal_list.html:30 users/forms/profile.py:20
#: users/models/group.py:15 users/models/user.py:4
4
0
#: users/models/group.py:15 users/models/user.py:4
5
0
#: users/templates/users/_select_user_modal.html:13
#: users/templates/users/user_asset_permission.html:37
#: users/templates/users/user_asset_permission.html:154
...
...
@@ -204,7 +204,7 @@ msgstr "主机"
#: applications/models/database_app.py:27
#: applications/templates/applications/database_app_detail.html:60
#: applications/templates/applications/database_app_list.html:26
#: assets/forms/asset.py:25 assets/models/asset.py:19
2
#: assets/forms/asset.py:25 assets/models/asset.py:19
1
#: assets/models/domain.py:50
#: assets/templates/assets/domain_gateway_list.html:64
msgid "Port"
...
...
@@ -227,7 +227,7 @@ msgstr "数据库"
#: applications/templates/applications/remote_app_list.html:28
#: applications/templates/applications/user_database_app_list.html:20
#: applications/templates/applications/user_remote_app_list.html:19
#: assets/models/asset.py:15
1 assets/models/asset.py:227
#: assets/models/asset.py:15
0 assets/models/asset.py:226
#: assets/models/base.py:237 assets/models/cluster.py:29
#: assets/models/cmd_filter.py:23 assets/models/cmd_filter.py:56
#: assets/models/domain.py:21 assets/models/domain.py:53
...
...
@@ -253,7 +253,7 @@ msgstr "数据库"
#: terminal/models.py:418 terminal/templates/terminal/base_storage_list.html:33
#: terminal/templates/terminal/terminal_detail.html:63
#: tickets/templates/tickets/ticket_detail.html:104 users/models/group.py:16
#: users/models/user.py:4
7
3 users/templates/users/user_detail.html:115
#: users/models/user.py:4
8
3 users/templates/users/user_detail.html:115
#: users/templates/users/user_granted_database_app.html:38
#: users/templates/users/user_granted_remote_app.html:37
#: users/templates/users/user_group_detail.html:62
...
...
@@ -309,7 +309,7 @@ msgstr "参数"
#: applications/models/remote_app.py:39
#: applications/templates/applications/database_app_detail.html:72
#: applications/templates/applications/remote_app_detail.html:68
#: assets/models/asset.py:22
5
assets/models/base.py:240
#: assets/models/asset.py:22
4
assets/models/base.py:240
#: assets/models/cluster.py:28 assets/models/cmd_filter.py:26
#: assets/models/cmd_filter.py:59 assets/models/group.py:21
#: assets/templates/assets/admin_user_detail.html:63
...
...
@@ -321,7 +321,7 @@ msgstr "参数"
#: perms/templates/perms/asset_permission_detail.html:93
#: perms/templates/perms/database_app_permission_detail.html:89
#: perms/templates/perms/remote_app_permission_detail.html:85
#: users/models/user.py:4
8
1 users/serializers/group.py:35
#: users/models/user.py:4
9
1 users/serializers/group.py:35
#: users/templates/users/user_detail.html:97
#: xpack/plugins/change_auth_plan/models.py:79
#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:111
...
...
@@ -335,7 +335,7 @@ msgstr "创建者"
#: applications/models/remote_app.py:42
#: applications/templates/applications/database_app_detail.html:68
#: applications/templates/applications/remote_app_detail.html:64
#: assets/models/asset.py:22
6
assets/models/base.py:238
#: assets/models/asset.py:22
5
assets/models/base.py:238
#: assets/models/cluster.py:26 assets/models/domain.py:23
#: assets/models/gathered_user.py:19 assets/models/group.py:22
#: assets/models/label.py:25 assets/templates/assets/admin_user_detail.html:59
...
...
@@ -737,7 +737,7 @@ msgstr "不能移除资产的管理用户账号"
msgid "Latest version could not be delete"
msgstr "最新版本的不能被删除"
#: assets/forms/asset.py:83 assets/models/asset.py:19
6
#: assets/forms/asset.py:83 assets/models/asset.py:19
5
#: assets/models/user.py:109 assets/templates/assets/asset_detail.html:186
#: assets/templates/assets/asset_detail.html:194
#: assets/templates/assets/system_user_assets.html:118
...
...
@@ -748,7 +748,7 @@ msgstr "最新版本的不能被删除"
msgid "Nodes"
msgstr "节点"
#: assets/forms/asset.py:86 assets/models/asset.py:
200
#: assets/forms/asset.py:86 assets/models/asset.py:
199
#: assets/models/cluster.py:19 assets/models/user.py:65
#: assets/templates/assets/admin_user_list.html:62
#: assets/templates/assets/asset_detail.html:72 templates/_nav.html:44
...
...
@@ -766,7 +766,7 @@ msgstr "管理用户"
msgid "Label"
msgstr "标签"
#: assets/forms/asset.py:92 assets/models/asset.py:19
5
#: assets/forms/asset.py:92 assets/models/asset.py:19
4
#: assets/models/domain.py:26 assets/models/domain.py:52
#: assets/templates/assets/asset_detail.html:76
#: assets/templates/assets/user_asset_list.html:80
...
...
@@ -774,8 +774,8 @@ msgstr "标签"
msgid "Domain"
msgstr "网域"
#: assets/forms/asset.py:95 assets/models/asset.py:1
70
#: assets/models/asset.py:19
4
assets/serializers/asset.py:67
#: assets/forms/asset.py:95 assets/models/asset.py:1
69
#: assets/models/asset.py:19
3
assets/serializers/asset.py:67
#: assets/templates/assets/asset_detail.html:100
#: assets/templates/assets/user_asset_list.html:78
msgid "Platform"
...
...
@@ -854,7 +854,7 @@ msgstr "SSH网关,支持代理SSH,RDP和VNC"
#: perms/templates/perms/remote_app_permission_user.html:50
#: settings/templates/settings/_ldap_list_users_modal.html:31
#: settings/templates/settings/_ldap_test_user_login_modal.html:10
#: users/forms/profile.py:19 users/models/user.py:4
3
8
#: users/forms/profile.py:19 users/models/user.py:4
4
8
#: users/templates/users/_select_user_modal.html:14
#: users/templates/users/user_detail.html:53
#: users/templates/users/user_list.html:15
...
...
@@ -927,7 +927,7 @@ msgstr "密码"
#: assets/forms/user.py:29 assets/serializers/asset_user.py:79
#: assets/templates/assets/_asset_user_auth_update_modal.html:27
#: users/models/user.py:4
6
7
#: users/models/user.py:4
7
7
msgid "Private key"
msgstr "ssh私钥"
...
...
@@ -980,24 +980,24 @@ msgstr "SFTP的起始路径,tmp目录, 用户home目录或者自定义"
msgid "Username is dynamic, When connect asset, using current user's username"
msgstr "用户名是动态的,登录资产时使用当前用户的用户名登录"
#: assets/models/asset.py:14
7
xpack/plugins/cloud/providers/base.py:16
#: assets/models/asset.py:14
6
xpack/plugins/cloud/providers/base.py:16
msgid "Base"
msgstr "基础"
#: assets/models/asset.py:14
8
assets/templates/assets/platform_detail.html:56
#: assets/models/asset.py:14
7
assets/templates/assets/platform_detail.html:56
msgid "Charset"
msgstr "编码"
#: assets/models/asset.py:14
9
assets/templates/assets/platform_detail.html:60
#: assets/models/asset.py:14
8
assets/templates/assets/platform_detail.html:60
#: tickets/models/ticket.py:38
msgid "Meta"
msgstr "元数据"
#: assets/models/asset.py:1
50
#: assets/models/asset.py:1
49
msgid "Internal"
msgstr "内部的"
#: assets/models/asset.py:18
7
assets/models/domain.py:49
#: assets/models/asset.py:18
6
assets/models/domain.py:49
#: assets/serializers/asset_user.py:46
#: assets/templates/assets/_asset_list_modal.html:47
#: assets/templates/assets/_asset_user_list.html:20
...
...
@@ -1015,7 +1015,7 @@ msgstr "内部的"
msgid "IP"
msgstr "IP"
#: assets/models/asset.py:18
8
assets/serializers/asset_user.py:45
#: assets/models/asset.py:18
7
assets/serializers/asset_user.py:45
#: assets/serializers/gathered_user.py:20
#: assets/templates/assets/_asset_list_modal.html:46
#: assets/templates/assets/_asset_user_auth_update_modal.html:9
...
...
@@ -1033,7 +1033,7 @@ msgstr "IP"
msgid "Hostname"
msgstr "主机名"
#: assets/models/asset.py:19
1
assets/models/domain.py:51
#: assets/models/asset.py:19
0
assets/models/domain.py:51
#: assets/models/user.py:114 assets/templates/assets/asset_detail.html:68
#: assets/templates/assets/domain_gateway_list.html:65
#: assets/templates/assets/system_user_detail.html:78
...
...
@@ -1045,84 +1045,84 @@ msgstr "主机名"
msgid "Protocol"
msgstr "协议"
#: assets/models/asset.py:19
3
assets/serializers/asset.py:69
#: assets/models/asset.py:19
2
assets/serializers/asset.py:69
#: assets/templates/assets/asset_create.html:24
#: assets/templates/assets/user_asset_list.html:77
#: perms/serializers/user_permission.py:60
msgid "Protocols"
msgstr "协议组"
#: assets/models/asset.py:19
7
assets/models/cmd_filter.py:22
#: assets/models/asset.py:19
6
assets/models/cmd_filter.py:22
#: assets/models/domain.py:54 assets/models/label.py:22
#: assets/templates/assets/asset_detail.html:108 authentication/models.py:45
msgid "Is active"
msgstr "激活"
#: assets/models/asset.py:20
3
assets/templates/assets/asset_detail.html:64
#: assets/models/asset.py:20
2
assets/templates/assets/asset_detail.html:64
msgid "Public IP"
msgstr "公网IP"
#: assets/models/asset.py:20
4
assets/templates/assets/asset_detail.html:116
#: assets/models/asset.py:20
3
assets/templates/assets/asset_detail.html:116
msgid "Asset number"
msgstr "资产编号"
#: assets/models/asset.py:20
7
assets/templates/assets/asset_detail.html:80
#: assets/models/asset.py:20
6
assets/templates/assets/asset_detail.html:80
msgid "Vendor"
msgstr "制造商"
#: assets/models/asset.py:20
8
assets/templates/assets/asset_detail.html:84
#: assets/models/asset.py:20
7
assets/templates/assets/asset_detail.html:84
msgid "Model"
msgstr "型号"
#: assets/models/asset.py:20
9
assets/templates/assets/asset_detail.html:112
#: assets/models/asset.py:20
8
assets/templates/assets/asset_detail.html:112
msgid "Serial number"
msgstr "序列号"
#: assets/models/asset.py:21
1
#: assets/models/asset.py:21
0
msgid "CPU model"
msgstr "CPU型号"
#: assets/models/asset.py:21
2
#: assets/models/asset.py:21
1
msgid "CPU count"
msgstr "CPU数量"
#: assets/models/asset.py:21
3
#: assets/models/asset.py:21
2
msgid "CPU cores"
msgstr "CPU核数"
#: assets/models/asset.py:21
4
#: assets/models/asset.py:21
3
msgid "CPU vcpus"
msgstr "CPU总数"
#: assets/models/asset.py:21
5
assets/templates/assets/asset_detail.html:92
#: assets/models/asset.py:21
4
assets/templates/assets/asset_detail.html:92
msgid "Memory"
msgstr "内存"
#: assets/models/asset.py:21
6
#: assets/models/asset.py:21
5
msgid "Disk total"
msgstr "硬盘大小"
#: assets/models/asset.py:21
7
#: assets/models/asset.py:21
6
msgid "Disk info"
msgstr "硬盘信息"
#: assets/models/asset.py:21
9
assets/templates/assets/asset_detail.html:104
#: assets/models/asset.py:21
8
assets/templates/assets/asset_detail.html:104
msgid "OS"
msgstr "操作系统"
#: assets/models/asset.py:2
20
#: assets/models/asset.py:2
19
msgid "OS version"
msgstr "系统版本"
#: assets/models/asset.py:22
1
#: assets/models/asset.py:22
0
msgid "OS arch"
msgstr "系统架构"
#: assets/models/asset.py:22
2
#: assets/models/asset.py:22
1
msgid "Hostname raw"
msgstr "主机名原始"
#: assets/models/asset.py:22
4
assets/templates/assets/asset_create.html:46
#: assets/models/asset.py:22
3
assets/templates/assets/asset_create.html:46
#: assets/templates/assets/asset_detail.html:220 templates/_nav.html:46
msgid "Labels"
msgstr "标签管理"
...
...
@@ -1175,7 +1175,7 @@ msgstr "带宽"
msgid "Contact"
msgstr "联系人"
#: assets/models/cluster.py:22 users/models/user.py:4
5
9
#: assets/models/cluster.py:22 users/models/user.py:4
6
9
#: users/templates/users/user_detail.html:62
msgid "Phone"
msgstr "手机"
...
...
@@ -1201,7 +1201,7 @@ msgid "Default"
msgstr "默认"
#: assets/models/cluster.py:36 assets/models/label.py:14
#: users/models/user.py:6
0
0
#: users/models/user.py:6
1
0
msgid "System"
msgstr "系统"
...
...
@@ -1334,7 +1334,7 @@ msgstr "默认资产组"
#: tickets/models/ticket.py:128 tickets/templates/tickets/ticket_detail.html:32
#: tickets/templates/tickets/ticket_list.html:34
#: tickets/templates/tickets/ticket_list.html:103 users/forms/group.py:15
#: users/models/user.py:143 users/models/user.py:159 users/models/user.py:5
8
8
#: users/models/user.py:143 users/models/user.py:159 users/models/user.py:5
9
8
#: users/serializers/group.py:20
#: users/templates/users/user_asset_permission.html:38
#: users/templates/users/user_asset_permission.html:64
...
...
@@ -1342,6 +1342,7 @@ msgstr "默认资产组"
#: users/templates/users/user_database_app_permission.html:58
#: users/templates/users/user_group_detail.html:73
#: users/templates/users/user_group_list.html:15
#: users/templates/users/user_list.html:135
#: users/templates/users/user_remote_app_permission.html:37
#: users/templates/users/user_remote_app_permission.html:58
#: users/views/profile/base.py:46 xpack/plugins/orgs/forms.py:27
...
...
@@ -1422,7 +1423,6 @@ msgid "Users"
msgstr "用户管理"
#: assets/models/user.py:112 users/templates/users/user_group_list.html:90
#: users/templates/users/user_list.html:135
#: users/templates/users/user_profile.html:124
msgid "User groups"
msgstr "用户组"
...
...
@@ -1540,7 +1540,7 @@ msgid "Backend"
msgstr "后端"
#: assets/serializers/asset_user.py:75 users/forms/profile.py:148
#: users/models/user.py:4
7
0 users/templates/users/first_login.html:42
#: users/models/user.py:4
8
0 users/templates/users/first_login.html:42
#: users/templates/users/user_password_update.html:49
#: users/templates/users/user_profile.html:69
#: users/templates/users/user_profile_update.html:46
...
...
@@ -2578,7 +2578,7 @@ msgstr "Agent"
#: authentication/templates/authentication/_mfa_confirm_modal.html:14
#: authentication/templates/authentication/login_otp.html:6
#: settings/forms/security.py:16 users/forms/profile.py:52
#: users/models/user.py:4
6
2 users/templates/users/first_login.html:45
#: users/models/user.py:4
7
2 users/templates/users/first_login.html:45
#: users/templates/users/user_detail.html:77
#: users/templates/users/user_profile.html:87
msgid "MFA"
...
...
@@ -2860,7 +2860,7 @@ msgid "Show"
msgstr "显示"
#: authentication/templates/authentication/_access_key_modal.html:66
#: users/models/user.py:3
6
0 users/templates/users/user_profile.html:94
#: users/models/user.py:3
7
0 users/templates/users/user_profile.html:94
#: users/templates/users/user_profile.html:163
#: users/templates/users/user_profile.html:166
#: users/templates/users/user_verify_mfa.html:32
...
...
@@ -2868,7 +2868,7 @@ msgid "Disable"
msgstr "禁用"
#: authentication/templates/authentication/_access_key_modal.html:67
#: users/models/user.py:3
6
1 users/templates/users/user_profile.html:92
#: users/models/user.py:3
7
1 users/templates/users/user_profile.html:92
#: users/templates/users/user_profile.html:170
msgid "Enable"
msgstr "启用"
...
...
@@ -2909,8 +2909,10 @@ msgid "More login options"
msgstr "更多登录方式"
#: authentication/templates/authentication/login.html:61
msgid "Keycloak"
msgstr ""
#, fuzzy
#| msgid "Open"
msgid "OpenID"
msgstr "开启"
#: authentication/templates/authentication/login_otp.html:17
msgid "One-time password"
...
...
@@ -3478,7 +3480,7 @@ msgstr "提示:RDP 协议不支持单独控制上传或下载文件"
#: perms/templates/perms/database_app_permission_list.html:16
#: perms/templates/perms/remote_app_permission_list.html:16
#: templates/_nav.html:21 users/forms/user.py:168 users/models/group.py:31
#: users/models/user.py:4
4
6 users/templates/users/_select_user_modal.html:16
#: users/models/user.py:4
5
6 users/templates/users/_select_user_modal.html:16
#: users/templates/users/user_asset_permission.html:39
#: users/templates/users/user_asset_permission.html:67
#: users/templates/users/user_database_app_permission.html:38
...
...
@@ -3531,7 +3533,7 @@ msgstr "资产授权"
#: perms/templates/perms/asset_permission_detail.html:85
#: perms/templates/perms/database_app_permission_detail.html:81
#: perms/templates/perms/remote_app_permission_detail.html:77
#: users/models/user.py:4
7
8 users/templates/users/user_detail.html:93
#: users/models/user.py:4
8
8 users/templates/users/user_detail.html:93
#: users/templates/users/user_profile.html:120
msgid "Date expired"
msgstr "失效日期"
...
...
@@ -4176,7 +4178,7 @@ msgid "Refresh cache"
msgstr "刷新缓存"
#: settings/templates/settings/_ldap_list_users_modal.html:33
#: users/forms/profile.py:89 users/models/user.py:4
4
2
#: users/forms/profile.py:89 users/models/user.py:4
5
2
#: users/templates/users/user_detail.html:57
#: users/templates/users/user_profile.html:59
msgid "Email"
...
...
@@ -5320,7 +5322,7 @@ msgstr "工单列表"
msgid "Ticket detail"
msgstr "工单详情"
#: users/api/user.py:11
5
#: users/api/user.py:11
3
msgid "Could not reset self otp, use profile reset instead"
msgstr "不能在该页面重置多因子认证, 请去个人信息页面重置"
...
...
@@ -5394,11 +5396,11 @@ msgid "Public key should not be the same as your old one."
msgstr "不能和原来的密钥相同"
#: users/forms/profile.py:137 users/forms/user.py:90
#: users/serializers/user.py:16
3
#: users/serializers/user.py:16
6
msgid "Not a valid ssh public key"
msgstr "ssh密钥不合法"
#: users/forms/user.py:27 users/models/user.py:4
5
0
#: users/forms/user.py:27 users/models/user.py:4
6
0
#: users/templates/users/_select_user_modal.html:15
#: users/templates/users/user_detail.html:73
#: users/templates/users/user_list.html:16
...
...
@@ -5406,7 +5408,7 @@ msgstr "ssh密钥不合法"
msgid "Role"
msgstr "角色"
#: users/forms/user.py:31 users/models/user.py:4
8
5
#: users/forms/user.py:31 users/models/user.py:4
9
5
#: users/templates/users/user_detail.html:89
#: users/templates/users/user_list.html:18
#: users/templates/users/user_profile.html:102
...
...
@@ -5443,7 +5445,7 @@ msgstr "设置密码"
msgid "Password strategy"
msgstr "密码策略"
#: users/models/user.py:142 users/models/user.py:
59
6
#: users/models/user.py:142 users/models/user.py:
60
6
msgid "Administrator"
msgstr "管理员"
...
...
@@ -5461,27 +5463,27 @@ msgstr "组织管理员"
msgid "Org auditor"
msgstr "组织审计员"
#: users/models/user.py:3
6
2 users/templates/users/user_profile.html:90
#: users/models/user.py:3
7
2 users/templates/users/user_profile.html:90
msgid "Force enable"
msgstr "强制启用"
#: users/models/user.py:4
2
9
#: users/models/user.py:4
3
9
msgid "Local"
msgstr "数据库"
#: users/models/user.py:4
5
3
#: users/models/user.py:4
6
3
msgid "Avatar"
msgstr "头像"
#: users/models/user.py:4
5
6 users/templates/users/user_detail.html:68
#: users/models/user.py:4
6
6 users/templates/users/user_detail.html:68
msgid "Wechat"
msgstr "微信"
#: users/models/user.py:4
8
9
#: users/models/user.py:4
9
9
msgid "Date password last updated"
msgstr "最后更新密码日期"
#: users/models/user.py:
59
9
#: users/models/user.py:
60
9
msgid "Administrator is the super user of system"
msgstr "Administrator是初始的超级管理员"
...
...
@@ -6539,11 +6541,11 @@ msgstr "同步实例任务历史"
msgid "Instance"
msgstr "实例"
#: xpack/plugins/cloud/providers/aliyun.py:1
9
#: xpack/plugins/cloud/providers/aliyun.py:1
6
msgid "Alibaba Cloud"
msgstr "阿里云"
#: xpack/plugins/cloud/providers/aws.py:1
5
#: xpack/plugins/cloud/providers/aws.py:1
4
msgid "AWS (International)"
msgstr "AWS (国际)"
...
...
@@ -6551,59 +6553,53 @@ msgstr "AWS (国际)"
msgid "AWS (China)"
msgstr "AWS (中国)"
#: xpack/plugins/cloud/providers/huaweicloud.py:1
7
#: xpack/plugins/cloud/providers/huaweicloud.py:1
3
msgid "Huawei Cloud"
msgstr "华为云"
#: xpack/plugins/cloud/providers/huaweicloud.py:20
msgid "AF-Johannesburg"
msgstr "非洲-约翰内斯堡"
#: xpack/plugins/cloud/providers/huaweicloud.py:21
msgid "AP-Bangkok"
msgstr "亚太-曼谷"
#: xpack/plugins/cloud/providers/huaweicloud.py:22
msgid "AP-Hong Kong"
msgstr "亚太-香港"
#: xpack/plugins/cloud/providers/huaweicloud.py:23
msgid "AP-Singapore"
msgstr "亚太-新加坡"
#: xpack/plugins/cloud/providers/huaweicloud.py:16
msgid "CN North-Beijing4"
msgstr "华北-北京4"
#: xpack/plugins/cloud/providers/huaweicloud.py:
24
#: xpack/plugins/cloud/providers/huaweicloud.py:
17
msgid "CN East-Shanghai1"
msgstr "华东-上海1"
#: xpack/plugins/cloud/providers/huaweicloud.py:
25
#: xpack/plugins/cloud/providers/huaweicloud.py:
18
msgid "CN East-Shanghai2"
msgstr "华东-上海2"
#: xpack/plugins/cloud/providers/huaweicloud.py:26
msgid "CN North-Beijing1"
msgstr "华北-北京1"
#: xpack/plugins/cloud/providers/huaweicloud.py:27
msgid "CN North-Beijing4"
msgstr "华北-北京4"
#: xpack/plugins/cloud/providers/huaweicloud.py:28
msgid "CN Northeast-Dalian"
msgstr "东北-大连"
#: xpack/plugins/cloud/providers/huaweicloud.py:29
#: xpack/plugins/cloud/providers/huaweicloud.py:19
msgid "CN South-Guangzhou"
msgstr "华南-广州"
#: xpack/plugins/cloud/providers/huaweicloud.py:
3
0
#: xpack/plugins/cloud/providers/huaweicloud.py:
2
0
msgid "CN Southwest-Guiyang1"
msgstr "西南-贵阳1"
#: xpack/plugins/cloud/providers/huaweicloud.py:31
msgid "EU-Paris"
msgstr ""
#: xpack/plugins/cloud/providers/huaweicloud.py:21
#, fuzzy
#| msgid "AP-Hong Kong"
msgid "AP-Hong-Kong"
msgstr "亚太-香港"
#: xpack/plugins/cloud/providers/huaweicloud.py:22
msgid "AP-Bangkok"
msgstr "亚太-曼谷"
#: xpack/plugins/cloud/providers/qcloud.py:17
#: xpack/plugins/cloud/providers/huaweicloud.py:23
msgid "AP-Singapore"
msgstr "亚太-新加坡"
#: xpack/plugins/cloud/providers/huaweicloud.py:24
msgid "AF-Johannesburg"
msgstr "非洲-约翰内斯堡"
#: xpack/plugins/cloud/providers/huaweicloud.py:25
msgid "LA-Santiago"
msgstr "拉美-圣地亚哥"
#: xpack/plugins/cloud/providers/qcloud.py:14
msgid "Tencent Cloud"
msgstr "腾讯云"
...
...
@@ -6732,6 +6728,18 @@ msgstr "收集用户执行"
msgid "Assets is empty, please change nodes"
msgstr "资产为空,请更改节点"
#: xpack/plugins/gathered_user/serializers.py:20
#, fuzzy
#| msgid "Periodic"
msgid "Periodic display"
msgstr "定时执行"
#: xpack/plugins/gathered_user/serializers.py:21
#, fuzzy
#| msgid "Execute failed"
msgid "Executed times"
msgstr "执行次数"
#: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:170
msgid "Asset user"
msgstr "资产用户"
...
...
@@ -6999,8 +7007,11 @@ msgstr "密码匣子"
msgid "vault create"
msgstr "创建"
#~ msgid "LA-Santiago"
#~ msgstr "拉美-圣地亚哥"
#~ msgid "CN North-Beijing1"
#~ msgstr "华北-北京1"
#~ msgid "CN Northeast-Dalian"
#~ msgstr "东北-大连"
#~ msgid "Total hosts"
#~ msgstr "主机总数"
...
...
apps/perms/serializers/asset_permission.py
浏览文件 @
b3716768
...
...
@@ -36,8 +36,8 @@ class ActionsDisplayField(ActionsField):
class
AssetPermissionSerializer
(
BulkOrgResourceModelSerializer
):
actions
=
ActionsField
(
required
=
False
,
allow_null
=
True
)
is_valid
=
serializers
.
BooleanField
()
is_expired
=
serializers
.
BooleanField
()
is_valid
=
serializers
.
BooleanField
(
read_only
=
True
)
is_expired
=
serializers
.
BooleanField
(
read_only
=
True
)
class
Meta
:
model
=
AssetPermission
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录