From 000f175d97e5f3f1e1e93e5de36c21717dd577d0 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Tue, 31 Oct 2023 20:49:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=B7=E5=BC=8F=20(#2744)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/lang/modules/en.ts | 8 +++--
frontend/src/lang/modules/tw.ts | 13 ++++---
frontend/src/lang/modules/zh.ts | 11 ++++--
frontend/src/views/cronjob/operate/index.vue | 34 +++++++++++++++++--
frontend/src/views/home/index.vue | 4 +--
.../src/views/setting/safe/bind/index.vue | 4 +--
frontend/src/views/setting/safe/index.vue | 5 +--
7 files changed, 59 insertions(+), 20 deletions(-)
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index 0c528ce0e..267db9967 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -284,8 +284,9 @@ const message = {
home: {
restart_1panel: 'Restart Panel',
restart_system: 'Restart Server',
- restartHelper:
- 'Do you want to perform the operation [{0}] on this machine? This action will temporarily disable the service. Do you want to continue?',
+ panel: '1Panel',
+ system: '1Panel Server',
+ restartHelper: 'About to restart {0}, do you want to continue?',
operationSuccess: 'Operation successful! Restarting, please wait...',
overview: 'Overview',
entranceHelper:
@@ -739,6 +740,9 @@ const message = {
record: 'Records',
shell: 'Shell script',
log: 'Backup logs',
+ ogHelper1: '1.1Panel System log ',
+ logHelper2: '2. SSH login log of the server ',
+ logHelper3: '3. All site logs ',
containerCheckBox: 'In container (no need to enter the container command)',
containerName: 'Container name',
ntp: 'Time synchronization',
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
index ec2442b29..be3e1198c 100644
--- a/frontend/src/lang/modules/tw.ts
+++ b/frontend/src/lang/modules/tw.ts
@@ -281,8 +281,10 @@ const message = {
},
home: {
restart_1panel: '重啟面板',
- restart_system: '重啟伺服器',
- restartHelper: '您是否要對這台機器執行 [{0}] 操作？此操作將導致服務暫時無法使用。您要繼續嗎？',
+ restart_system: '重啟服務器',
+ panel: '1Panel 面板',
+ system: '1Panel 服務器',
+ restartHelper: '即將重新啟動 {0}，是否繼續？',
operationSuccess: '操作成功！正在重啟，請稍候...',
overview: '概覽',
entranceHelper: '設置安全入口有利於提高系統的安全性，如有需要，前往 面板設置-安全 中，啟用安全入口',
@@ -709,10 +711,13 @@ const message = {
taskType: '任務類型',
record: '報告',
shell: 'Shell 腳本',
- log: '日誌備份',
+ log: '備份日誌',
+ logHelper1: '1. 1Panel 系統日誌',
+ logHelper2: '2. 服務器的 SSH 登錄日誌',
+ logHelper3: '3. 所有網站日誌',
containerCheckBox: '在容器中執行（無需再輸入進入容器命令）',
containerName: '容器名稱',
- ntp: '時間同步',
+ ntp: '同步服務器時間',
app: '備份應用',
website: '備份網站',
rulesHelper: '當存在多個壓縮排除規則時，需要換行顯示，例：\n*.log \n*.sql',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 92f06c3fd..3c5abbc5d 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -282,7 +282,9 @@ const message = {
home: {
restart_1panel: '重启面板',
restart_system: '重启服务器',
- restartHelper: '是否对该机器进行 [{0}] 操作，该操作将导致服务暂时不可用，是否继续？',
+ panel: '1Panel 面板',
+ system: '1Panel 服务器',
+ restartHelper: '即将重新启动 {0}，是否继续？',
operationSuccess: '操作成功！正在重启，请稍候...',
overview: '概览',
entranceHelper: '设置安全入口有利于提高系统的安全性，如有需要，前往 面板设置-安全 中，启用安全入口',
@@ -710,10 +712,13 @@ const message = {
taskType: '任务类型',
record: '报告',
shell: 'Shell 脚本',
- log: '日志备份',
+ log: '备份日志',
+ logHelper1: '1. 1Panel 系统日志',
+ logHelper2: '2. 服务器的 SSH 登录日志',
+ logHelper3: '3. 所有网站日志',
containerCheckBox: '在容器中执行（无需再输入进入容器命令）',
containerName: '容器名称',
- ntp: '时间同步',
+ ntp: '同步服务器时间',
app: '备份应用',
website: '备份网站',
rulesHelper: '当存在多个压缩排除规则时，需要换行显示，例：\n*.log \n*.sql',
diff --git a/frontend/src/views/cronjob/operate/index.vue b/frontend/src/views/cronjob/operate/index.vue
index df920779b..c04b95770 100644
--- a/frontend/src/views/cronjob/operate/index.vue
+++ b/frontend/src/views/cronjob/operate/index.vue
@@ -23,14 +23,34 @@
-
+
-
-
+
+
{{ $t('cronjob.' + dialogData.rowData!.type) }}
+
+
+ {{ $t('cronjob.logHelper1') }}
+
+ {{ $t('firewall.quickJump') }}
+
+
+
+ {{ $t('cronjob.logHelper2') }}
+
+ {{ $t('firewall.quickJump') }}
+
+
+
+ {{ $t('cronjob.logHelper3') }}
+
+ {{ $t('firewall.quickJump') }}
+
+
+
@@ -633,4 +653,12 @@ defineExpose({
font-size: 12px;
margin-top: 5px;
}
+.logText {
+ line-height: 22px;
+ font-size: 12px;
+ .link {
+ font-size: 12px;
+ margin-top: -3px;
+ }
+}
diff --git a/frontend/src/views/home/index.vue b/frontend/src/views/home/index.vue
index a5674b236..3cf621039 100644
--- a/frontend/src/views/home/index.vue
+++ b/frontend/src/views/home/index.vue
@@ -10,7 +10,7 @@
>