From 4bf76aacb1f11f5869ef29b93eed40754bbbd5a5 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Thu, 29 Jun 2023 22:38:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85=E5=AE=B9?= =?UTF-8?q?=20(#1495)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/i18n/lang/en.yaml | 4 - backend/i18n/lang/zh.yaml | 4 - frontend/src/components/backup/index.vue | 6 +- .../src/components/system-upgrade/index.vue | 4 +- frontend/src/lang/modules/en.ts | 133 +++++------------- frontend/src/lang/modules/zh.ts | 110 ++------------- frontend/src/utils/util.ts | 6 +- .../views/app-store/detail/install/index.vue | 2 +- .../src/views/app-store/installed/index.vue | 6 +- .../app-store/installed/upgrade/index.vue | 6 +- .../src/views/container/container/index.vue | 4 +- .../container/container/operate/index.vue | 10 +- .../container/container/terminal/index.vue | 2 +- .../container/container/upgrade/index.vue | 4 +- .../src/views/container/image/build/index.vue | 2 +- .../src/views/container/image/load/index.vue | 2 +- frontend/src/views/container/repo/index.vue | 2 +- .../views/container/repo/operator/index.vue | 4 +- .../container/template/operator/index.vue | 2 +- .../views/container/volume/create/index.vue | 2 +- frontend/src/views/cronjob/index.vue | 12 +- frontend/src/views/cronjob/operate/index.vue | 6 +- frontend/src/views/cronjob/record/index.vue | 8 +- .../views/database/mysql/setting/index.vue | 6 +- .../views/database/redis/password/index.vue | 2 +- .../views/database/redis/setting/index.vue | 10 +- .../redis/setting/persistence/index.vue | 2 +- frontend/src/views/home/index.vue | 20 +-- frontend/src/views/home/status/index.vue | 2 +- .../host/file-management/chown/index.vue | 2 +- .../host/file-management/compress/index.vue | 2 +- .../host/file-management/create/index.vue | 2 +- .../host/file-management/decompress/index.vue | 2 +- .../host/file-management/detail/index.vue | 4 +- .../host/file-management/download/index.vue | 2 +- .../src/views/host/file-management/index.vue | 2 +- .../host/file-management/rename/index.vue | 2 +- .../views/host/file-management/wget/index.vue | 2 +- .../src/views/host/firewall/port/index.vue | 6 +- .../host/firewall/port/operate/index.vue | 4 +- frontend/src/views/host/monitor/index.vue | 2 +- .../src/views/host/monitor/monitor/index.vue | 14 +- .../src/views/host/monitor/setting/index.vue | 2 +- .../host/process/process/detail/index.vue | 2 +- .../src/views/host/process/process/index.vue | 4 +- frontend/src/views/host/ssh/log/log.vue | 4 +- .../src/views/host/ssh/ssh/pubkey/index.vue | 2 +- .../src/views/host/terminal/host/index.vue | 4 +- .../host/terminal/host/operate/index.vue | 6 +- .../host/terminal/terminal/host-create.vue | 6 +- frontend/src/views/log/operation/index.vue | 2 +- .../views/setting/backup-account/index.vue | 4 +- .../setting/backup-account/operate/index.vue | 4 +- frontend/src/views/setting/panel/index.vue | 2 +- .../views/setting/panel/username/index.vue | 4 +- frontend/src/views/setting/safe/ssl/index.vue | 2 +- .../views/website/runtime/create/index.vue | 2 +- frontend/src/views/website/runtime/index.vue | 2 +- .../views/website/ssl/acme-account/index.vue | 2 +- .../src/views/website/ssl/create/index.vue | 2 +- .../website/ssl/dns-account/create/index.vue | 2 +- .../views/website/ssl/dns-account/index.vue | 2 +- frontend/src/views/website/ssl/index.vue | 2 +- .../config/basic/domain/create/index.vue | 2 +- .../website/config/basic/domain/index.vue | 4 +- .../config/basic/site-folder/index.vue | 2 +- .../website/config/php/config/index.vue | 6 +- .../website/config/safety/ccdeny/index.vue | 4 +- .../views/website/website/create/index.vue | 8 +- frontend/src/views/website/website/index.vue | 8 +- 70 files changed, 185 insertions(+), 340 deletions(-) diff --git a/backend/i18n/lang/en.yaml b/backend/i18n/lang/en.yaml index c1deecce4..e6b45a5d1 100644 --- a/backend/i18n/lang/en.yaml +++ b/backend/i18n/lang/en.yaml @@ -1,17 +1,13 @@ ErrInvalidParams: "Request parameter error: {{ .detail }}" -ErrToken: "Token information is incorrect.: {{ .detail }}" ErrTokenParse: "Token generation error: {{ .detail }}" -ErrTokenTimeOut: "Login information is out of date: {{ .detail }}" ErrInitialPassword: "Initial password error" ErrInternalServer: "Service internal error: {{ .detail }}" ErrRecordExist: "Record already exists" ErrRecordNotFound: "Records not found" ErrStructTransform: "Type conversion failure: {{ .detail }}" ErrNotLogin: "User is not Login: {{ .detail }}" -ErrNotSafety: "The login status of the current user is unsafe: {{ .detail }}" ErrPasswordExpired: "The current password has expired: {{ .detail }}" ErrNotSupportType: "The system does not support the current type: {{ .detail }}" -ErrRepoNotValid: "Remote repository verification failed!" #common ErrNameIsExist: "Name is already exist" diff --git a/backend/i18n/lang/zh.yaml b/backend/i18n/lang/zh.yaml index 494d3c8d1..00e785bb6 100644 --- a/backend/i18n/lang/zh.yaml +++ b/backend/i18n/lang/zh.yaml @@ -1,17 +1,13 @@ ErrInvalidParams: "请求参数错误: {{ .detail }}" -ErrToken: "Token 信息错误: {{ .detail }}" ErrTokenParse: "Token 生成错误: {{ .detail }}" -ErrTokenTimeOut: "登陆信息已过期: {{ .detail }}" ErrInitialPassword: "原密码错误" ErrInternalServer: "服务内部错误: {{ .detail }}" ErrRecordExist: "记录已存在" ErrRecordNotFound: "记录未能找到" ErrStructTransform: "类型转换失败: {{ .detail }}" ErrNotLogin: "用户未登录: {{ .detail }}" -ErrNotSafety: "当前用户登录状态不安全: {{ .detail }}" ErrPasswordExpired: "当前密码已过期: {{ .detail }}" ErrNotSupportType: "系统暂不支持当前类型: {{ .detail }}" -ErrRepoNotValid: "远程仓库校验失败!" #common ErrNameIsExist: "名称已存在" diff --git a/frontend/src/components/backup/index.vue b/frontend/src/components/backup/index.vue index ce8bf05bd..657a7c706 100644 --- a/frontend/src/components/backup/index.vue +++ b/frontend/src/components/backup/index.vue @@ -4,11 +4,11 @@ diff --git a/frontend/src/views/container/repo/index.vue b/frontend/src/views/container/repo/index.vue index 1d6107b1c..6dc1702df 100644 --- a/frontend/src/views/container/repo/index.vue +++ b/frontend/src/views/container/repo/index.vue @@ -45,7 +45,7 @@ min-width="100" fix /> - + diff --git a/frontend/src/views/cronjob/operate/index.vue b/frontend/src/views/cronjob/operate/index.vue index 4f70875be..a8da8c150 100644 --- a/frontend/src/views/cronjob/operate/index.vue +++ b/frontend/src/views/cronjob/operate/index.vue @@ -57,21 +57,21 @@ - + - + - + diff --git a/frontend/src/views/cronjob/record/index.vue b/frontend/src/views/cronjob/record/index.vue index 7e632791f..a33078d81 100644 --- a/frontend/src/views/cronjob/record/index.vue +++ b/frontend/src/views/cronjob/record/index.vue @@ -47,22 +47,22 @@ {{ loadZero(dialogData.rowData?.minute) }} - {{ dialogData.rowData?.day }}{{ $t('cronjob.day1') }},  + {{ dialogData.rowData?.day }}{{ $t('commons.units.day') }},  {{ loadZero(dialogData.rowData?.hour) }} : {{ loadZero(dialogData.rowData?.minute) }} - {{ dialogData.rowData?.hour }}{{ $t('cronjob.hour') }},  + {{ dialogData.rowData?.hour }}{{ $t('commons.units.hour') }},  {{ loadZero(dialogData.rowData?.minute) }}  {{ loadZero(dialogData.rowData?.minute) }} -  {{ dialogData.rowData?.minute }}{{ $t('cronjob.minute') }} +  {{ dialogData.rowData?.minute }}{{ $t('commons.units.minute') }} -  {{ dialogData.rowData?.second }}{{ $t('cronjob.second') }} +  {{ dialogData.rowData?.second }}{{ $t('commons.units.second') }}  {{ $t('cronjob.handle') }} diff --git a/frontend/src/views/database/mysql/setting/index.vue b/frontend/src/views/database/mysql/setting/index.vue index f5682a4ee..3f559ac48 100644 --- a/frontend/src/views/database/mysql/setting/index.vue +++ b/frontend/src/views/database/mysql/setting/index.vue @@ -1,6 +1,6 @@