From 3b0722e1a4b140a256fa4ca0ad7306d2db00bfef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 7 Jun 2022 19:58:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.vscode/settings.json | 3 +-
src/i18n/index.js | 61 +++++++++++++++++++++------------
src/i18n/lang/en.json | 19 +++++++---
src/i18n/lang/zh-cn.json | 17 +++++++--
src/i18n/lang/zh-tw.json | 23 ++++++++++---
src/i18n/pages/langSet/en.js | 6 ----
src/i18n/pages/langSet/zh-cn.js | 6 ----
src/i18n/pages/langSet/zh-tw.js | 6 ----
src/i18n/pages/login/en.js | 10 ------
src/i18n/pages/login/en.json | 13 +++++++
src/i18n/pages/login/zh-cn.js | 10 ------
src/i18n/pages/login/zh-cn.json | 13 +++++++
src/i18n/pages/login/zh-tw.js | 10 ------
src/i18n/pages/login/zh-tw.json | 13 +++++++
src/store/index.js | 4 +--
src/views/index.vue | 2 +-
16 files changed, 131 insertions(+), 85 deletions(-)
delete mode 100644 src/i18n/pages/langSet/en.js
delete mode 100644 src/i18n/pages/langSet/zh-cn.js
delete mode 100644 src/i18n/pages/langSet/zh-tw.js
delete mode 100644 src/i18n/pages/login/en.js
create mode 100644 src/i18n/pages/login/en.json
delete mode 100644 src/i18n/pages/login/zh-cn.js
create mode 100644 src/i18n/pages/login/zh-cn.json
delete mode 100644 src/i18n/pages/login/zh-tw.js
create mode 100644 src/i18n/pages/login/zh-tw.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8389b0e..3314c35 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -48,8 +48,8 @@
"i18n-ally.enabledParsers": ["json", "js"],
"i18n-ally.localesPaths": [
"src/i18n/lang",
+ "src/i18n/pages/login",
"src/i18n/pages/menu",
- "src/i18n/pages/login"
],
"i18n-ally.extract.parsers.html": {
"attributes": ["text", "title", "alt", "placeholder", "label", "aria-label"],
@@ -57,4 +57,5 @@
"vBind": true,
"inlineText": true
},
+ "i18n-ally.keystyle": "nested",
}
\ No newline at end of file
diff --git a/src/i18n/index.js b/src/i18n/index.js
index f7ddd4c..6d29672 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -1,18 +1,20 @@
-import { createI18n } from 'vue-i18n';
-import store from '@/store/index';
+import { createI18n } from 'vue-i18n'
+import store from '@/store/index'
import { listLangByLocale } from '@/api/system/commonLang'
-import zhCn from './lang/zh-cn.json';
-import en from './lang/en.json';
-import zhTw from './lang/zh-tw.json';
-import pageLoginCn from './pages/login/zh-cn'
-import pageLoginEn from './pages/login/en'
-import pageLoginTw from './pages/login/zh-tw'
+const language = computed(() => {
+ return store.getters.language
+})
-import pageLangSetCn from './pages/langSet/zh-cn'
-import pageLangSetEn from './pages/langSet/en'
-import pageLangSetTw from './pages/langSet/zh-tw'
+import zhCn from './lang/zh-cn.json'
+import en from './lang/en.json'
+import zhTw from './lang/zh-tw.json'
+import pageLoginCn from './pages/login/zh-cn.json'
+import pageLoginEn from './pages/login/en.json'
+import pageLoginTw from './pages/login/zh-tw.json'
+
+// 菜单页面
import pagemenuCn from './pages/menu/zh-cn'
import pagemenuEn from './pages/menu/en'
import pagemenuTw from './pages/menu/zh-tw'
@@ -24,18 +26,33 @@ const i18n = createI18n({
locale: store.getters.language, //默认选择的语言
legacy: false, // 使用 Composition API 模式，则需要将其设置为false
messages: {
- 'zh-cn': { ...zhCn, ...pageLoginCn, ...pageLangSetCn, ...pagemenuCn },
- 'zh-tw': { ...zhTw, ...pageLoginTw, ...pageLangSetTw, ...pagemenuTw },
- 'en': { ...en, ...pageLoginEn, ...pageLangSetEn, ...pagemenuEn }
+ 'zh-cn': {
+ ...zhCn,
+ ...pageLoginCn,
+ ...pagemenuCn
+ },
+ 'zh-tw': {
+ ...zhTw,
+ ...pageLoginTw,
+ ...pagemenuTw
+ },
+ 'en': {
+ ...en,
+ ...pageLoginEn,
+ ...pagemenuEn
+ }
}
})
-listLangByLocale(store.getters.language).then(res => {
- const { code, data } = res
- if (code == 200) {
- i18n.global.mergeLocaleMessage('zh-cn', data.cn)
- i18n.global.mergeLocaleMessage('zh-tw', data.tw)
- i18n.global.mergeLocaleMessage('en', data.en)
- }
-})
+const loadLocale = () => {
+ listLangByLocale(language.value).then(res => {
+ const { code, data } = res
+ if (code == 200) {
+ i18n.global.mergeLocaleMessage('zh-cn', data.cn)
+ i18n.global.mergeLocaleMessage('zh-tw', data.tw)
+ i18n.global.mergeLocaleMessage('en', data.en)
+ }
+ })
+}
+loadLocale()
export default i18n;
\ No newline at end of file
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index 32ad62d..67a80be 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -85,7 +85,8 @@
"backendTechnology": "Backend technology",
"backstageManagement": "Backstage management",
"bottomBar": "Footer",
- "identity": "Identity"
+ "identity": "Identity",
+ "content1": "The code is completely free and open source, easy to read and understand, and the interface is simple and beautiful, giving you one more choice and reference for your project."
},
"common": {
"ok": "Ok",
@@ -99,8 +100,14 @@
"addTime": "AddTime",
"nickName": "NickName",
"time": "Time",
- "yes": "是",
- "no": "否"
+ "yes": "Yes",
+ "no": "No",
+ "yesterday": "yesterday",
+ "thisWeek": "this week",
+ "lastWeek": "last week",
+ "thisMonth": "this month",
+ "lastMonth": "last month",
+ "today": "today"
},
"btn": {
"add": "Add",
@@ -132,5 +139,9 @@
"view": "To view",
"copy": "Copy",
"operate": "Operate"
- }
+ },
+ "language": "Language",
+ "languageKey": "LanguageKey",
+ "showWay": "Show Way",
+ "table": "Table"
}
\ No newline at end of file
diff --git a/src/i18n/lang/zh-cn.json b/src/i18n/lang/zh-cn.json
index 758bab7..6a69847 100644
--- a/src/i18n/lang/zh-cn.json
+++ b/src/i18n/lang/zh-cn.json
@@ -85,7 +85,8 @@
"backendTechnology": "后端技术",
"backstageManagement": "后台管理",
"bottomBar": "底部栏",
- "identity": "身份"
+ "identity": "身份",
+ "content1": "代码完全免费开源，易读易懂、界面简洁美观，给你的项目多一种选择与参考。"
},
"common": {
"ok": "确定",
@@ -100,7 +101,13 @@
"nickName": "昵称",
"time": "时间",
"yes": "是",
- "no": "否"
+ "no": "否",
+ "yesterday": "昨天",
+ "today": "今天",
+ "thisWeek": "本周",
+ "lastWeek": "上周",
+ "thisMonth": "本月",
+ "lastMonth": "上月"
},
"btn": {
"add": "新增",
@@ -132,5 +139,9 @@
"view": "查看",
"copy": "复制",
"operate": "操作"
- }
+ },
+ "language": "语言",
+ "languageKey": "语言key",
+ "showWay": "显示方式",
+ "table": "表格"
}
\ No newline at end of file
diff --git a/src/i18n/lang/zh-tw.json b/src/i18n/lang/zh-tw.json
index a5a82f2..9627822 100644
--- a/src/i18n/lang/zh-tw.json
+++ b/src/i18n/lang/zh-tw.json
@@ -84,7 +84,9 @@
"backendTechnology": "後端技術",
"backstageManagement": "後台管理",
"bottomBar": "底部欄",
- "identity": "身份"
+ "identity": "身份",
+ "rewardUser": "打賞作者喝杯咖啡表示鼓勵",
+ "content1": "代碼完全免費開源，易讀易懂、界面簡潔美觀，給你的項目多一種選擇與參考。"
},
"common": {
"ok": "確定",
@@ -99,7 +101,13 @@
"nickName": "暱稱",
"time": "時間",
"yes": "是",
- "no": "否"
+ "no": "否",
+ "yesterday": "昨天",
+ "thisWeek": "本週",
+ "lastWeek": "上週",
+ "thisMonth": "本月",
+ "lastMonth": "上月",
+ "today": "今天"
},
"btn": {
"add": "新增",
@@ -127,6 +135,13 @@
"upload": "上傳",
"view": "查看",
"copy": "複製",
- "operate": "操作"
- }
+ "operate": "操作",
+ "authorize": "授權",
+ "close": "關閉",
+ "multi": "批量"
+ },
+ "language": "語言",
+ "languageKey": "語言key",
+ "showWay": "顯示方式",
+ "table": "表格"
}
\ No newline at end of file
diff --git a/src/i18n/pages/langSet/en.js b/src/i18n/pages/langSet/en.js
deleted file mode 100644
index cb147ff..0000000
--- a/src/i18n/pages/langSet/en.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
- language: 'Language',
- languageKey: 'LanguageKey',
- showWay: 'Show Way',
- table: 'Table',
-}
\ No newline at end of file
diff --git a/src/i18n/pages/langSet/zh-cn.js b/src/i18n/pages/langSet/zh-cn.js
deleted file mode 100644
index d996b6c..0000000
--- a/src/i18n/pages/langSet/zh-cn.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
- language: '语言',
- languageKey: '语言key',
- showWay: '显示方式',
- table: '表格',
-}
\ No newline at end of file
diff --git a/src/i18n/pages/langSet/zh-tw.js b/src/i18n/pages/langSet/zh-tw.js
deleted file mode 100644
index df2f026..0000000
--- a/src/i18n/pages/langSet/zh-tw.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
- language: '语言',
- languageKey: '语言key',
- showWay: '显示方式',
- table: '表格',
-}
\ No newline at end of file
diff --git a/src/i18n/pages/login/en.js b/src/i18n/pages/login/en.js
deleted file mode 100644
index 2f8c943..0000000
--- a/src/i18n/pages/login/en.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default {
- login: {
- account: 'ID',
- password: 'Password',
- captcha: 'Captcha',
- btnLogin: 'Login',
- rememberMe: 'Remember Me',
- loginSuccess: 'login success'
- }
-}
\ No newline at end of file
diff --git a/src/i18n/pages/login/en.json b/src/i18n/pages/login/en.json
new file mode 100644
index 0000000..22b7134
--- /dev/null
+++ b/src/i18n/pages/login/en.json
@@ -0,0 +1,13 @@
+{
+ "login": {
+ "account": "ID",
+ "password": "Password",
+ "captcha": "Captcha",
+ "btnLogin": "Login",
+ "rememberMe": "Remember Me",
+ "loginSuccess": "login success",
+ "loginTimeOut": "Login status has expired, please log in again",
+ "reLogin": "re-register",
+ "invalidSession": "Invalid session, or session has expired, please log in again."
+ }
+}
\ No newline at end of file
diff --git a/src/i18n/pages/login/zh-cn.js b/src/i18n/pages/login/zh-cn.js
deleted file mode 100644
index 346ff3c..0000000
--- a/src/i18n/pages/login/zh-cn.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default {
- login: {
- account: '账号',
- password: '密码',
- captcha: '验证码',
- btnLogin: '登录',
- rememberMe: '记住密码',
- loginSuccess: '登录成功'
- }
-}
\ No newline at end of file
diff --git a/src/i18n/pages/login/zh-cn.json b/src/i18n/pages/login/zh-cn.json
new file mode 100644
index 0000000..ceb77f4
--- /dev/null
+++ b/src/i18n/pages/login/zh-cn.json
@@ -0,0 +1,13 @@
+{
+ "login": {
+ "account": "账号",
+ "password": "密码",
+ "captcha": "验证码",
+ "btnLogin": "登录",
+ "rememberMe": "记住密码",
+ "loginSuccess": "登录成功",
+ "loginTimeOut": "登录状态已过期，请重新登录",
+ "reLogin": "重新登录",
+ "invalidSession": "无效的会话，或者会话已过期，请重新登录。"
+ }
+}
\ No newline at end of file
diff --git a/src/i18n/pages/login/zh-tw.js b/src/i18n/pages/login/zh-tw.js
deleted file mode 100644
index 33eaab0..0000000
--- a/src/i18n/pages/login/zh-tw.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default {
- login: {
- account: '賬號',
- password: '密碼',
- captcha: '驗證碼',
- btnLogin: '登錄',
- rememberMe: '記住密碼',
- loginSuccess: '登錄成功'
- }
-}
\ No newline at end of file
diff --git a/src/i18n/pages/login/zh-tw.json b/src/i18n/pages/login/zh-tw.json
new file mode 100644
index 0000000..069130b
--- /dev/null
+++ b/src/i18n/pages/login/zh-tw.json
@@ -0,0 +1,13 @@
+{
+ "login": {
+ "account": "賬號",
+ "password": "密碼",
+ "captcha": "驗證碼",
+ "btnLogin": "登錄",
+ "rememberMe": "記住密碼",
+ "loginSuccess": "登錄成功",
+ "loginTimeOut": "登錄狀態已過期，請重新登錄",
+ "reLogin": "重新登錄",
+ "invalidSession": "無效的會話，或者會話已過期，請重新登錄。"
+ }
+}
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 4836b28..072633f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -13,8 +13,8 @@ const store = createStore({
user,
tagsView,
permission,
- settings,
- socket
+ settings,
+ socket
},
getters
});
diff --git a/src/views/index.vue b/src/views/index.vue
index c91c904..788e944 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -41,7 +41,7 @@
ZRAdmin.NET借鉴了很多开源项目的优点，让你开发Web管理系统更简单，所以我也把它给开源了（前端
vue页面主要参考若依，在此表示感谢.)
- 代码完全免费开源，易读易懂、界面简洁美观，给你的项目多一种选择与参考。
+ {{ $t('layout.content1') }}
{{ $t('layout.currentVersion') }}: v{{ version }}