Skip to content

J
jumpserver
Unverified Commit 9a5c00e1 authored by BaiJiangJie's avatar BaiJiangJie Committed by GitHub
Browse files
Options

[Update] 修改文案 (#2823) 

* [Update] 修改文案

* [Update] 修改文案2
parent 7e16ce41
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 115 deletions
apps/applications/views/remote_app.py
View file @ 9a5c00e1
......@@ -28,7 +28,7 @@ class RemoteAppListView(PermissionsMixin, TemplateView):
def get_context_data(self, **kwargs):
context = {
'app': _('Assets'),
'app': _('Applications'),
'action': _('RemoteApp list'),
}
kwargs.update(context)
......@@ -44,7 +44,7 @@ class RemoteAppCreateView(PermissionsMixin, SuccessMessageMixin, CreateView):
def get_context_data(self, **kwargs):
context = {
'app': _('Assets'),
'app': _('Applications'),
'action': _('Create RemoteApp'),
}
kwargs.update(context)
......@@ -66,7 +66,7 @@ class RemoteAppUpdateView(PermissionsMixin, SuccessMessageMixin, UpdateView):
def get_context_data(self, **kwargs):
context = {
'app': _('Assets'),
'app': _('Applications'),
'action': _('Update RemoteApp'),
}
kwargs.update(context)
......@@ -84,7 +84,7 @@ class RemoteAppDetailView(PermissionsMixin, DetailView):
def get_context_data(self, **kwargs):
context = {
'app': _('Assets'),
'app': _('Applications'),
'action': _('RemoteApp detail'),
}
kwargs.update(context)
......
apps/audits/views.py
View file @ 9a5c00e1
......@@ -248,7 +248,7 @@ class CommandExecutionListView(UserCommandExecutionListView):
'keyword': self.keyword,
'user_id': self.user_id,
})
return super().get_context_data(**context)
return context
@method_decorator(csrf_exempt, name='dispatch')
......
apps/locale/zh/LC_MESSAGES/django.po
View file @ 9a5c00e1
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Jumpserver 0.3.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-06-20 11:41+0800\n"
"POT-Creation-Date: 2019-06-20 17:55+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"
......@@ -305,7 +305,7 @@ msgstr "备注"
#: 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_user.html:26
#: templates/_nav.html:36 templates/_nav.html:48 templates/_nav_user.html:14
#: templates/_nav.html:36 templates/_nav.html:48 templates/_nav_user.html:16
msgid "RemoteApp"
msgstr "远程应用"
......@@ -558,28 +558,9 @@ msgstr "连接"
#: applications/views/remote_app.py:31 applications/views/remote_app.py:47
#: applications/views/remote_app.py:69 applications/views/remote_app.py:87
#: 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 "资产管理"
#: templates/_nav.html:33
msgid "Applications"
msgstr "应用管理"
#: applications/views/remote_app.py:32
msgid "RemoteApp list"
......@@ -1182,6 +1163,29 @@ msgstr "自动登录"
msgid "Manually login"
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/templates/assets/system_user_detail.html:122
#: assets/templates/assets/system_user_update.html:10
......@@ -1438,7 +1442,7 @@ msgstr "日期"
#: assets/templates/assets/_asset_user_list.html:61
msgid "View"
msgstr "查看认证"
msgstr "查看"
#: assets/templates/assets/_asset_user_list.html:63
#: assets/templates/assets/admin_user_assets.html:61
......@@ -2317,8 +2321,8 @@ msgid "Date"
msgstr "日期"
#: audits/views.py:85 audits/views.py:129 audits/views.py:166
#: audits/views.py:211 audits/views.py:243 templates/_nav.html:87
#: templates/_nav_audits.html:22
#: audits/views.py:211 audits/views.py:243 ops/views/command.py:47
#: templates/_nav.html:87 templates/_nav_audits.html:22
msgid "Audits"
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: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"
msgstr "作业中心"
......@@ -3000,7 +3004,7 @@ msgstr "执行历史"
msgid "Command execution list"
msgstr "命令执行列表"
#: ops/views/command.py:73 templates/_nav_user.html:22
#: ops/views/command.py:73 templates/_nav_user.html:26
msgid "Command execution"
msgstr "命令执行"
......@@ -3825,7 +3829,7 @@ msgstr "文档"
msgid "Commercial support"
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/first_login.html:39
#: users/templates/users/user_password_update.html:40
......@@ -3941,11 +3945,11 @@ msgstr "用户列表"
msgid "Command filters"
msgstr "命令过滤"
#: templates/_nav.html:33
msgid "Applications"
msgstr "应用管理"
#: 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"
msgstr "会话管理"
......@@ -3954,6 +3958,7 @@ msgid "Session online"
msgstr "在线会话"
#: templates/_nav.html:59 templates/_nav_audits.html:15
#: terminal/views/session.py:93
msgid "Session offline"
msgstr "历史会话"
......@@ -3961,18 +3966,15 @@ msgstr "历史会话"
msgid "Commands"
msgstr "命令记录"
#: templates/_nav.html:63 templates/_nav_user.html:33
#: templates/_nav.html:63 templates/_nav_user.html:37
msgid "Web terminal"
msgstr "Web终端"
#: templates/_nav.html:68 templates/_nav_user.html:38
#: templates/_nav.html:68 templates/_nav_user.html:42
msgid "File manager"
msgstr "文件管理"
#: templates/_nav.html:72 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
#: templates/_nav.html:72
msgid "Terminal"
msgstr "终端管理"
......@@ -3996,7 +3998,7 @@ msgstr "账户列表"
msgid "Sync instance"
msgstr "同步实例"
#: templates/_nav_user.html:9
#: templates/_nav_user.html:11
msgid "My Applications"
msgstr "我的应用"
......@@ -4354,10 +4356,6 @@ msgstr "信息"
msgid "Session online list"
msgstr "在线会话"
#: terminal/views/session.py:93
msgid "Session offline list"
msgstr "离线会话"
#: terminal/views/terminal.py:32
msgid "Terminal list"
msgstr "终端列表"
......@@ -5770,7 +5768,7 @@ msgid "Interface settings"
msgstr "界面设置"
#: xpack/plugins/interface/templates/interface/interface.html:15
#: xpack/plugins/interface/views.py:25
#: xpack/plugins/interface/views.py:24 xpack/plugins/interface/views.py:25
msgid "Interface setting"
msgstr "界面设置"
......@@ -5793,10 +5791,6 @@ msgstr "恢复默认成功！"
msgid "Restore default failed."
msgstr "恢复默认失败！"
#: xpack/plugins/interface/views.py:24
msgid "Interface"
msgstr "界面"
#: xpack/plugins/interface/views.py:51
msgid "It is already in the default setting state!"
msgstr "当前已经是初始化状态！"
......@@ -5900,7 +5894,9 @@ msgstr "无效的许可证"
msgid "Admin"
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"
msgstr "组织管理"
......@@ -5917,19 +5913,10 @@ msgstr "添加管理员"
msgid "Create organization "
msgstr "创建组织"
#: xpack/plugins/orgs/views.py:26
msgid "Org"
msgstr "组织"
#: xpack/plugins/orgs/views.py:27
msgid "Org list"
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
msgid "Create org"
msgstr "创建组织"
......@@ -5955,15 +5942,6 @@ msgstr "密码匣子"
msgid "vault create"
msgstr "创建"
#~ msgid "Update failed!"
#~ msgstr "更新失败"
#~ msgid "Update auth"
#~ msgstr "更新认证"
#~ msgid "Password version"
#~ msgstr "密码版本"
#~ msgid "User does not exist"
#~ msgstr "用户不存在"
......
apps/locale/zh/LC_MESSAGES/djangojs.po
View file @ 9a5c00e1
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-27 15:53+0800\n"
"POT-Creation-Date: 2019-06-20 16:30+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -17,58 +17,58 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: static/js/jumpserver.js:249
#: static/js/jumpserver.js:263
msgid "Update is successful!"
msgstr "更新成功"
#: static/js/jumpserver.js:251
#: static/js/jumpserver.js:265
msgid "An unknown error occurred while updating.."
msgstr "更新时发生未知错误"
#: static/js/jumpserver.js:315 static/js/jumpserver.js:352
#: static/js/jumpserver.js:355
#: static/js/jumpserver.js:329 static/js/jumpserver.js:366
#: static/js/jumpserver.js:369
msgid "Error"
msgstr "错误"
#: static/js/jumpserver.js:315
#: static/js/jumpserver.js:329
msgid "Being used by the asset, please unbind the asset first."
msgstr "正在被资产使用中，请先解除资产绑定"
#: static/js/jumpserver.js:321 static/js/jumpserver.js:362
#: static/js/jumpserver.js:335 static/js/jumpserver.js:376
msgid "Delete the success"
msgstr "删除成功"
#: static/js/jumpserver.js:327
#: static/js/jumpserver.js:341
msgid "Are you sure about deleting it?"
msgstr "你确定删除吗 ?"
#: static/js/jumpserver.js:331 static/js/jumpserver.js:372
#: static/js/jumpserver.js:345 static/js/jumpserver.js:386
msgid "Cancel"
msgstr "取消"
#: static/js/jumpserver.js:333 static/js/jumpserver.js:374
#: static/js/jumpserver.js:347 static/js/jumpserver.js:388
msgid "Confirm"
msgstr "确认"
#: static/js/jumpserver.js:352
#: static/js/jumpserver.js:366
msgid ""
"The organization contains undeleted information. Please try again after "
"deleting"
msgstr "组织中包含未删除信息，请删除后重试"
#: static/js/jumpserver.js:355
#: static/js/jumpserver.js:369
msgid ""
"Do not perform this operation under this organization. Try again after "
"switching to another organization"
msgstr "请勿在此组织下执行此操作，切换到其他组织后重试"
#: static/js/jumpserver.js:368
#: static/js/jumpserver.js:382
msgid ""
"Please ensure that the following information in the organization has been "
"deleted"
msgstr "请确保组织内的以下信息已删除"
#: static/js/jumpserver.js:369
#: static/js/jumpserver.js:383
msgid ""
"User list、User group、Asset list、Domain list、Admin user、System user、"
"Labels、Asset permission"
......@@ -76,76 +76,80 @@ msgstr ""
"用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权"
"规则"
#: static/js/jumpserver.js:408
#: static/js/jumpserver.js:422
msgid "Loading ..."
msgstr "加载中 ..."
#: static/js/jumpserver.js:409
#: static/js/jumpserver.js:423
msgid "Search"
msgstr "搜索"
#: static/js/jumpserver.js:412
#: static/js/jumpserver.js:426
#, javascript-format
msgid "Selected item %d"
msgstr "选中 %d 项"
#: static/js/jumpserver.js:416
#: static/js/jumpserver.js:430
msgid "Per page _MENU_"
msgstr "每页 _MENU_"
#: static/js/jumpserver.js:417
#: static/js/jumpserver.js:431
msgid ""
"Displays the results of items _START_ to _END_; A total of _TOTAL_ entries"
msgstr "显示第 _START_ 至 _END_ 项结果; 总共 _TOTAL_ 项"
#: static/js/jumpserver.js:420
#: static/js/jumpserver.js:434
msgid "No match"
msgstr "没有匹配项"
#: static/js/jumpserver.js:421
#: static/js/jumpserver.js:435
msgid "No record"
msgstr "没有记录"
#: static/js/jumpserver.js:563
#: static/js/jumpserver.js:577
msgid "Unknown error occur"
msgstr ""
#: static/js/jumpserver.js:800
#: static/js/jumpserver.js:816
msgid "Password minimum length {N} bits"
msgstr "密码最小长度 {N} 位"
#: static/js/jumpserver.js:801
#: static/js/jumpserver.js:817
msgid "Must contain capital letters"
msgstr "必须包含大写字母"
#: static/js/jumpserver.js:802
#: static/js/jumpserver.js:818
msgid "Must contain lowercase letters"
msgstr "必须包含小写字母"
#: static/js/jumpserver.js:803
#: static/js/jumpserver.js:819
msgid "Must contain numeric characters"
msgstr "必须包含数字字符"
#: static/js/jumpserver.js:804
#: static/js/jumpserver.js:820
msgid "Must contain special characters"
msgstr "必须包含特殊字符"
#: static/js/jumpserver.js:976
#: static/js/jumpserver.js:995
msgid "Export failed"
msgstr "导出失败"
#: static/js/jumpserver.js:993
#: static/js/jumpserver.js:1012
msgid "Import Success"
msgstr "导入成功"
#: static/js/jumpserver.js:998
#: static/js/jumpserver.js:1017
msgid "Update Success"
msgstr "更新成功"
#: static/js/jumpserver.js:1028
#: static/js/jumpserver.js:1018
msgid "Count"
msgstr "数量"
#: static/js/jumpserver.js:1047
msgid "Import failed"
msgstr "导入失败"
#: static/js/jumpserver.js:1033
#: static/js/jumpserver.js:1052
msgid "Update failed"
msgstr "更新失败"
apps/static/js/jumpserver.js
View file @ 9a5c00e1
......@@ -1015,7 +1015,7 @@ function APIImportData(props){
$('#updated_failed').html('');
$('#updated_failed_detail').html('');
$('#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()
......
apps/terminal/views/command.py
View file @ 9a5c00e1
......@@ -48,7 +48,7 @@ class CommandListView(DatetimeSearchMixin, PermissionsMixin, ListView):
def get_context_data(self, **kwargs):
context = {
'app': _('Terminal'),
'app': _('Sessions'),
'action': _('Command list'),
'user_list': utils.get_session_user_list(),
'asset_list': utils.get_session_asset_list(),
......
apps/terminal/views/session.py
View file @ 9a5c00e1
......@@ -71,7 +71,7 @@ class SessionOnlineListView(SessionListView):
def get_context_data(self, **kwargs):
context = {
'app': _('Terminal'),
'app': _('Sessions'),
'action': _('Session online list'),
'type': 'online',
'now': timezone.now(),
......@@ -89,8 +89,8 @@ class SessionOfflineListView(SessionListView):
def get_context_data(self, **kwargs):
context = {
'app': _('Terminal'),
'action': _('Session offline list'),
'app': _('Sessions'),
'action': _('Session offline'),
'now': timezone.now(),
}
kwargs.update(context)
......@@ -113,7 +113,7 @@ class SessionDetailView(SingleObjectMixin, PermissionsMixin, ListView):
def get_context_data(self, **kwargs):
context = {
'app': _('Terminal'),
'app': _('Sessions'),
'action': _('Session detail'),
}
kwargs.update(context)
......
apps/terminal/views/terminal.py
View file @ 9a5c00e1
......@@ -28,7 +28,7 @@ class TerminalListView(PermissionsMixin, ListView):
def get_context_data(self, **kwargs):
context = super(TerminalListView, self).get_context_data(**kwargs)
context.update({
'app': _('Terminal'),
'app': _('Sessions'),
'action': _('Terminal list'),
'form': self.form_class()
})
......@@ -44,7 +44,7 @@ class TerminalUpdateView(PermissionsMixin, UpdateView):
def get_context_data(self, **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
......@@ -57,7 +57,7 @@ class TerminalDetailView(PermissionsMixin, DetailView):
def get_context_data(self, **kwargs):
context = super(TerminalDetailView, self).get_context_data(**kwargs)
context.update({
'app': _('Terminal'),
'app': _('Sessions'),
'action': _('Terminal detail')
})
return context
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment