Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
9a5c00e1
Unverified
Commit
9a5c00e1
authored
Jun 20, 2019
by
BaiJiangJie
Committed by
GitHub
Jun 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 修改文案 (#2823)
* [Update] 修改文案 * [Update] 修改文案2
parent
7e16ce41
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
97 additions
and
115 deletions
+97
-115
remote_app.py
apps/applications/views/remote_app.py
+4
-4
views.py
apps/audits/views.py
+1
-1
django.mo
apps/locale/zh/LC_MESSAGES/django.mo
+0
-0
django.po
apps/locale/zh/LC_MESSAGES/django.po
+47
-69
djangojs.mo
apps/locale/zh/LC_MESSAGES/djangojs.mo
+0
-0
djangojs.po
apps/locale/zh/LC_MESSAGES/djangojs.po
+36
-32
jumpserver.js
apps/static/js/jumpserver.js
+1
-1
command.py
apps/terminal/views/command.py
+1
-1
session.py
apps/terminal/views/session.py
+4
-4
terminal.py
apps/terminal/views/terminal.py
+3
-3
No files found.
apps/applications/views/remote_app.py
View file @
9a5c00e1
...
@@ -28,7 +28,7 @@ class RemoteAppListView(PermissionsMixin, TemplateView):
...
@@ -28,7 +28,7 @@ class RemoteAppListView(PermissionsMixin, TemplateView):
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
context
=
{
context
=
{
'app'
:
_
(
'A
sset
s'
),
'app'
:
_
(
'A
pplication
s'
),
'action'
:
_
(
'RemoteApp list'
),
'action'
:
_
(
'RemoteApp list'
),
}
}
kwargs
.
update
(
context
)
kwargs
.
update
(
context
)
...
@@ -44,7 +44,7 @@ class RemoteAppCreateView(PermissionsMixin, SuccessMessageMixin, CreateView):
...
@@ -44,7 +44,7 @@ class RemoteAppCreateView(PermissionsMixin, SuccessMessageMixin, CreateView):
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
context
=
{
context
=
{
'app'
:
_
(
'A
sset
s'
),
'app'
:
_
(
'A
pplication
s'
),
'action'
:
_
(
'Create RemoteApp'
),
'action'
:
_
(
'Create RemoteApp'
),
}
}
kwargs
.
update
(
context
)
kwargs
.
update
(
context
)
...
@@ -66,7 +66,7 @@ class RemoteAppUpdateView(PermissionsMixin, SuccessMessageMixin, UpdateView):
...
@@ -66,7 +66,7 @@ class RemoteAppUpdateView(PermissionsMixin, SuccessMessageMixin, UpdateView):
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
context
=
{
context
=
{
'app'
:
_
(
'A
sset
s'
),
'app'
:
_
(
'A
pplication
s'
),
'action'
:
_
(
'Update RemoteApp'
),
'action'
:
_
(
'Update RemoteApp'
),
}
}
kwargs
.
update
(
context
)
kwargs
.
update
(
context
)
...
@@ -84,7 +84,7 @@ class RemoteAppDetailView(PermissionsMixin, DetailView):
...
@@ -84,7 +84,7 @@ class RemoteAppDetailView(PermissionsMixin, DetailView):
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
context
=
{
context
=
{
'app'
:
_
(
'A
sset
s'
),
'app'
:
_
(
'A
pplication
s'
),
'action'
:
_
(
'RemoteApp detail'
),
'action'
:
_
(
'RemoteApp detail'
),
}
}
kwargs
.
update
(
context
)
kwargs
.
update
(
context
)
...
...
apps/audits/views.py
View file @
9a5c00e1
...
@@ -248,7 +248,7 @@ class CommandExecutionListView(UserCommandExecutionListView):
...
@@ -248,7 +248,7 @@ class CommandExecutionListView(UserCommandExecutionListView):
'keyword'
:
self
.
keyword
,
'keyword'
:
self
.
keyword
,
'user_id'
:
self
.
user_id
,
'user_id'
:
self
.
user_id
,
})
})
return
super
()
.
get_context_data
(
**
context
)
return
context
@method_decorator
(
csrf_exempt
,
name
=
'dispatch'
)
@method_decorator
(
csrf_exempt
,
name
=
'dispatch'
)
...
...
apps/locale/zh/LC_MESSAGES/django.mo
View file @
9a5c00e1
No preview for this file type
apps/locale/zh/LC_MESSAGES/django.po
View file @
9a5c00e1
...
@@ -8,7 +8,7 @@ msgid ""
...
@@ -8,7 +8,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: 2019-06-20 1
1:41
+0800\n"
"POT-Creation-Date: 2019-06-20 1
7:55
+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\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"
...
@@ -305,7 +305,7 @@ msgstr "备注"
...
@@ -305,7 +305,7 @@ msgstr "备注"
#: perms/templates/perms/remote_app_permission_list.html:17
#: perms/templates/perms/remote_app_permission_list.html:17
#: perms/templates/perms/remote_app_permission_remote_app.html:26
#: perms/templates/perms/remote_app_permission_remote_app.html:26
#: perms/templates/perms/remote_app_permission_user.html:26
#: perms/templates/perms/remote_app_permission_user.html:26
#: templates/_nav.html:36 templates/_nav.html:48 templates/_nav_user.html:1
4
#: templates/_nav.html:36 templates/_nav.html:48 templates/_nav_user.html:1
6
msgid "RemoteApp"
msgid "RemoteApp"
msgstr "远程应用"
msgstr "远程应用"
...
@@ -558,28 +558,9 @@ msgstr "连接"
...
@@ -558,28 +558,9 @@ msgstr "连接"
#: applications/views/remote_app.py:31 applications/views/remote_app.py:47
#: applications/views/remote_app.py:31 applications/views/remote_app.py:47
#: applications/views/remote_app.py:69 applications/views/remote_app.py:87
#: applications/views/remote_app.py:69 applications/views/remote_app.py:87
#: assets/models/user.py:135
#: templates/_nav.html:33
#: assets/templates/assets/_asset_group_bulk_update_modal.html:11
msgid "Applications"
#: assets/templates/assets/system_user_asset.html:22
msgstr "应用管理"
#: assets/templates/assets/system_user_detail.html:22
#: assets/views/admin_user.py:30 assets/views/admin_user.py:49
#: assets/views/admin_user.py:66 assets/views/admin_user.py:82
#: assets/views/admin_user.py:107 assets/views/asset.py:52
#: assets/views/asset.py:69 assets/views/asset.py:128 assets/views/asset.py:171
#: assets/views/asset.py:199 assets/views/asset.py:226
#: assets/views/cmd_filter.py:31 assets/views/cmd_filter.py:48
#: assets/views/cmd_filter.py:65 assets/views/cmd_filter.py:82
#: assets/views/cmd_filter.py:102 assets/views/cmd_filter.py:136
#: assets/views/cmd_filter.py:170 assets/views/domain.py:30
#: assets/views/domain.py:47 assets/views/domain.py:64
#: assets/views/domain.py:78 assets/views/domain.py:104
#: assets/views/domain.py:133 assets/views/domain.py:153
#: assets/views/label.py:27 assets/views/label.py:45 assets/views/label.py:72
#: assets/views/system_user.py:29 assets/views/system_user.py:46
#: assets/views/system_user.py:63 assets/views/system_user.py:78
#: templates/_nav.html:19 xpack/plugins/change_auth_plan/models.py:68
msgid "Assets"
msgstr "资产管理"
#: applications/views/remote_app.py:32
#: applications/views/remote_app.py:32
msgid "RemoteApp list"
msgid "RemoteApp list"
...
@@ -1182,6 +1163,29 @@ msgstr "自动登录"
...
@@ -1182,6 +1163,29 @@ msgstr "自动登录"
msgid "Manually login"
msgid "Manually login"
msgstr "手动登录"
msgstr "手动登录"
#: assets/models/user.py:135
#: assets/templates/assets/_asset_group_bulk_update_modal.html:11
#: assets/templates/assets/system_user_asset.html:22
#: assets/templates/assets/system_user_detail.html:22
#: assets/views/admin_user.py:30 assets/views/admin_user.py:49
#: assets/views/admin_user.py:66 assets/views/admin_user.py:82
#: assets/views/admin_user.py:107 assets/views/asset.py:52
#: assets/views/asset.py:69 assets/views/asset.py:128 assets/views/asset.py:171
#: assets/views/asset.py:199 assets/views/asset.py:226
#: assets/views/cmd_filter.py:31 assets/views/cmd_filter.py:48
#: assets/views/cmd_filter.py:65 assets/views/cmd_filter.py:82
#: assets/views/cmd_filter.py:102 assets/views/cmd_filter.py:136
#: assets/views/cmd_filter.py:170 assets/views/domain.py:30
#: assets/views/domain.py:47 assets/views/domain.py:64
#: assets/views/domain.py:78 assets/views/domain.py:104
#: assets/views/domain.py:133 assets/views/domain.py:153
#: assets/views/label.py:27 assets/views/label.py:45 assets/views/label.py:72
#: assets/views/system_user.py:29 assets/views/system_user.py:46
#: assets/views/system_user.py:63 assets/views/system_user.py:78
#: templates/_nav.html:19 xpack/plugins/change_auth_plan/models.py:68
msgid "Assets"
msgstr "资产管理"
#: assets/models/user.py:138 assets/templates/assets/_system_user.html:59
#: assets/models/user.py:138 assets/templates/assets/_system_user.html:59
#: assets/templates/assets/system_user_detail.html:122
#: assets/templates/assets/system_user_detail.html:122
#: assets/templates/assets/system_user_update.html:10
#: assets/templates/assets/system_user_update.html:10
...
@@ -1438,7 +1442,7 @@ msgstr "日期"
...
@@ -1438,7 +1442,7 @@ msgstr "日期"
#: assets/templates/assets/_asset_user_list.html:61
#: assets/templates/assets/_asset_user_list.html:61
msgid "View"
msgid "View"
msgstr "查看
认证
"
msgstr "查看"
#: assets/templates/assets/_asset_user_list.html:63
#: assets/templates/assets/_asset_user_list.html:63
#: assets/templates/assets/admin_user_assets.html:61
#: assets/templates/assets/admin_user_assets.html:61
...
@@ -2317,8 +2321,8 @@ msgid "Date"
...
@@ -2317,8 +2321,8 @@ msgid "Date"
msgstr "日期"
msgstr "日期"
#: audits/views.py:85 audits/views.py:129 audits/views.py:166
#: audits/views.py:85 audits/views.py:129 audits/views.py:166
#: audits/views.py:211 audits/views.py:243
templates/_nav.html:8
7
#: audits/views.py:211 audits/views.py:243
ops/views/command.py:4
7
#: templates/_nav_audits.html:22
#: templates/_nav
.html:87 templates/_nav
_audits.html:22
msgid "Audits"
msgid "Audits"
msgstr "日志审计"
msgstr "日志审计"
...
@@ -2984,7 +2988,7 @@ msgstr "更新任务内容: {}"
...
@@ -2984,7 +2988,7 @@ msgstr "更新任务内容: {}"
#: ops/views/adhoc.py:45 ops/views/adhoc.py:71 ops/views/adhoc.py:85
#: ops/views/adhoc.py:45 ops/views/adhoc.py:71 ops/views/adhoc.py:85
#: ops/views/adhoc.py:99 ops/views/adhoc.py:113 ops/views/adhoc.py:127
#: ops/views/adhoc.py:99 ops/views/adhoc.py:113 ops/views/adhoc.py:127
#: ops/views/adhoc.py:141 ops/views/command.py:
47 ops/views/command.py:
72
#: ops/views/adhoc.py:141 ops/views/command.py:72
msgid "Ops"
msgid "Ops"
msgstr "作业中心"
msgstr "作业中心"
...
@@ -3000,7 +3004,7 @@ msgstr "执行历史"
...
@@ -3000,7 +3004,7 @@ msgstr "执行历史"
msgid "Command execution list"
msgid "Command execution list"
msgstr "命令执行列表"
msgstr "命令执行列表"
#: ops/views/command.py:73 templates/_nav_user.html:2
2
#: ops/views/command.py:73 templates/_nav_user.html:2
6
msgid "Command execution"
msgid "Command execution"
msgstr "命令执行"
msgstr "命令执行"
...
@@ -3825,7 +3829,7 @@ msgstr "文档"
...
@@ -3825,7 +3829,7 @@ msgstr "文档"
msgid "Commercial support"
msgid "Commercial support"
msgstr "商业支持"
msgstr "商业支持"
#: templates/_header_bar.html:89 templates/_nav_user.html:
28
users/forms.py:139
#: templates/_header_bar.html:89 templates/_nav_user.html:
32
users/forms.py:139
#: users/templates/users/_user.html:43
#: users/templates/users/_user.html:43
#: users/templates/users/first_login.html:39
#: users/templates/users/first_login.html:39
#: users/templates/users/user_password_update.html:40
#: users/templates/users/user_password_update.html:40
...
@@ -3941,11 +3945,11 @@ msgstr "用户列表"
...
@@ -3941,11 +3945,11 @@ msgstr "用户列表"
msgid "Command filters"
msgid "Command filters"
msgstr "命令过滤"
msgstr "命令过滤"
#: templates/_nav.html:33
msgid "Applications"
msgstr "应用管理"
#: templates/_nav.html:55 templates/_nav_audits.html:11
#: templates/_nav.html:55 templates/_nav_audits.html:11
#: terminal/views/command.py:51 terminal/views/session.py:74
#: terminal/views/session.py:92 terminal/views/session.py:116
#: terminal/views/terminal.py:31 terminal/views/terminal.py:47
#: terminal/views/terminal.py:60
msgid "Sessions"
msgid "Sessions"
msgstr "会话管理"
msgstr "会话管理"
...
@@ -3954,6 +3958,7 @@ msgid "Session online"
...
@@ -3954,6 +3958,7 @@ msgid "Session online"
msgstr "在线会话"
msgstr "在线会话"
#: templates/_nav.html:59 templates/_nav_audits.html:15
#: templates/_nav.html:59 templates/_nav_audits.html:15
#: terminal/views/session.py:93
msgid "Session offline"
msgid "Session offline"
msgstr "历史会话"
msgstr "历史会话"
...
@@ -3961,18 +3966,15 @@ msgstr "历史会话"
...
@@ -3961,18 +3966,15 @@ msgstr "历史会话"
msgid "Commands"
msgid "Commands"
msgstr "命令记录"
msgstr "命令记录"
#: templates/_nav.html:63 templates/_nav_user.html:3
3
#: templates/_nav.html:63 templates/_nav_user.html:3
7
msgid "Web terminal"
msgid "Web terminal"
msgstr "Web终端"
msgstr "Web终端"
#: templates/_nav.html:68 templates/_nav_user.html:
38
#: templates/_nav.html:68 templates/_nav_user.html:
42
msgid "File manager"
msgid "File manager"
msgstr "文件管理"
msgstr "文件管理"
#: templates/_nav.html:72 terminal/views/command.py:51
#: templates/_nav.html:72
#: terminal/views/session.py:74 terminal/views/session.py:92
#: terminal/views/session.py:116 terminal/views/terminal.py:31
#: terminal/views/terminal.py:47 terminal/views/terminal.py:60
msgid "Terminal"
msgid "Terminal"
msgstr "终端管理"
msgstr "终端管理"
...
@@ -3996,7 +3998,7 @@ msgstr "账户列表"
...
@@ -3996,7 +3998,7 @@ msgstr "账户列表"
msgid "Sync instance"
msgid "Sync instance"
msgstr "同步实例"
msgstr "同步实例"
#: templates/_nav_user.html:
9
#: templates/_nav_user.html:
11
msgid "My Applications"
msgid "My Applications"
msgstr "我的应用"
msgstr "我的应用"
...
@@ -4354,10 +4356,6 @@ msgstr "信息"
...
@@ -4354,10 +4356,6 @@ msgstr "信息"
msgid "Session online list"
msgid "Session online list"
msgstr "在线会话"
msgstr "在线会话"
#: terminal/views/session.py:93
msgid "Session offline list"
msgstr "离线会话"
#: terminal/views/terminal.py:32
#: terminal/views/terminal.py:32
msgid "Terminal list"
msgid "Terminal list"
msgstr "终端列表"
msgstr "终端列表"
...
@@ -5770,7 +5768,7 @@ msgid "Interface settings"
...
@@ -5770,7 +5768,7 @@ msgid "Interface settings"
msgstr "界面设置"
msgstr "界面设置"
#: xpack/plugins/interface/templates/interface/interface.html:15
#: xpack/plugins/interface/templates/interface/interface.html:15
#: xpack/plugins/interface/views.py:25
#: xpack/plugins/interface/views.py:2
4 xpack/plugins/interface/views.py:2
5
msgid "Interface setting"
msgid "Interface setting"
msgstr "界面设置"
msgstr "界面设置"
...
@@ -5793,10 +5791,6 @@ msgstr "恢复默认成功!"
...
@@ -5793,10 +5791,6 @@ msgstr "恢复默认成功!"
msgid "Restore default failed."
msgid "Restore default failed."
msgstr "恢复默认失败!"
msgstr "恢复默认失败!"
#: xpack/plugins/interface/views.py:24
msgid "Interface"
msgstr "界面"
#: xpack/plugins/interface/views.py:51
#: xpack/plugins/interface/views.py:51
msgid "It is already in the default setting state!"
msgid "It is already in the default setting state!"
msgstr "当前已经是初始化状态!"
msgstr "当前已经是初始化状态!"
...
@@ -5900,7 +5894,9 @@ msgstr "无效的许可证"
...
@@ -5900,7 +5894,9 @@ msgstr "无效的许可证"
msgid "Admin"
msgid "Admin"
msgstr "管理员"
msgstr "管理员"
#: xpack/plugins/orgs/meta.py:8
#: xpack/plugins/orgs/meta.py:8 xpack/plugins/orgs/views.py:26
#: xpack/plugins/orgs/views.py:43 xpack/plugins/orgs/views.py:60
#: xpack/plugins/orgs/views.py:77
msgid "Organizations"
msgid "Organizations"
msgstr "组织管理"
msgstr "组织管理"
...
@@ -5917,19 +5913,10 @@ msgstr "添加管理员"
...
@@ -5917,19 +5913,10 @@ msgstr "添加管理员"
msgid "Create organization "
msgid "Create organization "
msgstr "创建组织"
msgstr "创建组织"
#: xpack/plugins/orgs/views.py:26
msgid "Org"
msgstr "组织"
#: xpack/plugins/orgs/views.py:27
#: xpack/plugins/orgs/views.py:27
msgid "Org list"
msgid "Org list"
msgstr "组织列表"
msgstr "组织列表"
#: xpack/plugins/orgs/views.py:43 xpack/plugins/orgs/views.py:60
#: xpack/plugins/orgs/views.py:77
msgid "Orgs"
msgstr "组织"
#: xpack/plugins/orgs/views.py:44
#: xpack/plugins/orgs/views.py:44
msgid "Create org"
msgid "Create org"
msgstr "创建组织"
msgstr "创建组织"
...
@@ -5955,15 +5942,6 @@ msgstr "密码匣子"
...
@@ -5955,15 +5942,6 @@ msgstr "密码匣子"
msgid "vault create"
msgid "vault create"
msgstr "创建"
msgstr "创建"
#~ msgid "Update failed!"
#~ msgstr "更新失败"
#~ msgid "Update auth"
#~ msgstr "更新认证"
#~ msgid "Password version"
#~ msgstr "密码版本"
#~ msgid "User does not exist"
#~ msgid "User does not exist"
#~ msgstr "用户不存在"
#~ msgstr "用户不存在"
...
...
apps/locale/zh/LC_MESSAGES/djangojs.mo
View file @
9a5c00e1
No preview for this file type
apps/locale/zh/LC_MESSAGES/djangojs.po
View file @
9a5c00e1
...
@@ -8,7 +8,7 @@ msgid ""
...
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-0
5-27 15:53
+0800\n"
"POT-Creation-Date: 2019-0
6-20 16:30
+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
@@ -17,58 +17,58 @@ msgstr ""
...
@@ -17,58 +17,58 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Transfer-Encoding: 8bit\n"
#: static/js/jumpserver.js:2
49
#: static/js/jumpserver.js:2
63
msgid "Update is successful!"
msgid "Update is successful!"
msgstr "更新成功"
msgstr "更新成功"
#: static/js/jumpserver.js:2
51
#: static/js/jumpserver.js:2
65
msgid "An unknown error occurred while updating.."
msgid "An unknown error occurred while updating.."
msgstr "更新时发生未知错误"
msgstr "更新时发生未知错误"
#: static/js/jumpserver.js:3
15 static/js/jumpserver.js:352
#: static/js/jumpserver.js:3
29 static/js/jumpserver.js:366
#: static/js/jumpserver.js:3
55
#: static/js/jumpserver.js:3
69
msgid "Error"
msgid "Error"
msgstr "错误"
msgstr "错误"
#: static/js/jumpserver.js:3
15
#: static/js/jumpserver.js:3
29
msgid "Being used by the asset, please unbind the asset first."
msgid "Being used by the asset, please unbind the asset first."
msgstr "正在被资产使用中,请先解除资产绑定"
msgstr "正在被资产使用中,请先解除资产绑定"
#: static/js/jumpserver.js:3
21 static/js/jumpserver.js:362
#: static/js/jumpserver.js:3
35 static/js/jumpserver.js:376
msgid "Delete the success"
msgid "Delete the success"
msgstr "删除成功"
msgstr "删除成功"
#: static/js/jumpserver.js:3
27
#: static/js/jumpserver.js:3
41
msgid "Are you sure about deleting it?"
msgid "Are you sure about deleting it?"
msgstr "你确定删除吗 ?"
msgstr "你确定删除吗 ?"
#: static/js/jumpserver.js:3
31 static/js/jumpserver.js:372
#: static/js/jumpserver.js:3
45 static/js/jumpserver.js:386
msgid "Cancel"
msgid "Cancel"
msgstr "取消"
msgstr "取消"
#: static/js/jumpserver.js:3
33 static/js/jumpserver.js:374
#: static/js/jumpserver.js:3
47 static/js/jumpserver.js:388
msgid "Confirm"
msgid "Confirm"
msgstr "确认"
msgstr "确认"
#: static/js/jumpserver.js:3
52
#: static/js/jumpserver.js:3
66
msgid ""
msgid ""
"The organization contains undeleted information. Please try again after "
"The organization contains undeleted information. Please try again after "
"deleting"
"deleting"
msgstr "组织中包含未删除信息,请删除后重试"
msgstr "组织中包含未删除信息,请删除后重试"
#: static/js/jumpserver.js:3
55
#: static/js/jumpserver.js:3
69
msgid ""
msgid ""
"Do not perform this operation under this organization. Try again after "
"Do not perform this operation under this organization. Try again after "
"switching to another organization"
"switching to another organization"
msgstr "请勿在此组织下执行此操作,切换到其他组织后重试"
msgstr "请勿在此组织下执行此操作,切换到其他组织后重试"
#: static/js/jumpserver.js:3
68
#: static/js/jumpserver.js:3
82
msgid ""
msgid ""
"Please ensure that the following information in the organization has been "
"Please ensure that the following information in the organization has been "
"deleted"
"deleted"
msgstr "请确保组织内的以下信息已删除"
msgstr "请确保组织内的以下信息已删除"
#: static/js/jumpserver.js:3
69
#: static/js/jumpserver.js:3
83
msgid ""
msgid ""
"User list、User group、Asset list、Domain list、Admin user、System user、"
"User list、User group、Asset list、Domain list、Admin user、System user、"
"Labels、Asset permission"
"Labels、Asset permission"
...
@@ -76,76 +76,80 @@ msgstr ""
...
@@ -76,76 +76,80 @@ msgstr ""
"用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权"
"用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权"
"规则"
"规则"
#: static/js/jumpserver.js:4
08
#: static/js/jumpserver.js:4
22
msgid "Loading ..."
msgid "Loading ..."
msgstr "加载中 ..."
msgstr "加载中 ..."
#: static/js/jumpserver.js:4
09
#: static/js/jumpserver.js:4
23
msgid "Search"
msgid "Search"
msgstr "搜索"
msgstr "搜索"
#: static/js/jumpserver.js:4
12
#: static/js/jumpserver.js:4
26
#, javascript-format
#, javascript-format
msgid "Selected item %d"
msgid "Selected item %d"
msgstr "选中 %d 项"
msgstr "选中 %d 项"
#: static/js/jumpserver.js:4
16
#: static/js/jumpserver.js:4
30
msgid "Per page _MENU_"
msgid "Per page _MENU_"
msgstr "每页 _MENU_"
msgstr "每页 _MENU_"
#: static/js/jumpserver.js:4
17
#: static/js/jumpserver.js:4
31
msgid ""
msgid ""
"Displays the results of items _START_ to _END_; A total of _TOTAL_ entries"
"Displays the results of items _START_ to _END_; A total of _TOTAL_ entries"
msgstr "显示第 _START_ 至 _END_ 项结果; 总共 _TOTAL_ 项"
msgstr "显示第 _START_ 至 _END_ 项结果; 总共 _TOTAL_ 项"
#: static/js/jumpserver.js:4
20
#: static/js/jumpserver.js:4
34
msgid "No match"
msgid "No match"
msgstr "没有匹配项"
msgstr "没有匹配项"
#: static/js/jumpserver.js:4
21
#: static/js/jumpserver.js:4
35
msgid "No record"
msgid "No record"
msgstr "没有记录"
msgstr "没有记录"
#: static/js/jumpserver.js:5
63
#: static/js/jumpserver.js:5
77
msgid "Unknown error occur"
msgid "Unknown error occur"
msgstr ""
msgstr ""
#: static/js/jumpserver.js:8
00
#: static/js/jumpserver.js:8
16
msgid "Password minimum length {N} bits"
msgid "Password minimum length {N} bits"
msgstr "密码最小长度 {N} 位"
msgstr "密码最小长度 {N} 位"
#: static/js/jumpserver.js:8
01
#: static/js/jumpserver.js:8
17
msgid "Must contain capital letters"
msgid "Must contain capital letters"
msgstr "必须包含大写字母"
msgstr "必须包含大写字母"
#: static/js/jumpserver.js:8
02
#: static/js/jumpserver.js:8
18
msgid "Must contain lowercase letters"
msgid "Must contain lowercase letters"
msgstr "必须包含小写字母"
msgstr "必须包含小写字母"
#: static/js/jumpserver.js:8
03
#: static/js/jumpserver.js:8
19
msgid "Must contain numeric characters"
msgid "Must contain numeric characters"
msgstr "必须包含数字字符"
msgstr "必须包含数字字符"
#: static/js/jumpserver.js:8
04
#: static/js/jumpserver.js:8
20
msgid "Must contain special characters"
msgid "Must contain special characters"
msgstr "必须包含特殊字符"
msgstr "必须包含特殊字符"
#: static/js/jumpserver.js:9
76
#: static/js/jumpserver.js:9
95
msgid "Export failed"
msgid "Export failed"
msgstr "导出失败"
msgstr "导出失败"
#: static/js/jumpserver.js:
993
#: static/js/jumpserver.js:
1012
msgid "Import Success"
msgid "Import Success"
msgstr "导入成功"
msgstr "导入成功"
#: static/js/jumpserver.js:
998
#: static/js/jumpserver.js:
1017
msgid "Update Success"
msgid "Update Success"
msgstr "更新成功"
msgstr "更新成功"
#: static/js/jumpserver.js:1028
#: static/js/jumpserver.js:1018
msgid "Count"
msgstr "数量"
#: static/js/jumpserver.js:1047
msgid "Import failed"
msgid "Import failed"
msgstr "导入失败"
msgstr "导入失败"
#: static/js/jumpserver.js:10
33
#: static/js/jumpserver.js:10
52
msgid "Update failed"
msgid "Update failed"
msgstr "更新失败"
msgstr "更新失败"
apps/static/js/jumpserver.js
View file @
9a5c00e1
...
@@ -1015,7 +1015,7 @@ function APIImportData(props){
...
@@ -1015,7 +1015,7 @@ function APIImportData(props){
$
(
'#updated_failed'
).
html
(
''
);
$
(
'#updated_failed'
).
html
(
''
);
$
(
'#updated_failed_detail'
).
html
(
''
);
$
(
'#updated_failed_detail'
).
html
(
''
);
$
(
'#success_updated'
).
html
(
gettext
(
"Update Success"
));
$
(
'#success_updated'
).
html
(
gettext
(
"Update Success"
));
$
(
'#success_updated_detail'
).
html
(
"Count"
+
": "
+
data
.
length
);
$
(
'#success_updated_detail'
).
html
(
gettext
(
"Count"
)
+
": "
+
data
.
length
);
}
}
props
.
data_table
.
ajax
.
reload
()
props
.
data_table
.
ajax
.
reload
()
...
...
apps/terminal/views/command.py
View file @
9a5c00e1
...
@@ -48,7 +48,7 @@ class CommandListView(DatetimeSearchMixin, PermissionsMixin, ListView):
...
@@ -48,7 +48,7 @@ class CommandListView(DatetimeSearchMixin, PermissionsMixin, ListView):
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
context
=
{
context
=
{
'app'
:
_
(
'
Terminal
'
),
'app'
:
_
(
'
Sessions
'
),
'action'
:
_
(
'Command list'
),
'action'
:
_
(
'Command list'
),
'user_list'
:
utils
.
get_session_user_list
(),
'user_list'
:
utils
.
get_session_user_list
(),
'asset_list'
:
utils
.
get_session_asset_list
(),
'asset_list'
:
utils
.
get_session_asset_list
(),
...
...
apps/terminal/views/session.py
View file @
9a5c00e1
...
@@ -71,7 +71,7 @@ class SessionOnlineListView(SessionListView):
...
@@ -71,7 +71,7 @@ class SessionOnlineListView(SessionListView):
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
context
=
{
context
=
{
'app'
:
_
(
'
Terminal
'
),
'app'
:
_
(
'
Sessions
'
),
'action'
:
_
(
'Session online list'
),
'action'
:
_
(
'Session online list'
),
'type'
:
'online'
,
'type'
:
'online'
,
'now'
:
timezone
.
now
(),
'now'
:
timezone
.
now
(),
...
@@ -89,8 +89,8 @@ class SessionOfflineListView(SessionListView):
...
@@ -89,8 +89,8 @@ class SessionOfflineListView(SessionListView):
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
context
=
{
context
=
{
'app'
:
_
(
'
Terminal
'
),
'app'
:
_
(
'
Sessions
'
),
'action'
:
_
(
'Session offline
list
'
),
'action'
:
_
(
'Session offline'
),
'now'
:
timezone
.
now
(),
'now'
:
timezone
.
now
(),
}
}
kwargs
.
update
(
context
)
kwargs
.
update
(
context
)
...
@@ -113,7 +113,7 @@ class SessionDetailView(SingleObjectMixin, PermissionsMixin, ListView):
...
@@ -113,7 +113,7 @@ class SessionDetailView(SingleObjectMixin, PermissionsMixin, ListView):
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
context
=
{
context
=
{
'app'
:
_
(
'
Terminal
'
),
'app'
:
_
(
'
Sessions
'
),
'action'
:
_
(
'Session detail'
),
'action'
:
_
(
'Session detail'
),
}
}
kwargs
.
update
(
context
)
kwargs
.
update
(
context
)
...
...
apps/terminal/views/terminal.py
View file @
9a5c00e1
...
@@ -28,7 +28,7 @@ class TerminalListView(PermissionsMixin, ListView):
...
@@ -28,7 +28,7 @@ class TerminalListView(PermissionsMixin, ListView):
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
context
=
super
(
TerminalListView
,
self
)
.
get_context_data
(
**
kwargs
)
context
=
super
(
TerminalListView
,
self
)
.
get_context_data
(
**
kwargs
)
context
.
update
({
context
.
update
({
'app'
:
_
(
'
Terminal
'
),
'app'
:
_
(
'
Sessions
'
),
'action'
:
_
(
'Terminal list'
),
'action'
:
_
(
'Terminal list'
),
'form'
:
self
.
form_class
()
'form'
:
self
.
form_class
()
})
})
...
@@ -44,7 +44,7 @@ class TerminalUpdateView(PermissionsMixin, UpdateView):
...
@@ -44,7 +44,7 @@ class TerminalUpdateView(PermissionsMixin, UpdateView):
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
context
=
super
(
TerminalUpdateView
,
self
)
.
get_context_data
(
**
kwargs
)
context
=
super
(
TerminalUpdateView
,
self
)
.
get_context_data
(
**
kwargs
)
context
.
update
({
'app'
:
_
(
'
Terminal
'
),
'action'
:
_
(
'Update terminal'
)})
context
.
update
({
'app'
:
_
(
'
Sessions
'
),
'action'
:
_
(
'Update terminal'
)})
return
context
return
context
...
@@ -57,7 +57,7 @@ class TerminalDetailView(PermissionsMixin, DetailView):
...
@@ -57,7 +57,7 @@ class TerminalDetailView(PermissionsMixin, DetailView):
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
context
=
super
(
TerminalDetailView
,
self
)
.
get_context_data
(
**
kwargs
)
context
=
super
(
TerminalDetailView
,
self
)
.
get_context_data
(
**
kwargs
)
context
.
update
({
context
.
update
({
'app'
:
_
(
'
Terminal
'
),
'app'
:
_
(
'
Sessions
'
),
'action'
:
_
(
'Terminal detail'
)
'action'
:
_
(
'Terminal detail'
)
})
})
return
context
return
context
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment