From 212c8634eaa5025b5636d4f7941b61ddc493feaa Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Mon, 15 May 2023 10:22:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=B9=E5=99=A8=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=20(#1045?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/modules/en.ts | 9 ++++++--- frontend/src/lang/modules/zh.ts | 8 +++++--- frontend/src/views/container/setting/index.vue | 17 ++++++++++++++++- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index bee150b6072e..7f2465ae66cf 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -540,8 +540,10 @@ const message = { imageRepo: 'Image repo', repoHelper: 'Does it include a mirror repository/organization/project?', auth: 'Auth', - mirrorHelper: 'One in a row, for example:\nhttps://hub-mirror.c.163.com \nhttps://reg-mirror.qiniu.com', - registrieHelper: 'One in a row, for example:\n172.16.10.111:8081 \n172.16.10.112:8081', + mirrorHelper: + 'If there are multiple mirrors, newlines must be displayed, for example:\nhttps://hub-mirror.c.163.com \nhttps://reg-mirror.qiniu.com', + registrieHelper: + 'If multiple private repositories exist, newlines must be displayed, for example:\n172.16.10.111:8081 \n172.16.10.112:8081', compose: 'Compose', fromChangeHelper: 'Switching the source will clear the current edited content. Do you want to continue?', @@ -576,7 +578,8 @@ const message = { daemonJsonPathHelper: 'Ensure that the configuration path is the same as that specified in docker.service.', mirrors: 'Registry mirrors', mirrorsHelper: - 'Redirecting requests for a Docker image repository to a specified image accelerator can improve the download speed of the image', + 'The acceleration URL is preferred to perform operations. If this parameter is set to empty, mirror acceleration is disabled.', + mirrorsHelper2: 'For details, see the official documents, ', registries: 'Insecure registries', liveHelper: 'Allows the running container state to be preserved in case of unexpected shutdown or crash of the Docker daemon', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 3dde7c4285fc..aaa9acaef8b1 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -558,8 +558,9 @@ const message = { imageRepo: '镜像仓库', repoHelper: '是否包含镜像仓库/组织/项目?', auth: '认证', - mirrorHelper: '一行一个，例：\nhttps://hub-mirror.c.163.com \nhttps://reg-mirror.qiniu.com', - registrieHelper: '一行一个，例：\n172.16.10.111:8081 \n172.16.10.112:8081', + mirrorHelper: + '当存在多个加速器时，需要换行显示，例： \nhttp://xxxxxx.m.daocloud.io \nhttps://xxxxxx.mirror.aliyuncs.com', + registrieHelper: '当存在多个私有仓库时，需要换行显示，例：\n172.16.10.111:8081 \n172.16.10.112:8081', compose: '编排', fromChangeHelper: '切换来源将清空当前已编辑内容，是否继续？', @@ -590,7 +591,8 @@ const message = { dockerStatus: 'Docker 服务', daemonJsonPathHelper: '请保证配置路径与 docker.service 中指定的配置路径保持一致。', mirrors: '镜像加速', - mirrorsHelper: '将 Docker 镜像库的请求重定向到指定的镜像加速器，从而提高镜像的下载速度', + mirrorsHelper: '优先使用加速 URL 执行操作，设置为空则取消镜像加速。', + mirrorsHelper2: '具体操作配置请参照官方文档，', registries: '私有仓库', liveHelper: '允许在 Docker 守护进程发生意外停机或崩溃时保留正在运行的容器状态', liveWithSwarmHelper: 'live-restore 守护进程配置与 Swarm 模式不兼容', diff --git a/frontend/src/views/container/setting/index.vue b/frontend/src/views/container/setting/index.vue index 7dacc0a546e4..3d46fabac5de 100644 --- a/frontend/src/views/container/setting/index.vue +++ b/frontend/src/views/container/setting/index.vue @@ -44,7 +44,7 @@
- + {{ $t('container.mirrorsHelper') }} + + {{ $t('container.mirrorsHelper2') }} + + {{ $t('firewall.quickJump') }} + + { confirmDialogRef.value!.acceptParams(params); }; +const toDoc = () => { + window.open('https://1panel.cn/docs/user_manual/containers/setting/', '_blank'); +}; + const onChangeIptables = () => { if (!form.iptables) { iptablesVisiable.value = true;