From d0a011c2927464ef9a7f7462b2cd7c35fe20c934 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 27 Apr 2021 10:50:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20i18n=E7=9A=84p?= =?UTF-8?q?assword=20=E4=B8=BAkey=20=E6=97=B6=20=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=B8=BApin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/cli/webSSH.vue | 52 +++++++++++-------- .../src/components/common/language/cn.js | 24 ++++----- .../src/components/common/language/en.js | 26 +++++----- nezha-fronted/src/components/common/login.vue | 2 +- .../rightBox/administration/userBox.vue | 2 +- .../rightBox/asset/assetBatchEditBox.vue | 6 +-- .../common/rightBox/asset/assetBox.vue | 6 +-- .../common/rightBox/editEndpointBoxNew.vue | 2 +- .../components/common/rightBox/moduleBox.vue | 2 +- .../trafficSetting/trafficSettingTab.vue | 2 +- .../components/common/rightBox/userBox.vue | 2 +- .../components/page/asset/accountConfig.vue | 16 +++--- .../src/components/page/config/mibBrowser.vue | 4 +- .../src/components/page/config/setup.vue | 10 ++-- .../page/monitor/project/project.vue | 2 +- 15 files changed, 84 insertions(+), 74 deletions(-) diff --git a/nezha-fronted/src/components/cli/webSSH.vue b/nezha-fronted/src/components/cli/webSSH.vue index c5fbebf6d..7b3743758 100644 --- a/nezha-fronted/src/components/cli/webSSH.vue +++ b/nezha-fronted/src/components/cli/webSSH.vue @@ -1,4 +1,4 @@ - - + @@ -54,13 +54,13 @@ - + - + diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue index dfe48d3c0..e0c083a0c 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue @@ -186,7 +186,7 @@ - + @@ -199,13 +199,13 @@ - + - + diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue index 66627e049..3405503f5 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue @@ -225,7 +225,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index 50396bf50..c3d10a74e 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -218,7 +218,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue index 00a17ee4c..f120f3439 100644 --- a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue +++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue @@ -68,7 +68,7 @@ -
{{$t('login.password')}}
+
{{$t('login.pin')}}
diff --git a/nezha-fronted/src/components/common/rightBox/userBox.vue b/nezha-fronted/src/components/common/rightBox/userBox.vue index 46fa13430..b63e4ee23 100644 --- a/nezha-fronted/src/components/common/rightBox/userBox.vue +++ b/nezha-fronted/src/components/common/rightBox/userBox.vue @@ -24,7 +24,7 @@ maxlength="64" placeholder="" show-word-limit size="small" type="text">
- + diff --git a/nezha-fronted/src/components/page/asset/accountConfig.vue b/nezha-fronted/src/components/page/asset/accountConfig.vue index 97d3ef8bd..24ed820e4 100644 --- a/nezha-fronted/src/components/page/asset/accountConfig.vue +++ b/nezha-fronted/src/components/page/asset/accountConfig.vue @@ -6,17 +6,17 @@ - {{$t('asset.password')}} + {{$t('asset.pin')}} {{$t('asset.ssh')}} - + - + @@ -30,13 +30,13 @@ - + - + - + @@ -71,7 +71,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue index 285ecb7ab..fcc7048c7 100644 --- a/nezha-fronted/src/components/page/config/mibBrowser.vue +++ b/nezha-fronted/src/components/page/config/mibBrowser.vue @@ -85,7 +85,7 @@ -
{{$t('login.password')}}
+
{{$t('login.pin')}}
@@ -118,7 +118,7 @@ -
{{$t('project.module.privPassword')}}
+
{{$t('project.module.privpin')}}
diff --git a/nezha-fronted/src/components/page/config/setup.vue b/nezha-fronted/src/components/page/config/setup.vue index 6a68e0261..932e4b3ad 100644 --- a/nezha-fronted/src/components/page/config/setup.vue +++ b/nezha-fronted/src/components/page/config/setup.vue @@ -69,7 +69,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -312,9 +312,9 @@ export default { this.activeStep = 2 this.step = 2 if (response.code == 574004) { // 密码无效 - this.$alert(this.$t('setup.invalidPassword'), { type: 'warning' }) + this.$alert(this.$t('setup.invalidpin'), { type: 'warning' }) } else if (response.code == 574005) { - this.$alert(this.$t('setup.requirePassword'), { type: 'warning' }) + this.$alert(this.$t('setup.requirepin'), { type: 'warning' }) } else if (response.code == 574002) { this.$alert(this.$t('setup.invalidCode', { page: this.$t('setup.welcomePage') }), { type: 'warning' }) } else { diff --git a/nezha-fronted/src/components/page/monitor/project/project.vue b/nezha-fronted/src/components/page/monitor/project/project.vue index 8e2dbbd65..c33092ad3 100644 --- a/nezha-fronted/src/components/page/monitor/project/project.vue +++ b/nezha-fronted/src/components/page/monitor/project/project.vue @@ -535,7 +535,7 @@ export default { detail.account = account.user let loginType = '' if (account.authType == 1) { - loginType = this.$t('asset.password') + loginType = this.$t('asset.pin') } else if (account.authType == 2) { loginType = this.$t('asset.ssh') }