From 8e84efb2963c879849cb95cb715c6b17e01e3645 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 17 Mar 2020 13:51:41 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=96=87=E6=A1=88=E5=92=8C=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/backends/db.py | 5 +-- apps/locale/zh/LC_MESSAGES/django.mo | Bin 88260 -> 88806 bytes apps/locale/zh/LC_MESSAGES/django.po | 34 +++++++++++------- .../templates/terminal/session_detail.html | 2 +- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/apps/assets/backends/db.py b/apps/assets/backends/db.py index 7cdba2754..35be8b9fd 100644 --- a/apps/assets/backends/db.py +++ b/apps/assets/backends/db.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # +from django.utils.translation import ugettext as _ from functools import reduce from django.db.models import F, CharField, Value, IntegerField, Q, Count from django.db.models.functions import Concat @@ -240,7 +241,7 @@ class AdminUserBackend(DBBackend): ) def _perform_delete_by_union_id(self, union_id_cleaned): - raise PermissionError("Could remove asset admin user") + raise PermissionError(_("Could not remove asset admin user")) def all(self): qs = self.model.objects.all().annotate( @@ -301,7 +302,7 @@ class AuthbookBackend(DBBackend): authbook_id, asset_id = union_id_cleaned authbook = get_object_or_none(AuthBook, pk=authbook_id) if authbook.is_latest: - raise PermissionError("Latest version could be delete") + raise PermissionError(_("Latest version could not be delete")) AuthBook.objects.filter(id=authbook_id).delete() def all(self): diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index f9e23c2815041175cc8508df4de51afe51ad7646..b952d9ab4f927284d0409b7b1971b1108d3c5829 100644 GIT binary patch delta 27492 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 J^Nh&;e*pc`hQ|N^ delta 26858 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 cB|Z0nEA`7t2&Z4FPi diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 7356b96e3..27dc9addd 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-03-12 17:27+0800\n" +"POT-Creation-Date: 2020-03-17 13:50+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -535,7 +535,7 @@ msgstr "详情" #: xpack/plugins/cloud/templates/cloud/account_detail.html:20 #: xpack/plugins/cloud/templates/cloud/account_list.html:40 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:26 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:57 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:60 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:46 #: xpack/plugins/orgs/templates/orgs/org_detail.html:20 #: xpack/plugins/orgs/templates/orgs/org_list.html:93 @@ -587,7 +587,7 @@ msgstr "更新" #: xpack/plugins/cloud/templates/cloud/account_detail.html:24 #: xpack/plugins/cloud/templates/cloud/account_list.html:42 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:30 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:58 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:61 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:47 #: xpack/plugins/orgs/templates/orgs/org_detail.html:24 #: xpack/plugins/orgs/templates/orgs/org_list.html:95 @@ -727,6 +727,14 @@ msgstr "不能修改根节点名称" msgid "Deletion failed and the node contains children or assets" msgstr "删除失败,节点包含子节点或资产" +#: assets/backends/db.py:244 +msgid "Could not remove asset admin user" +msgstr "不能移除资产的管理用户账号" + +#: assets/backends/db.py:305 +msgid "Latest version could not be delete" +msgstr "最新版本的不能被删除" + #: assets/forms/asset.py:83 assets/models/asset.py:196 #: assets/models/user.py:109 assets/templates/assets/asset_detail.html:186 #: assets/templates/assets/asset_detail.html:194 @@ -3169,23 +3177,23 @@ msgstr "{} 任务结束" msgid "Result" msgstr "结果" -#: ops/models/command.py:59 +#: ops/models/command.py:64 msgid "Task start" msgstr "任务开始" -#: ops/models/command.py:81 +#: ops/models/command.py:86 msgid "Command `{}` is forbidden ........" msgstr "命令 `{}` 不允许被执行 ......." -#: ops/models/command.py:88 +#: ops/models/command.py:93 msgid "Task end" msgstr "任务结束" -#: ops/tasks.py:63 +#: ops/tasks.py:65 msgid "Clean task history period" msgstr "定期清除任务历史" -#: ops/tasks.py:76 +#: ops/tasks.py:78 msgid "Clean celery log period" msgstr "定期清除Celery日志" @@ -3349,6 +3357,7 @@ msgstr "结束" #: ops/templates/ops/task_adhoc.html:17 ops/templates/ops/task_detail.html:18 #: ops/templates/ops/task_history.html:17 ops/views/adhoc.py:50 +#: ops/views/adhoc.py:92 msgid "Task detail" msgstr "任务详情" @@ -3383,7 +3392,7 @@ msgstr "内容" #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:135 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:54 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:138 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:55 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:58 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:44 msgid "Run" msgstr "执行" @@ -4261,7 +4270,9 @@ msgid "Please enter Password: {}" msgstr "请输入密码: {}" #: settings/utils/ldap.py:420 -msgid "Please enter correct Bind DN and Password: {}" +#, fuzzy +#| msgid "Please enter correct Bind DN and Password: {}" +msgid "Please enter Correct Bind DN and Password: {}" msgstr "请输入正确的绑定DN和密码: {}" #: settings/utils/ldap.py:438 @@ -4970,7 +4981,6 @@ msgid "Session detail" msgstr "会话详情" #: terminal/templates/terminal/session_commands.html:29 -#: terminal/templates/terminal/session_detail.html:29 #: terminal/views/command.py:22 msgid "Command list" msgstr "命令记录列表" @@ -6575,7 +6585,7 @@ msgid "Run task manually" msgstr "手动执行任务" #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:178 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:99 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:102 msgid "Sync success" msgstr "同步成功" diff --git a/apps/terminal/templates/terminal/session_detail.html b/apps/terminal/templates/terminal/session_detail.html index 26ec1c785..1863ad75f 100644 --- a/apps/terminal/templates/terminal/session_detail.html +++ b/apps/terminal/templates/terminal/session_detail.html @@ -26,7 +26,7 @@
- {% trans 'Command list' %} + {{ object.id }}