From e0a8f9174157138c794a94f1602a5a92f23425c4 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 28 Sep 2021 18:57:21 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=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 | 57 +++++++++++++++------------- apps/settings/serializers/basic.py | 2 +- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 81e248ee4..edcdc9bc1 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-28 16:34+0800\n" +"POT-Creation-Date: 2021-09-28 18:47+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -658,7 +658,7 @@ msgstr "复核" msgid "Filter" msgstr "过滤器" -#: assets/models/cmd_filter.py:56 settings/serializers/basic.py:7 +#: assets/models/cmd_filter.py:56 settings/serializers/basic.py:10 #: xpack/plugins/license/models.py:29 msgid "Content" msgstr "内容" @@ -1132,7 +1132,7 @@ msgstr "修改者" msgid "Disabled" msgstr "禁用" -#: audits/models.py:96 settings/models.py:33 settings/serializers/basic.py:12 +#: audits/models.py:96 settings/models.py:33 msgid "Enabled" msgstr "启用" @@ -2606,7 +2606,7 @@ msgstr "企业微信 认证" msgid "SSO Auth" msgstr "SSO Token 认证" -#: settings/serializers/auth/base.py:19 settings/serializers/basic.py:30 +#: settings/serializers/auth/base.py:19 settings/serializers/basic.py:36 msgid "Forgot password url" msgstr "忘记密码 URL" @@ -2852,31 +2852,31 @@ msgstr "单位: 秒" msgid "Enable WeCom Auth" msgstr "启用企业微信认证" -#: settings/serializers/basic.py:6 +#: settings/serializers/basic.py:9 msgid "Subject" msgstr "主题" -#: settings/serializers/basic.py:10 +#: settings/serializers/basic.py:13 msgid "More url" msgstr "更多信息链接" -#: settings/serializers/basic.py:22 +#: settings/serializers/basic.py:28 msgid "Site url" msgstr "当前站点URL" -#: settings/serializers/basic.py:23 +#: settings/serializers/basic.py:29 msgid "eg: http://dev.jumpserver.org:8080" msgstr "如: http://dev.jumpserver.org:8080" -#: settings/serializers/basic.py:26 +#: settings/serializers/basic.py:32 msgid "User guide url" msgstr "用户向导URL" -#: settings/serializers/basic.py:27 +#: settings/serializers/basic.py:33 msgid "User first login update profile done redirect to it" msgstr "用户第一次登录，修改profile后重定向到地址, 可以是 wiki 或 其他说明文档" -#: settings/serializers/basic.py:31 +#: settings/serializers/basic.py:37 msgid "" "The forgot password url on login page, If you use ldap or cas external " "authentication, you can set it" @@ -2884,19 +2884,23 @@ msgstr "" "登录页面忘记密码URL, 如果使用了 LDAP, OPENID 等外部认证系统，可以自定义用户重" "置密码访问的地址" -#: settings/serializers/basic.py:35 +#: settings/serializers/basic.py:41 msgid "Global organization name" msgstr "全局组织名" -#: settings/serializers/basic.py:36 +#: settings/serializers/basic.py:42 msgid "The name of global organization to display" msgstr "全局组织的显示名称，默认为 全局组织" -#: settings/serializers/basic.py:38 -msgid "Announcement enabled" +#: settings/serializers/basic.py:44 +msgid "Enable tickets" +msgstr "启用工单" + +#: settings/serializers/basic.py:45 +msgid "Enable announcement" msgstr "启用公告" -#: settings/serializers/basic.py:39 +#: settings/serializers/basic.py:46 msgid "Announcement" msgstr "公告" @@ -3021,35 +3025,31 @@ msgid "" "This is used by default if no email is returned during SSO authentication" msgstr "SSO认证时，如果没有返回邮件地址，将使用该后缀" -#: settings/serializers/other.py:10 -msgid "Enable tickets" -msgstr "启用工单系统" - -#: settings/serializers/other.py:13 +#: settings/serializers/other.py:12 msgid "OTP issuer name" msgstr "OTP 扫描后的名称" -#: settings/serializers/other.py:17 +#: settings/serializers/other.py:16 msgid "OTP valid window" msgstr "OTP 延迟有效次数" -#: settings/serializers/other.py:22 +#: settings/serializers/other.py:21 msgid "CMD" msgstr "" -#: settings/serializers/other.py:23 +#: settings/serializers/other.py:22 msgid "PowerShell" msgstr "" -#: settings/serializers/other.py:25 +#: settings/serializers/other.py:24 msgid "Shell (Windows)" msgstr "Shell（Windows 资产）" -#: settings/serializers/other.py:26 +#: settings/serializers/other.py:25 msgid "The shell type used when Windows assets perform ansible tasks" msgstr "windows 资产执行 Ansible 任务时，使用的 Shell 类型。" -#: settings/serializers/other.py:30 +#: settings/serializers/other.py:29 msgid "Perm single to ungroup node" msgstr "直接授权资产放在未分组节点" @@ -6261,6 +6261,9 @@ msgstr "旗舰版" msgid "Community edition" msgstr "社区版" +#~ msgid "Announcement enabled" +#~ msgstr "启用公告" + #~ msgid "LA-Mexico City1" #~ msgstr "拉美-墨西哥城一" diff --git a/apps/settings/serializers/basic.py b/apps/settings/serializers/basic.py index 4c5ce409a..4f38e2fd5 100644 --- a/apps/settings/serializers/basic.py +++ b/apps/settings/serializers/basic.py @@ -42,5 +42,5 @@ class BasicSettingSerializer(serializers.Serializer): help_text=_('The name of global organization to display') ) TICKETS_ENABLED = serializers.BooleanField(required=False, default=True, label=_("Enable tickets")) - ANNOUNCEMENT_ENABLED = serializers.BooleanField(label=_('Announcement enabled'), default=True) + ANNOUNCEMENT_ENABLED = serializers.BooleanField(label=_('Enable announcement'), default=True) ANNOUNCEMENT = AnnouncementSerializer(label=_("Announcement"))