From 0facd8a25e2e3a515833e935dca56b4f8a5857c3 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 10 Nov 2021 18:15:46 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=8E=BB=E6=8E=89=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E7=9A=84=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/conf.py | 1 - apps/locale/zh/LC_MESSAGES/django.po | 42 ++++++++++++++++++++++++---- apps/settings/serializers/other.py | 8 ++---- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py index 1f8f42980..c634ca723 100644 --- a/apps/jumpserver/conf.py +++ b/apps/jumpserver/conf.py @@ -358,7 +358,6 @@ class Config(dict): # 导航栏 帮助 'HELP_DOCUMENT_URL': 'http://docs.jumpserver.org', 'HELP_SUPPORT_URL': 'http://www.jumpserver.org/support/', - 'OFFICIAL_WEBSITE_URL': 'http://www.jumpserver.org', 'TICKETS_ENABLED': True, 'FORGOT_PASSWORD_URL': '', diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index c29febe61..4305720a7 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-11-10 10:53+0800\n" +"POT-Creation-Date: 2021-11-10 17:18+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -1495,7 +1495,7 @@ msgstr "{ApplicationPermission} 移除 {SystemUser}" msgid "Invalid token" msgstr "无效的令牌" -#: authentication/api/mfa.py:102 +#: authentication/api/mfa.py:103 #, fuzzy #| msgid "Code is invalid, " msgid "Code is invalid" @@ -3247,8 +3247,36 @@ msgid "The shell type used when Windows assets perform ansible tasks" msgstr "windows 资产执行 Ansible 任务时，使用的 Shell 类型。" #: settings/serializers/other.py:29 +msgid "Perm ungroup node" +msgstr "授权未分组节点" + +#: settings/serializers/other.py:30 msgid "Perm single to ungroup node" -msgstr "直接授权资产放在未分组节点" +msgstr "授权未分组节点" + +#: settings/serializers/other.py:34 +msgid "Help Docs URL" +msgstr "" + +#: settings/serializers/other.py:35 +msgid "default: http://docs.jumpserver.org" +msgstr "默认: http://dev.jumpserver.org:8080" + +#: settings/serializers/other.py:39 +msgid "Help Support URL" +msgstr "支持链接" + +#: settings/serializers/other.py:40 +msgid "default: http://www.jumpserver.org/support/" +msgstr "默认: http://www.jumpserver.org/support/" + +#: settings/serializers/other.py:44 +msgid "Help Website URL" +msgstr "官网链接" + +#: settings/serializers/other.py:45 +msgid "default: http://www.jumpserver.org" +msgstr "如: http://dev.jumpserver.org:8080" #: settings/serializers/security.py:8 msgid "Password minimum length" @@ -3457,7 +3485,9 @@ msgid "" "The system determines whether the login IP address belongs to a common login " "city. If the account is logged in from a common login city, the system sends " "a remote login reminder" -msgstr "根据登录IP是否所属常用登录城市进行判断，若账号在非常用城市登录，会发送异地登录提醒" +msgstr "" +"根据登录IP是否所属常用登录城市进行判断，若账号在非常用城市登录，会发送异地登" +"录提醒" #: settings/serializers/sms.py:7 msgid "Label" @@ -3773,11 +3803,11 @@ msgstr "" msgid "Send verification code" msgstr "发送验证码" -#: templates/_mfa_login_field.html:91 +#: templates/_mfa_login_field.html:92 msgid "Wait: " msgstr "等待：" -#: templates/_mfa_login_field.html:101 +#: templates/_mfa_login_field.html:102 msgid "The verification code has been sent" msgstr "验证码已发送" diff --git a/apps/settings/serializers/other.py b/apps/settings/serializers/other.py index 4341b6bb9..7d701756c 100644 --- a/apps/settings/serializers/other.py +++ b/apps/settings/serializers/other.py @@ -26,7 +26,8 @@ class OtherSettingSerializer(serializers.Serializer): ) PERM_SINGLE_ASSET_TO_UNGROUP_NODE = serializers.BooleanField( - required=False, label=_("Perm single to ungroup node") + required=False, label=_("Perm ungroup node"), + help_text=_("Perm single to ungroup node") ) HELP_DOCUMENT_URL = serializers.URLField( @@ -39,11 +40,6 @@ class OtherSettingSerializer(serializers.Serializer): help_text=_('default: http://www.jumpserver.org/support/') ) - OFFICIAL_WEBSITE_URL = serializers.URLField( - required=False, allow_blank=True, allow_null=True, label=_("Help Website URL"), - help_text=_('default: http://www.jumpserver.org') - ) - # 准备废弃 # PERIOD_TASK_ENABLED = serializers.BooleanField( # required=False, label=_("Enable period task")