From ab29df5991d6e133724dfe49509ff47a94f2df0a Mon Sep 17 00:00:00 2001 From: wangruidong <940853815@qq.com> Date: Fri, 13 Sep 2024 19:02:50 +0800 Subject: [PATCH] fix: command search input error --- apps/i18n/core/zh/LC_MESSAGES/django.po | 41 ++++++++++++++----------- apps/users/tasks.py | 4 +-- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 1138d59e2..c5644a78e 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/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: 2024-09-13 17:38+0800\n" +"POT-Creation-Date: 2024-09-13 18:57+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -853,6 +853,11 @@ msgstr "参数" msgid "Exist policy" msgstr "账号存在策略" +#: accounts/serializers/account/account.py:181 +#: accounts/serializers/account/account.py:339 +msgid "Account already exists" +msgstr "账号已存在" + #: accounts/serializers/account/account.py:206 assets/models/label.py:21 #: assets/models/platform.py:95 assets/serializers/asset/common.py:145 #: assets/serializers/cagegory.py:12 assets/serializers/platform.py:168 @@ -913,10 +918,6 @@ msgstr "已修改" msgid "Assets" msgstr "资产" -#: accounts/serializers/account/account.py:339 -msgid "Account already exists" -msgstr "账号已存在" - #: accounts/serializers/account/account.py:389 #, python-format msgid "Asset does not support this secret type: %s" @@ -5065,7 +5066,7 @@ msgid "" " of scheduled tasks will be updated" msgstr "" "随着版本迭代，可能会新增任务或者修改任务的名称，执行时间，所以在系统启动" -"时，，将会注册任务或者更新定时任务参数" +"时，将会注册任务或者更新定时任务参数" #: ops/tasks.py:140 msgid "Periodic check service performance" @@ -5112,7 +5113,7 @@ msgid "" "Regular clean-up - \n" " Job execution retention days'" msgstr "" -"由于作业中心执行快捷命令，playbook，会产生j执行记录，系统会根据系统设置-任务" +"由于作业中心执行快捷命令，playbook，会产生执行记录，系统会根据系统设置-任务" "列表-定期清理-作业中心执行历史配置，每天凌晨2点对超出保存时间的记录进行清理" #: ops/templates/ops/celery_task_log.html:4 @@ -9326,10 +9327,10 @@ msgstr "校验用户已过期" #: users/tasks.py:69 msgid "" -"Check every day at 10 AM whether the users in the system are expired, and " +"Check every day at 2 p.m whether the users in the system are expired, and " "send a \n" " notification 5 days in advance" -msgstr "每天上午10点检查，系统中的用户是否过期，提前5天发送通知" +msgstr "每天下午2点检查，系统中的用户是否过期，提前5天发送通知" #: users/tasks.py:90 msgid "Periodic check user expired" @@ -9352,13 +9353,13 @@ msgstr "检查未使用的用户" #: users/tasks.py:113 msgid "" -"At 2 a.m. every day, according to the configuration in \"System Settings - " +"At 2 p.m. every day, according to the configuration in \"System Settings - " "Security - \n" " Auth security - Auto disable threshold\" users who have not logged " "in or whose API keys \n" " have not been used for a long time will be disabled" msgstr "" -"每天凌晨2点，根据系统配置-安全设置-不活跃用户自动禁用配置，对长时间不登录或" +"每天下午2点，根据系统配置-安全设置-不活跃用户自动禁用配置，对长时间不登录或" "api_key不使用的用户进行禁用" #: users/tasks.py:157 @@ -10327,21 +10328,25 @@ msgstr "实例个数" #: xpack/plugins/cloud/tasks.py:33 msgid "" -"Execute this task when manually or scheduled cloud synchronization tasks are " -"performed" +"\n" +" Execute this task when manually or scheduled cloud synchronization " +"tasks are performed\n" +" " msgstr "手动，定时执行云同步任务时执行该任务" -#: xpack/plugins/cloud/tasks.py:50 +#: xpack/plugins/cloud/tasks.py:52 msgid "Period clean sync instance task execution" msgstr "定期清除同步实例任务执行记录" -#: xpack/plugins/cloud/tasks.py:52 +#: xpack/plugins/cloud/tasks.py:54 msgid "" -"Every day, according to the configuration in \"System Settings - Tasks - " -"Regular \n" +"\n" +" Every day, according to the configuration in \"System Settings - " +"Tasks - Regular \n" " clean-up - Cloud sync task history retention days\" the system will " "clean up the execution \n" -" records generated by cloud synchronization" +" records generated by cloud synchronization\n" +" " msgstr "" "每天根据系统设置-任务列表-定期清理配置-云同步记录配置，对云同步产生的执行记录" "进行清理" diff --git a/apps/users/tasks.py b/apps/users/tasks.py index 97526f1df..d84de6727 100644 --- a/apps/users/tasks.py +++ b/apps/users/tasks.py @@ -66,7 +66,7 @@ def check_password_expired_periodic(): @shared_task( verbose_name=_('Check user expired'), description=_( - """Check every day at 10 AM whether the users in the system are expired, and send a + """Check every day at 2 p.m whether the users in the system are expired, and send a notification 5 days in advance""" ) ) @@ -110,7 +110,7 @@ def check_user_expired_periodic(): @shared_task( verbose_name=_('Check unused users'), description=_( - """At 2 a.m. every day, according to the configuration in "System Settings - Security - + """At 2 p.m. every day, according to the configuration in "System Settings - Security - Auth security - Auto disable threshold" users who have not logged in or whose API keys have not been used for a long time will be disabled""" )