From a6de9bdde6faa3fe4c56e4e2e974c70a383de4bc Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Wed, 22 Nov 2023 11:09:16 +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/common/sdk/sms/endpoint.py | 10 +++++----- apps/locale/ja/LC_MESSAGES/django.po | 22 ++++++++++++++-------- apps/locale/zh/LC_MESSAGES/django.po | 21 +++++++++++++-------- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/apps/common/sdk/sms/endpoint.py b/apps/common/sdk/sms/endpoint.py index 6f5433fa5..7618d6da9 100644 --- a/apps/common/sdk/sms/endpoint.py +++ b/apps/common/sdk/sms/endpoint.py @@ -1,12 +1,12 @@ -from collections import OrderedDict import importlib +from collections import OrderedDict -from django.utils.translation import gettext_lazy as _ -from django.db.models import TextChoices from django.conf import settings +from django.db.models import TextChoices +from django.utils.translation import gettext_lazy as _ -from common.utils import get_logger from common.exceptions import JMSException +from common.utils import get_logger from .base import BaseSMSClient logger = get_logger(__name__) @@ -18,7 +18,7 @@ class BACKENDS(TextChoices): HUAWEI = 'huawei', _('Huawei Cloud') CMPP2 = 'cmpp2', _('CMPP v2.0') CUSTOM = 'custom', _('Custom type') - CUSTOM_FILE = 'custom_file', f"{_('Custom type')}({_('File')})" + CUSTOM_FILE = 'custom_file', _('Custom type (File)') class SMS: diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index 42f5fb6fe..c235e37a8 100644 --- a/apps/locale/ja/LC_MESSAGES/django.po +++ b/apps/locale/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: 2023-11-16 15:05+0800\n" +"POT-Creation-Date: 2023-11-22 11:05+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2676,21 +2676,21 @@ msgstr "認証" msgid "User invalid, disabled or expired" msgstr "ユーザーが無効、無効、または期限切れです" -#: authentication/backends/drf.py:39 +#: authentication/backends/drf.py:50 msgid "Invalid token header. No credentials provided." msgstr "無効なトークンヘッダー。資格情報は提供されていません。" -#: authentication/backends/drf.py:42 +#: authentication/backends/drf.py:53 msgid "Invalid token header. Sign string should not contain spaces." msgstr "無効なトークンヘッダー。記号文字列にはスペースを含めないでください。" -#: authentication/backends/drf.py:48 +#: authentication/backends/drf.py:59 msgid "" "Invalid token header. Sign string should not contain invalid characters." msgstr "" "無効なトークンヘッダー。署名文字列に無効な文字を含めることはできません。" -#: authentication/backends/drf.py:61 +#: authentication/backends/drf.py:72 msgid "Invalid token or cache refreshed." msgstr "無効なトークンまたはキャッシュの更新。" @@ -3780,6 +3780,9 @@ msgstr "華為雲" msgid "CMPP v2.0" msgstr "CMPP v2.0" +msgid "Custom type (File)" +msgstr "カスタム（ファイル）" + #: common/sdk/sms/endpoint.py:32 msgid "SMS provider not support: {}" msgstr "SMSプロバイダーはサポートしていません: {}" @@ -4200,7 +4203,7 @@ msgstr "Material" msgid "Material Type" msgstr "Material を選択してオプションを設定します。" -#: ops/models/job.py:536 +#: ops/models/job.py:544 msgid "Job Execution" msgstr "ジョブ実行" @@ -7674,7 +7677,10 @@ msgid "" "Determines whether the client computer should scale the content on the " "remote computer to fit the window size of the client computer when the " "window is resized." -msgstr "ウィンドウサイズを変更するときにクライアントコンピュータがクライアントコンピュータのウィンドウサイズに合わせるためにリモートコンピュータ上のコンテンツをスケーリングすべきかどうかを判断する" +msgstr "" +"ウィンドウサイズを変更するときにクライアントコンピュータがクライアントコン" +"ピュータのウィンドウサイズに合わせるためにリモートコンピュータ上のコンテンツ" +"をスケーリングすべきかどうかを判断する" #: users/serializers/preference/luna.py:51 msgid "Remote application connection method" @@ -7797,7 +7803,7 @@ msgstr "ユーザーの有効期限の定期的な検出" msgid "Check unused users" msgstr "未使用のユーザーを確認する" -#: users/tasks.py:114 +#: users/tasks.py:115 msgid "The user has not logged in recently and has been disabled." msgstr "ユーザーは最近ログインしておらず、無効になっています。" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index dff3dd204..831ad1db2 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: 2023-11-16 15:05+0800\n" +"POT-Creation-Date: 2023-11-22 11:05+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -2656,20 +2656,20 @@ msgstr "认证" msgid "User invalid, disabled or expired" msgstr "用户无效，已禁用或已过期" -#: authentication/backends/drf.py:39 +#: authentication/backends/drf.py:50 msgid "Invalid token header. No credentials provided." msgstr "无效的令牌头。没有提供任何凭据。" -#: authentication/backends/drf.py:42 +#: authentication/backends/drf.py:53 msgid "Invalid token header. Sign string should not contain spaces." msgstr "无效的令牌头。符号字符串不应包含空格。" -#: authentication/backends/drf.py:48 +#: authentication/backends/drf.py:59 msgid "" "Invalid token header. Sign string should not contain invalid characters." msgstr "无效的令牌头。符号字符串不应包含无效字符。" -#: authentication/backends/drf.py:61 +#: authentication/backends/drf.py:72 msgid "Invalid token or cache refreshed." msgstr "刷新的令牌或缓存无效。" @@ -3735,6 +3735,9 @@ msgstr "华为云" msgid "CMPP v2.0" msgstr "CMPP v2.0" +msgid "Custom type (File)" +msgstr "自定义 (文件)" + #: common/sdk/sms/endpoint.py:32 msgid "SMS provider not support: {}" msgstr "短信服务商不支持：{}" @@ -4150,7 +4153,7 @@ msgstr "Material" msgid "Material Type" msgstr "Material 类型" -#: ops/models/job.py:536 +#: ops/models/job.py:544 msgid "Job Execution" msgstr "作业执行" @@ -7571,7 +7574,9 @@ msgid "" "Determines whether the client computer should scale the content on the " "remote computer to fit the window size of the client computer when the " "window is resized." -msgstr "确定调整窗口大小时客户端计算机是否应缩放远程计算机上的内容以适应客户端计算机的窗口大小" +msgstr "" +"确定调整窗口大小时客户端计算机是否应缩放远程计算机上的内容以适应客户端计算机" +"的窗口大小" #: users/serializers/preference/luna.py:51 msgid "Remote application connection method" @@ -7693,7 +7698,7 @@ msgstr "周期检测用户过期" msgid "Check unused users" msgstr "校验用户已过期" -#: users/tasks.py:114 +#: users/tasks.py:115 msgid "The user has not logged in recently and has been disabled." msgstr "该用户最近未登录，已被禁用。"