diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index 6dad62243..9a24a17a8 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-09-19 10:39+0800\n" +"POT-Creation-Date: 2023-09-19 15:26+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -678,8 +678,8 @@ msgstr "カテゴリ" #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:39 #: terminal/models/component/storage.py:57 #: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29 -#: terminal/serializers/session.py:21 terminal/serializers/storage.py:226 -#: terminal/serializers/storage.py:238 tickets/models/comment.py:26 +#: terminal/serializers/session.py:21 terminal/serializers/storage.py:228 +#: terminal/serializers/storage.py:240 tickets/models/comment.py:26 #: tickets/models/flow.py:56 tickets/models/ticket/apply_application.py:16 #: tickets/models/ticket/general.py:275 tickets/serializers/flow.py:53 #: tickets/serializers/ticket/ticket.py:19 @@ -935,23 +935,23 @@ msgstr "アセット アカウントの可用性を確認する" msgid "Verify accounts connectivity" msgstr "アカウント接続のテスト" -#: accounts/utils.py:46 +#: accounts/utils.py:53 msgid "Password can not contains `{{` " msgstr "パスワードには '{{' を含まない" -#: accounts/utils.py:48 +#: accounts/utils.py:55 msgid "Password can not contains `{%` " msgstr "パスワードには '{%' を含まない" -#: accounts/utils.py:51 +#: accounts/utils.py:58 msgid "Password can not contains `'` " msgstr "パスワードには `'` を含まない" -#: accounts/utils.py:53 +#: accounts/utils.py:60 msgid "Password can not contains `\"` " msgstr "パスワードには `\"` を含まない" -#: accounts/utils.py:59 +#: accounts/utils.py:66 msgid "private key invalid or passphrase error" msgstr "秘密鍵が無効またはpassphraseエラー" @@ -1329,7 +1329,10 @@ msgid "" "SFTP root directory, Support variable:
- ${ACCOUNT} The connected " "account username
- ${HOME} The home directory of the connected account " "
- ${USER} The username of the user" -msgstr "SFTPルートディレクトリ、サポート変数:
-${ACCOUNT}接続されたアカウントのユーザー名
-${HOME}接続されたアカウントのホームディレクトリ
-${USER}ユーザーのユーザー名" +msgstr "" +"SFTPルートディレクトリ、サポート変数:
-${ACCOUNT}接続されたアカウントの" +"ユーザー名
-${HOME}接続されたアカウントのホームディレクトリ
-${USER}" +"ユーザーのユーザー名" #: assets/const/protocol.py:65 msgid "Console" @@ -6191,7 +6194,7 @@ msgstr "同時実行可能" msgid "Tags" msgstr "ラベル" -#: terminal/models/applet/applet.py:48 terminal/serializers/storage.py:159 +#: terminal/models/applet/applet.py:48 terminal/serializers/storage.py:161 msgid "Hosts" msgstr "ホスト" @@ -6532,7 +6535,7 @@ msgstr "" "URL を入力します。
例: https://172.16.10.110 または https://dev." "jumpserver.com" -#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:170 +#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:172 msgid "Ignore Certificate Verification" msgstr "証明書の検証を無視する" @@ -6720,30 +6723,34 @@ msgid "Endpoint suffix" msgstr "エンドポイントサフィックス" #: terminal/serializers/storage.py:137 +msgid "The address cannot contain the special character `#`" +msgstr "アドレスには特殊文字「#」を含めることはできません" + +#: terminal/serializers/storage.py:139 msgid "The address format is incorrect" msgstr "アドレス形式が正しくありません" -#: terminal/serializers/storage.py:144 +#: terminal/serializers/storage.py:146 msgid "Host invalid" msgstr "ホスト無効" -#: terminal/serializers/storage.py:147 +#: terminal/serializers/storage.py:149 msgid "Port invalid" msgstr "ポートが無効" -#: terminal/serializers/storage.py:162 +#: terminal/serializers/storage.py:164 msgid "Index by date" msgstr "日付による索引付け" -#: terminal/serializers/storage.py:163 +#: terminal/serializers/storage.py:165 msgid "Whether to create an index by date" msgstr "現在の日付に基づいてインデックスを動的に作成するかどうか" -#: terminal/serializers/storage.py:166 +#: terminal/serializers/storage.py:168 msgid "Index" msgstr "インデックス" -#: terminal/serializers/storage.py:168 +#: terminal/serializers/storage.py:170 msgid "Doc type" msgstr "Docタイプ" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 8e15244d7..819882112 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-09-19 10:39+0800\n" +"POT-Creation-Date: 2023-09-19 15:26+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -676,8 +676,8 @@ msgstr "类别" #: perms/serializers/user_permission.py:27 terminal/models/applet/applet.py:39 #: terminal/models/component/storage.py:57 #: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29 -#: terminal/serializers/session.py:21 terminal/serializers/storage.py:226 -#: terminal/serializers/storage.py:238 tickets/models/comment.py:26 +#: terminal/serializers/session.py:21 terminal/serializers/storage.py:228 +#: terminal/serializers/storage.py:240 tickets/models/comment.py:26 #: tickets/models/flow.py:56 tickets/models/ticket/apply_application.py:16 #: tickets/models/ticket/general.py:275 tickets/serializers/flow.py:53 #: tickets/serializers/ticket/ticket.py:19 @@ -932,23 +932,23 @@ msgstr "验证资产账号可用性" msgid "Verify accounts connectivity" msgstr "测试账号可连接性" -#: accounts/utils.py:46 +#: accounts/utils.py:53 msgid "Password can not contains `{{` " msgstr "密码不能包含 `{{` 字符" -#: accounts/utils.py:48 +#: accounts/utils.py:55 msgid "Password can not contains `{%` " msgstr "密码不能包含 `{%` 字符" -#: accounts/utils.py:51 +#: accounts/utils.py:58 msgid "Password can not contains `'` " msgstr "密码不能包含 `'` 字符" -#: accounts/utils.py:53 +#: accounts/utils.py:60 msgid "Password can not contains `\"` " msgstr "密码不能包含 `\"` 字符" -#: accounts/utils.py:59 +#: accounts/utils.py:66 msgid "private key invalid or passphrase error" msgstr "密钥不合法或密钥密码错误" @@ -6104,7 +6104,7 @@ msgstr "可以并发" msgid "Tags" msgstr "标签" -#: terminal/models/applet/applet.py:48 terminal/serializers/storage.py:159 +#: terminal/models/applet/applet.py:48 terminal/serializers/storage.py:161 msgid "Hosts" msgstr "主机" @@ -6443,7 +6443,7 @@ msgstr "" "建议填写内网地址,否则填写当前站点 URL
例如:https://172.16.10.110 or " "https://dev.jumpserver.com" -#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:170 +#: terminal/serializers/applet_host.py:46 terminal/serializers/storage.py:172 msgid "Ignore Certificate Verification" msgstr "忽略证书认证" @@ -6627,30 +6627,34 @@ msgid "Endpoint suffix" msgstr "端点后缀" #: terminal/serializers/storage.py:137 +msgid "The address cannot contain the special character `#`" +msgstr "地址中不能包含特殊字符 `#`" + +#: terminal/serializers/storage.py:139 msgid "The address format is incorrect" msgstr "地址格式不正确" -#: terminal/serializers/storage.py:144 +#: terminal/serializers/storage.py:146 msgid "Host invalid" msgstr "主机无效" -#: terminal/serializers/storage.py:147 +#: terminal/serializers/storage.py:149 msgid "Port invalid" msgstr "端口无效" -#: terminal/serializers/storage.py:162 +#: terminal/serializers/storage.py:164 msgid "Index by date" msgstr "按日期建索引" -#: terminal/serializers/storage.py:163 +#: terminal/serializers/storage.py:165 msgid "Whether to create an index by date" msgstr "是否根据日期动态建立索引" -#: terminal/serializers/storage.py:166 +#: terminal/serializers/storage.py:168 msgid "Index" msgstr "索引" -#: terminal/serializers/storage.py:168 +#: terminal/serializers/storage.py:170 msgid "Doc type" msgstr "文档类型" @@ -8344,6 +8348,5 @@ msgstr "企业专业版" msgid "Ultimate edition" msgstr "企业旗舰版" - #~ msgid "Random" #~ msgstr "随机" diff --git a/apps/terminal/serializers/storage.py b/apps/terminal/serializers/storage.py index 2c9a1b1c2..969b44e3c 100644 --- a/apps/terminal/serializers/storage.py +++ b/apps/terminal/serializers/storage.py @@ -133,6 +133,8 @@ replay_storage_type_serializer_classes_mapping = { # Command storage serializers # --------------------------- def command_storage_es_host_format_validator(host): + if '#' in host: + raise serializers.ValidationError(_('The address cannot contain the special character `#`')) h = urlparse(host) default_error_msg = _('The address format is incorrect') if h.scheme not in ['http', 'https']: