修改翻译

.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",
 }

src/i18n/index.js

@@ -1,18 +1,20 @@
-import { createI18n } from 'vue-i18n';
+import { createI18n } from 'vue-i18n'
-import store from '@/store/index';
+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'
+const language = computed(() => {
-import pageLoginEn from './pages/login/en'
+  return store.getters.language
-import pageLoginTw from './pages/login/zh-tw'
+})
 
-import pageLangSetCn from './pages/langSet/zh-cn'
+import zhCn from './lang/zh-cn.json'
-import pageLangSetEn from './pages/langSet/en'
+import en from './lang/en.json'
-import pageLangSetTw from './pages/langSet/zh-tw'
+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-cn': {
-    'zh-tw': { ...zhTw, ...pageLoginTw, ...pageLangSetTw, ...pagemenuTw },
+      ...zhCn,
-    'en': { ...en, ...pageLoginEn, ...pageLangSetEn, ...pagemenuEn }
+      ...pageLoginCn,
+      ...pagemenuCn
+    },
+    'zh-tw': {
+      ...zhTw,
+      ...pageLoginTw,
+      ...pagemenuTw
+    },
+    'en': {
+      ...en,
+      ...pageLoginEn,
+      ...pagemenuEn
+    }
   }
 })
 
-listLangByLocale(store.getters.language).then(res => {
+const loadLocale = () => {
-  const { code, data } = res
+  listLangByLocale(language.value).then(res => {
-  if (code == 200) {
+    const { code, data } = res
-    i18n.global.mergeLocaleMessage('zh-cn', data.cn)
+    if (code == 200) {
-    i18n.global.mergeLocaleMessage('zh-tw', data.tw)
+      i18n.global.mergeLocaleMessage('zh-cn', data.cn)
-    i18n.global.mergeLocaleMessage('en', data.en)
+      i18n.global.mergeLocaleMessage('zh-tw', data.tw)
-  }
+      i18n.global.mergeLocaleMessage('en', data.en)
-})
+    }
+  })
+}
+loadLocale()
 export default i18n;

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": "是",
+    "yes": "Yes",
-    "no": "否"
+    "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"
 }

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": "表格"
 }

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": "表格"
 }

src/i18n/pages/langSet/en.js

@@ -1,6 +0,0 @@
-export default {
-  language: 'Language',
-  languageKey: 'LanguageKey',
-  showWay: 'Show Way',
-  table: 'Table',
-}

src/i18n/pages/langSet/zh-cn.js

@@ -1,6 +0,0 @@
-export default {
-	language: '语言',
-  languageKey: '语言key',
-  showWay: '显示方式',
-  table: '表格',
-}

src/i18n/pages/langSet/zh-tw.js

@@ -1,6 +0,0 @@
-export default {
-  language: '语言',
-  languageKey: '语言key',
-  showWay: '显示方式',
-  table: '表格',
-}

src/i18n/pages/login/en.js

@@ -1,10 +0,0 @@
-export default {
-  login: {
-    account: 'ID',
-    password: 'Password',
-    captcha: 'Captcha',
-    btnLogin: 'Login',
-    rememberMe: 'Remember Me',
-    loginSuccess: 'login success'
-  }
-}

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."
+  }
+}

src/i18n/pages/login/zh-cn.js

@@ -1,10 +0,0 @@
-export default {
-  login: {
-    account: '账号',
-    password: '密码',
-    captcha: '验证码',
-    btnLogin: '登录',
-    rememberMe: '记住密码',
-    loginSuccess: '登录成功'
-  }
-}

src/i18n/pages/login/zh-cn.json

@@ -0,0 +1,13 @@
+{
+  "login": {
+    "account": "账号",
+    "password": "密码",
+    "captcha": "验证码",
+    "btnLogin": "登录",
+    "rememberMe": "记住密码",
+    "loginSuccess": "登录成功",
+    "loginTimeOut": "登录状态已过期，请重新登录",
+    "reLogin": "重新登录",
+    "invalidSession": "无效的会话，或者会话已过期，请重新登录。"
+  }
+}

src/i18n/pages/login/zh-tw.js

@@ -1,10 +0,0 @@
-export default {
-  login: {
-    account: '賬號',
-    password: '密碼',
-    captcha: '驗證碼',
-    btnLogin: '登錄',
-    rememberMe: '記住密碼',
-    loginSuccess: '登錄成功'
-  }
-}

src/i18n/pages/login/zh-tw.json

@@ -0,0 +1,13 @@
+{
+  "login": {
+    "account": "賬號",
+    "password": "密碼",
+    "captcha": "驗證碼",
+    "btnLogin": "登錄",
+    "rememberMe": "記住密碼",
+    "loginSuccess": "登錄成功",
+    "loginTimeOut": "登錄狀態已過期，請重新登錄",
+    "reLogin": "重新登錄",
+    "invalidSession": "無效的會話，或者會話已過期，請重新登錄。"
+  }
+}

src/store/index.js

@@ -13,8 +13,8 @@ const store = createStore({
     user,
     tagsView,
     permission,
-		settings,
+    settings,
-		socket
+    socket
   },
   getters
 });

src/views/index.vue

@@ -41,7 +41,7 @@
           ZRAdmin.NET借鉴了很多开源项目的优点，让你开发Web管理系统更简单，所以我也把它给开源了（前端
           <code>vue页面</code>主要参考若依，在此表示感谢.)
         </p>
-        <p>代码完全免费开源，易读易懂、界面简洁美观，给你的项目多一种选择与参考。</p>
+        <p>{{ $t('layout.content1') }}</p>
         <p>
           <b>{{ $t('layout.currentVersion') }}:</b> <span>v{{ version }}</span>
           <el-link