From b1fa870de7c6dca87ee1eee6b49fda7c2de93a24 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Fri, 23 Feb 2024 17:22:47 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=BF=BB=E8=AF=91=20(#12700)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com> --- apps/i18n/core/en/LC_MESSAGES/django.mo | 2 +- apps/i18n/core/en/LC_MESSAGES/django.po | 6 +++--- apps/i18n/core/ja/LC_MESSAGES/django.mo | 4 ++-- apps/i18n/core/ja/LC_MESSAGES/django.po | 6 ++++-- apps/i18n/core/zh/LC_MESSAGES/django.mo | 4 ++-- apps/i18n/core/zh/LC_MESSAGES/django.po | 2 +- apps/i18n/lina/en.json | 9 ++++----- apps/i18n/lina/zh.json | 1 - apps/ops/models/adhoc.py | 2 +- apps/ops/serializers/job.py | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apps/i18n/core/en/LC_MESSAGES/django.mo b/apps/i18n/core/en/LC_MESSAGES/django.mo index fe64a9fbf..208a9d2bc 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.mo +++ b/apps/i18n/core/en/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 oid sha256:970158849c0adeba85da98a2f1e45bd75f963764fb05f6ac1ccdcd19c68f2c6a -size 2025 +size 2025 \ No newline at end of file diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index bb78247f4..1c9015e26 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -926,7 +926,7 @@ msgstr "" #: tickets/models/ticket/general.py:297 users/models/user.py:836 #: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:110 msgid "Comment" -msgstr "Description" +msgstr "Comment" #: accounts/serializers/account/virtual.py:24 msgid "" @@ -4308,8 +4308,8 @@ msgid "Next execution time" msgstr "" #: ops/serializers/job.py:15 -msgid "Run after save" -msgstr "" +msgid "Execute after saving" +msgstr "Execute after saving" #: ops/serializers/job.py:52 msgid "Average time cost" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index 9d0077e5a..8750a637c 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.mo +++ b/apps/i18n/core/ja/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b64a2cb215d6258ede3d9794241a80d7104690075054ad966e649834e49910f -size 170574 +oid sha256:11f0fb0b7cc4c3187c9e7913be7ca1d310a79a31fc10e950cdb1264b4725562f +size 170524 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index d056b5c41..75754a924 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-22 17:42+0800\n" +"POT-Creation-Date: 2024-02-23 17:11+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4434,7 +4434,9 @@ msgid "Next execution time" msgstr "最後の実行" #: ops/serializers/job.py:15 -msgid "Run after save" +#, fuzzy +#| msgid "Run after save" +msgid "Execute after saving" msgstr "保存後に実行" #: ops/serializers/job.py:52 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index 280765547..2ea403d17 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.mo +++ b/apps/i18n/core/zh/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:048f6988bf37dd7b1c8d20d052009187fbb76548ea3608bb9704880f2dd28eef -size 140998 +oid sha256:03746a65d7eff0ef626fad8207b76f3c574b3c81dcac3f05d29b77ea694423e7 +size 141004 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 36877af6b..6aca450ee 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -4351,7 +4351,7 @@ msgid "Next execution time" msgstr "下次执行时间" #: ops/serializers/job.py:15 -msgid "Run after save" +msgid "Execute after saving" msgstr "保存后执行" #: ops/serializers/job.py:52 diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 654009caf..f3eec7103 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -115,12 +115,11 @@ "AssetAclList": "Asset Connect ACL", "AssetAclUpdate": "Update Asset Connect Rules", "AssetAddress": "Asset (IP/Hostname)", - "AssetAmount": "Assets", + "AssetAmount": "Asset amount", "AssetAndNode": "Assets/Nodes", "AssetBulkUpdateTips": "Network Devices, Cloud Services, Web, Batch Updating of Domains Not Supported", "AssetChangeSecretCreate": "Create Account Password Change", "AssetChangeSecretUpdate": "Update Account Password Change", - "AssetCount": "Asset Quantity", "AssetData": "Asset Data", "AssetDetail": "Asset Details", "AssetList": "Assets", @@ -213,7 +212,7 @@ "Chat": "Chat", "ChatAI": "Chat AI", "ChatHello": "Hello! How can I assist you?", - "ChdirHelpText": "By Default, the execution directory is the user's home directory", + "ChdirHelpText": "The default execution directory is the home directory of the executing user", "CheckAssetsAmount": "Check Asset Quantity", "CheckViewAcceptor": "Click to View the Acceptance Person", "CleanHelpText": "A scheduled cleanup task will be carried out every day at 2 a.m. The data cleaned up will not be recoverable", @@ -554,7 +553,7 @@ "IsSyncAccountHelpText": "Upon Collection Completion, the Collected Account Will Be Synced to Asset", "IsSyncAccountLabel": "Sync to Assets", "JDCloud": "Jingdong Cloud", - "Job": "Action", + "Job": "Job", "JobCenter": "Task Center", "JobCreate": "Create Job", "JobDetail": "Job Details", @@ -900,7 +899,7 @@ "RunTaskManually": "Manually Execute", "RunasHelpText": "Enter Username for Running Script", "RunasPolicy": "Account Policy", - "RunasPolicyHelpText": "When the current asset does not have this running user, what kind of account selection strategy should be adopted? Skip: do not perform. Preferring privileged account: If there is a privileged account, choose the privileged account first. If not, choose the regular account. Only privileged accounts: Choose only from privileged accounts. If not, do not execute", + "RunasPolicyHelpText": "When there are no users currently running on the asset, what account selection strategy should be adopted. Skip: Do not execute. Prioritize privileged accounts: If there are privileged accounts, select them first; if not, select regular accounts. Only privileged accounts: Select only from privileged accounts; if none exist, do not execute.", "RunningPath": "Running Path", "RunningPathHelpText": "Enter the run path of the script, this setting only applies to shell scripts", "RunningTimes": "Last 5 Run Times", diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index 3a4c18879..e82f3e4c7 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -118,7 +118,6 @@ "AssetBulkUpdateTips": "网络设备、云服务、web，不支持批量更新网域", "AssetChangeSecretCreate": "创建账号改密", "AssetChangeSecretUpdate": "更新账号改密", - "AssetCount": "资产数量", "AssetData": "资产数据", "AssetDetail": "资产详情", "AssetList": "资产列表", diff --git a/apps/ops/models/adhoc.py b/apps/ops/models/adhoc.py index f55b6f3d0..3ca2fa281 100644 --- a/apps/ops/models/adhoc.py +++ b/apps/ops/models/adhoc.py @@ -8,7 +8,7 @@ from common.utils import get_logger __all__ = ["AdHoc"] -from ops.const import AdHocModules +from ops.const import AdHocModules from orgs.mixins.models import JMSOrgBaseModel diff --git a/apps/ops/serializers/job.py b/apps/ops/serializers/job.py index ca0ff4d61..f3aff4ee6 100644 --- a/apps/ops/serializers/job.py +++ b/apps/ops/serializers/job.py @@ -12,7 +12,7 @@ from orgs.mixins.serializers import BulkOrgResourceModelSerializer class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin): creator = ReadableHiddenField(default=serializers.CurrentUserDefault()) - run_after_save = serializers.BooleanField(label=_("Run after save"), default=False, required=False) + run_after_save = serializers.BooleanField(label=_("Execute after saving"), default=False, required=False) nodes = serializers.ListField(required=False, child=serializers.CharField()) date_last_run = serializers.DateTimeField(label=_('Date last run'), read_only=True) name = serializers.CharField(label=_('Name'), max_length=128, allow_blank=True, required=False)