From 579e74dd5d98e8173c0b4c760e520bf5f2ffabdd Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 23 Jan 2018 12:22:25 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api.py | 2 +- apps/assets/hands.py | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 32209 -> 32133 bytes apps/locale/zh/LC_MESSAGES/django.po | 119 +++++++++--------- apps/static/css/jumpserver.css | 2 +- apps/templates/_footer.html | 2 +- apps/templates/flash_message_standalone.html | 2 +- apps/templates/index.html | 3 - apps/users/hands.py | 2 +- .../templates/users/forgot_password.html | 2 +- apps/users/templates/users/login.html | 2 +- .../users/templates/users/reset_password.html | 2 +- apps/users/templates/users/user_detail.html | 13 +- apps/users/templates/users/user_list.html | 2 +- apps/users/views/login.py | 2 +- 15 files changed, 80 insertions(+), 77 deletions(-) diff --git a/apps/assets/api.py b/apps/assets/api.py index 5f1c73bf0..25d89c759 100644 --- a/apps/assets/api.py +++ b/apps/assets/api.py @@ -1,5 +1,5 @@ # ~*~ coding: utf-8 ~*~ -# Copyright (C) 2014-2017 Beijing DuiZhan Technology Co.,Ltd. All Rights Reserved. +# Copyright (C) 2014-2018 Beijing DuiZhan Technology Co.,Ltd. All Rights Reserved. # # Licensed under the GNU General Public License v2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/apps/assets/hands.py b/apps/assets/hands.py index 1545bce62..c160051bb 100644 --- a/apps/assets/hands.py +++ b/apps/assets/hands.py @@ -6,7 +6,7 @@ Other module of this app shouldn't connect with other app. - :copyright: (c) 2014-2017 by Jumpserver Team. + :copyright: (c) 2014-2018 by Jumpserver Team. :license: GPL v2, see LICENSE for more details. """ diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index f6489066200c442d9a9bbce51198493a10222cac..132dcab94089c4ffc1109b052754b392b9fe7d45 100644 GIT binary patch delta 11683 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\n" "Language-Team: Jumpserver team\n" @@ -66,7 +66,7 @@ msgstr "端口" #: assets/templates/assets/system_user_list.html:26 perms/models.py:17 #: perms/templates/perms/asset_permission_create_update.html:40 #: perms/templates/perms/asset_permission_list.html:28 templates/_nav.html:22 -#: terminal/backends/command/models.py:11 terminal/models.py:124 +#: terminal/backends/command/models.py:11 terminal/models.py:116 #: terminal/templates/terminal/command_list.html:40 #: terminal/templates/terminal/command_list.html:73 #: terminal/templates/terminal/session_list.html:41 @@ -106,8 +106,8 @@ msgstr "选择的系统用户将会在该集群资产上创建" #: perms/templates/perms/asset_permission_create_update.html:33 #: perms/templates/perms/asset_permission_detail.html:62 #: perms/templates/perms/asset_permission_list.html:25 -#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:23 -#: terminal/models.py:149 terminal/templates/terminal/terminal_detail.html:43 +#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:15 +#: terminal/models.py:141 terminal/templates/terminal/terminal_detail.html:43 #: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14 #: users/models/user.py:35 users/templates/users/_select_user_modal.html:13 #: users/templates/users/user_detail.html:62 @@ -403,7 +403,7 @@ msgstr "创建日期" #: assets/templates/assets/system_user_detail.html:100 #: assets/templates/assets/system_user_list.html:30 common/models.py:30 #: ops/models.py:37 perms/models.py:24 -#: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:33 +#: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:25 #: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15 #: users/models/user.py:47 users/templates/users/user_detail.html:110 #: users/templates/users/user_group_detail.html:67 @@ -495,7 +495,7 @@ msgstr "Shell" #: assets/models/user.py:269 perms/models.py:19 #: perms/templates/perms/asset_permission_detail.html:136 #: perms/templates/perms/asset_permission_list.html:30 templates/_nav.html:26 -#: terminal/backends/command/models.py:12 terminal/models.py:125 +#: terminal/backends/command/models.py:12 terminal/models.py:117 #: terminal/templates/terminal/command_list.html:48 #: terminal/templates/terminal/command_list.html:74 #: terminal/templates/terminal/session_list.html:49 @@ -603,24 +603,20 @@ msgid "Import asset" msgstr "导入资产" #: assets/templates/assets/_asset_import_modal.html:9 -#: common/templates/common/_add_terminal_command_storage_modal.html:9 #: users/templates/users/_user_import_modal.html:10 msgid "Template" msgstr "模板" #: assets/templates/assets/_asset_import_modal.html:10 -#: common/templates/common/_add_terminal_command_storage_modal.html:10 #: users/templates/users/_user_import_modal.html:11 msgid "Download" msgstr "下载" #: assets/templates/assets/_asset_import_modal.html:13 -#: common/templates/common/_add_terminal_command_storage_modal.html:13 msgid "Asset csv file" msgstr "资产csv文件" #: assets/templates/assets/_asset_import_modal.html:16 -#: common/templates/common/_add_terminal_command_storage_modal.html:16 msgid "If set id, will use this id update asset existed" msgstr "如果设置了id，则会使用该行信息更新该id的资产" @@ -672,7 +668,7 @@ msgstr "其它" #: common/templates/common/terminal_setting.html:82 #: perms/templates/perms/asset_permission_create_update.html:67 #: terminal/templates/terminal/terminal_update.html:46 -#: users/templates/users/_user.html:49 +#: users/templates/users/_user.html:43 #: users/templates/users/user_bulk_update.html:23 #: users/templates/users/user_password_update.html:58 #: users/templates/users/user_profile.html:139 @@ -696,7 +692,7 @@ msgstr "重置" #: common/templates/common/terminal_setting.html:83 #: perms/templates/perms/asset_permission_create_update.html:68 #: terminal/templates/terminal/terminal_update.html:47 -#: users/templates/users/_user.html:50 +#: users/templates/users/_user.html:44 #: users/templates/users/first_login.html:62 #: users/templates/users/forgot_password.html:44 #: users/templates/users/user_bulk_update.html:24 @@ -1299,6 +1295,16 @@ msgstr "%(name)s 创建成功" msgid "%(name)s was updated successfully" msgstr "%(name)s 更新成功" +#: common/fields.py:25 +#, fuzzy +#| msgid "Not a valid ssh public key" +msgid "Not a valid json" +msgstr "ssh密钥不合法" + +#: common/fields.py:27 +msgid "Not a string type" +msgstr "" + #: common/forms.py:70 msgid "Current SITE URL" msgstr "当前站点URL" @@ -1392,7 +1398,7 @@ msgid "Public key auth" msgstr "秘钥认证" #: common/forms.py:155 common/templates/common/terminal_setting.html:58 -#: terminal/models.py:27 +#: terminal/forms.py:21 terminal/models.py:19 msgid "Command storage" msgstr "命令存储" @@ -1418,10 +1424,6 @@ msgstr "值" msgid "Enabled" msgstr "启用" -#: common/templates/common/_add_terminal_command_storage_modal.html:4 -msgid "Add command storage" -msgstr "添加命令存储" - #: common/templates/common/basic_setting.html:15 #: common/templates/common/email_setting.html:15 #: common/templates/common/ldap_setting.html:15 @@ -1456,10 +1458,6 @@ msgstr "终端设置" msgid "Test connection" msgstr "测试连接" -#: common/templates/common/terminal_setting.html:77 terminal/models.py:28 -msgid "Replay storage" -msgstr "录像存储" - #: common/views.py:20 common/views.py:46 common/views.py:72 common/views.py:101 #: templates/_nav.html:69 msgid "Settings" @@ -1616,7 +1614,7 @@ msgstr "执行历史" #: ops/templates/ops/adhoc_history.html:52 #: ops/templates/ops/adhoc_history_detail.html:58 -#: ops/templates/ops/task_history.html:55 terminal/models.py:132 +#: ops/templates/ops/task_history.html:55 terminal/models.py:124 #: terminal/templates/terminal/session_list.html:77 msgid "Date start" msgstr "开始日期" @@ -1740,7 +1738,7 @@ msgstr "选择用户" #: perms/forms.py:18 perms/models.py:15 #: perms/templates/perms/asset_permission_create_update.html:36 #: perms/templates/perms/asset_permission_list.html:26 templates/_nav.html:12 -#: terminal/backends/command/models.py:10 terminal/models.py:123 +#: terminal/backends/command/models.py:10 terminal/models.py:115 #: terminal/templates/terminal/command_list.html:32 #: terminal/templates/terminal/command_list.html:72 #: terminal/templates/terminal/session_list.html:33 @@ -1889,16 +1887,12 @@ msgstr "资产授权包含用户" msgid "Asset permission asset list" msgstr "资产组授权包含资产" -#: templates/_header_bar.html:14 -msgid "Welcome to use Jumpserver system" -msgstr "欢迎使用Jumpserver开源跳板机系统" - #: templates/_header_bar.html:18 msgid "Help" msgstr "帮助" -#: templates/_header_bar.html:33 templates/_nav_user.html:9 -#: users/templates/users/_user.html:42 +#: templates/_header_bar.html:32 templates/_nav_user.html:9 +#: users/templates/users/_user.html:36 #: users/templates/users/user_password_update.html:37 #: users/templates/users/user_profile.html:17 #: users/templates/users/user_profile_update.html:37 @@ -1907,24 +1901,24 @@ msgstr "帮助" msgid "Profile" msgstr "个人信息" -#: templates/_header_bar.html:37 +#: templates/_header_bar.html:36 msgid "Admin page" msgstr "管理页面" -#: templates/_header_bar.html:39 +#: templates/_header_bar.html:38 msgid "User page" msgstr "用户页面" -#: templates/_header_bar.html:42 +#: templates/_header_bar.html:41 msgid "Logout" msgstr "注销登录" -#: templates/_header_bar.html:46 users/templates/users/login.html:42 +#: templates/_header_bar.html:45 users/templates/users/login.html:42 #: users/templates/users/login.html:61 msgid "Login" msgstr "登录" -#: templates/_header_bar.html:59 templates/_nav.html:4 +#: templates/_header_bar.html:58 templates/_nav.html:4 msgid "Dashboard" msgstr "仪表盘" @@ -1999,7 +1993,7 @@ msgstr "在线会话" msgid "Session offline" msgstr "离线会话" -#: templates/_nav.html:53 terminal/models.py:130 +#: templates/_nav.html:53 terminal/models.py:122 #: terminal/templates/terminal/command_list.html:55 #: terminal/templates/terminal/command_list.html:71 #: terminal/templates/terminal/session_detail.html:48 @@ -2040,64 +2034,68 @@ msgstr "输出" msgid "Session" msgstr "会话" -#: terminal/forms.py:15 +#: terminal/forms.py:27 msgid "Coco ssh listen port" msgstr "SSH 监听端口" -#: terminal/forms.py:16 +#: terminal/forms.py:28 msgid "Coco http/ws listen port" msgstr "Http/Websocket 监听端口" -#: terminal/models.py:24 +#: terminal/models.py:16 msgid "Remote Address" msgstr "远端地址" -#: terminal/models.py:25 +#: terminal/models.py:17 msgid "SSH Port" msgstr "SSH端口" -#: terminal/models.py:26 +#: terminal/models.py:18 msgid "HTTP Port" msgstr "HTTP端口" -#: terminal/models.py:99 +#: terminal/models.py:20 +msgid "Replay storage" +msgstr "录像存储" + +#: terminal/models.py:91 msgid "Session Online" msgstr "在线会话" -#: terminal/models.py:100 +#: terminal/models.py:92 msgid "CPU Usage" msgstr "CPU使用" -#: terminal/models.py:101 +#: terminal/models.py:93 msgid "Memory Used" msgstr "内存使用" -#: terminal/models.py:102 +#: terminal/models.py:94 msgid "Connections" msgstr "连接数" -#: terminal/models.py:103 +#: terminal/models.py:95 msgid "Threads" msgstr "线程数" -#: terminal/models.py:104 +#: terminal/models.py:96 msgid "Boot Time" msgstr "运行时间" -#: terminal/models.py:127 terminal/templates/terminal/session_list.html:74 +#: terminal/models.py:119 terminal/templates/terminal/session_list.html:74 #: terminal/templates/terminal/terminal_detail.html:47 msgid "Remote addr" msgstr "远端地址" -#: terminal/models.py:129 terminal/templates/terminal/session_list.html:100 +#: terminal/models.py:121 terminal/templates/terminal/session_list.html:100 msgid "Replay" msgstr "回放" -#: terminal/models.py:133 +#: terminal/models.py:125 msgid "Date end" msgstr "结束日期" -#: terminal/models.py:150 +#: terminal/models.py:142 msgid "Args" msgstr "参数" @@ -2451,7 +2449,7 @@ msgstr "忘记密码" #: users/templates/users/forgot_password.html:33 msgid "Input your email, that will send a mail to your" -msgstr "输入您的邮箱, 将会发一封重置短信邮件到您的邮箱中" +msgstr "输入您的邮箱, 将会发一封重置邮件到您的邮箱中" #: users/templates/users/login.html:47 msgid "Captcha invalid" @@ -2520,10 +2518,8 @@ msgid "An e-mail has been sent to the user\\'s mailbox." msgstr "已发送邮件到用户邮箱" #: users/templates/users/user_detail.html:334 -msgid "" -"This will reset the user's password. A password-reset email will be sent to " -"the user\\'s mailbox." -msgstr "重设密码邮件将会发送到用户邮箱" +msgid "This will reset the user password and send a reset mail" +msgstr "将失效用户当前密码，并发送重设密码邮件到用户邮箱" #: users/templates/users/user_detail.html:348 msgid "" @@ -2537,8 +2533,8 @@ msgid "Reset SSH public key" msgstr "重置SSH密钥" #: users/templates/users/user_detail.html:359 -msgid "This will reset the user\\" -msgstr "重置" +msgid "This will reset the user public key and send a reset mail" +msgstr "将会失效用户当前秘钥，并发送重置邮件到用户邮箱" #: users/templates/users/user_detail.html:376 #: users/templates/users/user_profile.html:170 @@ -2860,6 +2856,15 @@ msgstr "密码更新" msgid "Public key update" msgstr "秘钥更新" +#~ msgid "Add command storage" +#~ msgstr "添加命令存储" + +#~ msgid "Welcome to use Jumpserver system" +#~ msgstr "欢迎使用Jumpserver开源跳板机系统" + +#~ msgid "This will reset the user\\" +#~ msgstr "重置" + #~ msgid "Enable LDAP Auth" #~ msgstr "LDAP认证" diff --git a/apps/static/css/jumpserver.css b/apps/static/css/jumpserver.css index 28fe88b68..999fe5810 100644 --- a/apps/static/css/jumpserver.css +++ b/apps/static/css/jumpserver.css @@ -303,7 +303,7 @@ div.dataTables_wrapper div.dataTables_filter { .profile-element div:first-child { line-height: 60px; - width: 70px; + /*width: 70px;*/ float: left; text-align: center; } diff --git a/apps/templates/_footer.html b/apps/templates/_footer.html index 9ce501444..b2c106f50 100644 --- a/apps/templates/_footer.html +++ b/apps/templates/_footer.html @@ -4,6 +4,6 @@
- Copyright 北京堆栈科技有限公司 © 2014-2017 + Copyright 北京堆栈科技有限公司 © 2014-2018
\ No newline at end of file diff --git a/apps/templates/flash_message_standalone.html b/apps/templates/flash_message_standalone.html index c5d489b5f..539ab5429 100644 --- a/apps/templates/flash_message_standalone.html +++ b/apps/templates/flash_message_standalone.html @@ -52,7 +52,7 @@ Copyright Jumpserver.org
- 2014-2017 + 2014-2018
diff --git a/apps/templates/index.html b/apps/templates/index.html index 5ddbc17ab..cd52ab07e 100644 --- a/apps/templates/index.html +++ b/apps/templates/index.html @@ -163,9 +163,6 @@ {% if last_login_ten %} {% for login in last_login_ten %}
- - image -
{% ifequal login.is_finished 0 %} {{ login.date_start|timesince }} ago diff --git a/apps/users/hands.py b/apps/users/hands.py index bf47d775a..56435a5a4 100644 --- a/apps/users/hands.py +++ b/apps/users/hands.py @@ -6,7 +6,7 @@ Other module of this app shouldn't connect with other app. - :copyright: (c) 2014-2017 by Jumpserver Team. + :copyright: (c) 2014-2018 by Jumpserver Team. :license: GPL v2, see LICENSE for more details. """ diff --git a/apps/users/templates/users/forgot_password.html b/apps/users/templates/users/forgot_password.html index 2788ba580..1a5a9fb77 100644 --- a/apps/users/templates/users/forgot_password.html +++ b/apps/users/templates/users/forgot_password.html @@ -55,7 +55,7 @@ Copyright Jumpserver.org
- © 2014-2017 + © 2014-2018
diff --git a/apps/users/templates/users/login.html b/apps/users/templates/users/login.html index 284b6bc43..1259ba773 100644 --- a/apps/users/templates/users/login.html +++ b/apps/users/templates/users/login.html @@ -78,7 +78,7 @@ Copyright Jumpserver.org
- © 2014-2017 + © 2014-2018
diff --git a/apps/users/templates/users/reset_password.html b/apps/users/templates/users/reset_password.html index cf8003a86..9033a4c9e 100644 --- a/apps/users/templates/users/reset_password.html +++ b/apps/users/templates/users/reset_password.html @@ -74,7 +74,7 @@ Copyright Jumpserver.org
- © 2014-2017 + © 2014-2018
diff --git a/apps/users/templates/users/user_detail.html b/apps/users/templates/users/user_detail.html index 78c5ac542..4eb283375 100644 --- a/apps/users/templates/users/user_detail.html +++ b/apps/users/templates/users/user_detail.html @@ -24,8 +24,9 @@
  • {% trans 'Update' %}
    • +
  • - + {% trans 'Delete' %}
    • @@ -128,7 +129,7 @@
    - +