From 45aefa6b7553a22e239d0134ce3f3ba902439d42 Mon Sep 17 00:00:00 2001 From: xinwen Date: Wed, 15 Sep 2021 20:51:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.po | 10 +++++++++- apps/terminal/serializers/session.py | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index dcba19f91..830ccace5 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-15 19:29+0800\n" +"POT-Creation-Date: 2021-09-15 20:51+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -4194,6 +4194,14 @@ msgstr "是否可重放" msgid "Can join" msgstr "是否可加入" +#: terminal/serializers/session.py:40 +msgid "Can terminate" +msgstr "是否可中断" + +#: terminal/serializers/session.py:50 +msgid "Command amount" +msgstr "命令数量" + #: terminal/serializers/storage.py:21 msgid "Endpoint invalid: remove path `{}`" msgstr "端点无效: 移除路径 `{}`" diff --git a/apps/terminal/serializers/session.py b/apps/terminal/serializers/session.py index 083a57fcf..fdf130210 100644 --- a/apps/terminal/serializers/session.py +++ b/apps/terminal/serializers/session.py @@ -37,6 +37,7 @@ class SessionSerializer(BulkOrgResourceModelSerializer): 'can_join': {'label': _('Can join')}, 'terminal': {'label': _('Terminal')}, 'is_finished': {'label': _('Is finished')}, + 'can_terminate': {'label': _('Can terminate')}, } @@ -45,6 +46,9 @@ class SessionDisplaySerializer(SessionSerializer): class Meta(SessionSerializer.Meta): fields = SessionSerializer.Meta.fields + ['command_amount'] + extra_kwargs = { + 'command_amount': {'label': _('Command amount')}, + } class ReplaySerializer(serializers.Serializer):