From 670e2d735233e191ac412b609bb9af1ba1dbeba7 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 13 Jan 2020 14:13:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 83858 -> 84067 bytes apps/locale/zh/LC_MESSAGES/django.po | 55 +++++++++++++-------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 620d6fcb12491d7ee0371ba4824a5a3e2a74c232..6f040304477f8cdaeba6b7a9ab150f67988f978a 100644 GIT binary patch delta 24933 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 G{r>=-oUJ_o delta 24755 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 19aa56f8c..b1223a368 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-06 11:35+0800\n" +"POT-Creation-Date: 2020-01-13 14:10+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -109,7 +109,7 @@ msgstr "运行参数" #: applications/templates/applications/user_database_app_list.html:16 #: applications/templates/applications/user_remote_app_list.html:16 #: assets/forms/asset.py:20 assets/forms/domain.py:77 assets/forms/user.py:74 -#: assets/forms/user.py:94 assets/models/asset.py:144 assets/models/base.py:27 +#: assets/forms/user.py:94 assets/models/asset.py:144 assets/models/base.py:28 #: 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 @@ -226,7 +226,7 @@ msgstr "数据库" #: applications/templates/applications/user_database_app_list.html:20 #: applications/templates/applications/user_remote_app_list.html:19 #: assets/models/asset.py:149 assets/models/asset.py:225 -#: assets/models/base.py:32 assets/models/cluster.py:29 +#: assets/models/base.py:33 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 #: assets/models/group.py:23 assets/models/label.py:23 @@ -306,7 +306,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:223 assets/models/base.py:35 +#: assets/models/asset.py:223 assets/models/base.py:36 #: 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 @@ -333,7 +333,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:224 assets/models/base.py:33 +#: assets/models/asset.py:224 assets/models/base.py:34 #: 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 @@ -708,6 +708,10 @@ msgstr "远程应用详情" msgid "My RemoteApp" msgstr "我的远程应用" +#: assets/api/admin_user.py:59 +msgid "Deleted failed, There are related assets" +msgstr "删除失败,存在关联资产" + #: assets/api/node.py:61 msgid "You can't update the root node name" msgstr "不能修改根节点名称" @@ -825,7 +829,7 @@ msgid "SSH gateway support proxy SSH,RDP,VNC" msgstr "SSH网关,支持代理SSH,RDP和VNC" #: assets/forms/domain.py:78 assets/forms/user.py:75 assets/forms/user.py:95 -#: assets/models/base.py:28 assets/models/gathered_user.py:15 +#: assets/models/base.py:29 assets/models/gathered_user.py:15 #: assets/templates/assets/_asset_user_auth_update_modal.html:15 #: assets/templates/assets/_asset_user_auth_view_modal.html:21 #: assets/templates/assets/_asset_user_list.html:21 @@ -888,7 +892,7 @@ msgstr "基础平台" msgid "Password or private key passphrase" msgstr "密码或密钥密码" -#: assets/forms/user.py:26 assets/models/base.py:29 +#: assets/forms/user.py:26 assets/models/base.py:30 #: assets/serializers/asset_user.py:63 #: assets/templates/assets/_asset_user_auth_update_modal.html:21 #: assets/templates/assets/_asset_user_auth_view_modal.html:27 @@ -1006,6 +1010,7 @@ msgstr "主机名" #: assets/templates/assets/domain_gateway_list.html:65 #: assets/templates/assets/system_user_detail.html:67 #: assets/templates/assets/system_user_list.html:26 +#: terminal/forms/storage.py:152 #: terminal/templates/terminal/session_list.html:29 #: terminal/templates/terminal/session_list.html:73 msgid "Protocol" @@ -1110,17 +1115,17 @@ msgstr "版本" msgid "AuthBook" msgstr "" -#: assets/models/base.py:30 xpack/plugins/change_auth_plan/models.py:99 +#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:99 #: xpack/plugins/change_auth_plan/models.py:270 msgid "SSH private key" msgstr "ssh密钥" -#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:102 +#: assets/models/base.py:32 xpack/plugins/change_auth_plan/models.py:102 #: xpack/plugins/change_auth_plan/models.py:266 msgid "SSH public key" msgstr "ssh公钥" -#: assets/models/base.py:34 assets/models/gathered_user.py:20 +#: assets/models/base.py:35 assets/models/gathered_user.py:20 #: assets/templates/assets/cmd_filter_detail.html:68 common/mixins/models.py:52 #: ops/models/adhoc.py:49 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:107 @@ -3117,7 +3122,7 @@ msgstr "执行历史" #: ops/templates/ops/adhoc_detail.html:51 #: ops/templates/ops/command_execution_list.html:65 #: ops/templates/ops/task_adhoc.html:57 ops/templates/ops/task_list.html:13 -#: terminal/forms/storage.py:152 +#: terminal/forms/storage.py:158 msgid "Hosts" msgstr "主机" @@ -3223,33 +3228,33 @@ msgstr "任务列表" msgid "Go" msgstr "" -#: ops/templates/ops/command_execution_create.html:185 +#: ops/templates/ops/command_execution_create.html:179 msgid "Selected assets" msgstr "已选择资产" -#: ops/templates/ops/command_execution_create.html:188 +#: ops/templates/ops/command_execution_create.html:182 msgid "In total" msgstr "总共" -#: ops/templates/ops/command_execution_create.html:225 +#: ops/templates/ops/command_execution_create.html:219 msgid "" "Select the left asset, select the running system user, execute command in " "batch" msgstr "选择左侧资产, 选择运行的系统用户,批量执行命令" -#: ops/templates/ops/command_execution_create.html:269 +#: ops/templates/ops/command_execution_create.html:263 msgid "Unselected assets" msgstr "没有选中资产" -#: ops/templates/ops/command_execution_create.html:273 +#: ops/templates/ops/command_execution_create.html:267 msgid "No input command" msgstr "没有输入命令" -#: ops/templates/ops/command_execution_create.html:277 +#: ops/templates/ops/command_execution_create.html:271 msgid "No system user was selected" msgstr "没有选择系统用户" -#: ops/templates/ops/command_execution_create.html:287 +#: ops/templates/ops/command_execution_create.html:281 msgid "Pending" msgstr "等待" @@ -4627,7 +4632,7 @@ msgstr "" msgid "Region" msgstr "地域" -#: terminal/forms/storage.py:154 +#: terminal/forms/storage.py:160 msgid "" "\n" " Tips: If there are multiple hosts, separate them with a comma " @@ -4642,11 +4647,11 @@ msgstr "" " eg: http://www.jumpserver.a.com,http://www.jumpserver.b.com\n" " " -#: terminal/forms/storage.py:162 +#: terminal/forms/storage.py:168 msgid "Index" msgstr "索引" -#: terminal/forms/storage.py:165 +#: terminal/forms/storage.py:171 msgid "Doc type" msgstr "文档类型" @@ -6416,8 +6421,6 @@ msgid "Assets is empty, please change nodes" msgstr "资产为空,请更改节点" #: xpack/plugins/gathered_user/templates/gathered_user/gathered_user_list.html:224 -#, fuzzy -#| msgid "Asset users of" msgid "Asset user" msgstr "资产用户" @@ -6530,10 +6533,8 @@ msgid "Enterprise edition" msgstr "企业版" #: xpack/plugins/license/models.py:78 -#, fuzzy -#| msgid "Enterprise edition" msgid "Ultimate edition" -msgstr "企业版" +msgstr "旗舰版" #: xpack/plugins/license/templates/license/_license_import_modal.html:4 #: xpack/plugins/license/templates/license/license_detail.html:86 @@ -6653,8 +6654,6 @@ msgid "Import vault" msgstr "导入密码" #: xpack/plugins/vault/templates/vault/vault.html:66 -#, fuzzy -#| msgid "Vault" msgid "vault" msgstr "密码匣子" From 63746accf9f992a9cc934ea8adb768a009e30e8f Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 13 Jan 2020 14:23:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9js=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=AF=AD=E8=A8=80=E4=B8=BA=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/static/js/jumpserver.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js index 914390321..782182c18 100644 --- a/apps/static/js/jumpserver.js +++ b/apps/static/js/jumpserver.js @@ -1396,8 +1396,8 @@ function showCeleryTaskLog(taskId) { } function getUserLang(){ - let userLangZh = document.cookie.indexOf('django_language=zh'); - if (userLangZh !== -1){ + let userLangZh = document.cookie.indexOf('django_language=en'); + if (userLangZh === -1){ return 'zh-CN' } else{