Browse Source

Revert "update 优化 国际化改为使用json 书写更方便"

This reverts commit 8d398d2940df74723a07c6a8ec877b3f203fb428.
疯狂的狮子Li 3 months ago
parent
commit
11e2695465
5 changed files with 172 additions and 164 deletions
  1. 0 81
      src/lang/en_US.json
  2. 85 0
      src/lang/en_US.ts
  3. 2 2
      src/lang/index.ts
  4. 0 81
      src/lang/zh_CN.json
  5. 85 0
      src/lang/zh_CN.ts

+ 0 - 81
src/lang/en_US.json

@@ -1,81 +0,0 @@
-{
-  "route": {
-    "dashboard": "Dashboard",
-    "document": "Document"
-  },
-  "login": {
-    "selectPlaceholder": "Please select/enter a company name",
-    "username": "Username",
-    "password": "Password",
-    "login": "Login",
-    "logging": "Logging...",
-    "code": "Verification Code",
-    "rememberPassword": "Remember me",
-    "switchRegisterPage": "Sign up now",
-    "rule": {
-      "tenantId": {
-        "required": "Please enter your tenant id"
-      },
-      "username": {
-        "required": "Please enter your account"
-      },
-      "password": {
-        "required": "Please enter your password"
-      },
-      "code": {
-        "required": "Please enter a verification code"
-      }
-    },
-    "social": {
-      "wechat": "Wechat Login",
-      "maxkey": "MaxKey Login",
-      "topiam": "TopIam Login",
-      "gitee": "Gitee Login",
-      "github": "Github Login"
-    }
-  },
-  "register": {
-    "selectPlaceholder": "Please select/enter a company name",
-    "username": "Username",
-    "password": "Password",
-    "confirmPassword": "Confirm Password",
-    "register": "Register",
-    "registering": "Registering...",
-    "registerSuccess": "Congratulations, your {username} account has been registered!",
-    "code": "Verification Code",
-    "switchLoginPage": "Log in with an existing account",
-    "rule": {
-      "tenantId": {
-        "required": "Please enter your tenant id"
-      },
-      "username": {
-        "required": "Please enter your account",
-        "length": "The length of the user account must be between {min} and {max}"
-      },
-      "password": {
-        "required": "Please enter your password",
-        "length": "The user password must be between {min} and {max} in length",
-        "pattern": "Can't contain illegal characters: {strings}"
-      },
-      "code": {
-        "required": "Please enter a verification code"
-      },
-      "confirmPassword": {
-        "required": "Please enter your password again",
-        "equalToPassword": "The password entered twice is inconsistent"
-      }
-    }
-  },
-  "navbar": {
-    "full": "Full Screen",
-    "language": "Language",
-    "dashboard": "Dashboard",
-    "document": "Document",
-    "message": "Message",
-    "layoutSize": "Layout Size",
-    "selectTenant": "Select Tenant",
-    "layoutSetting": "Layout Setting",
-    "personalCenter": "Personal Center",
-    "logout": "Logout"
-  }
-}

+ 85 - 0
src/lang/en_US.ts

@@ -0,0 +1,85 @@
+export default {
+  // 路由国际化
+  route: {
+    dashboard: 'Dashboard',
+    document: 'Document'
+  },
+  // 登录页面国际化
+  login: {
+    selectPlaceholder: 'Please select/enter a company name',
+    username: 'Username',
+    password: 'Password',
+    login: 'Login',
+    logging: 'Logging...',
+    code: 'Verification Code',
+    rememberPassword: 'Remember me',
+    switchRegisterPage: 'Sign up now',
+    rule: {
+      tenantId: {
+        required: 'Please enter your tenant id'
+      },
+      username: {
+        required: 'Please enter your account'
+      },
+      password: {
+        required: 'Please enter your password'
+      },
+      code: {
+        required: 'Please enter a verification code'
+      }
+    },
+    social: {
+      wechat: 'Wechat Login',
+      maxkey: 'MaxKey Login',
+      topiam: 'TopIam Login',
+      gitee: 'Gitee Login',
+      github: 'Github Login'
+    }
+  },
+  // 注册页面国际化
+  register: {
+    selectPlaceholder: 'Please select/enter a company name',
+    username: 'Username',
+    password: 'Password',
+    confirmPassword: 'Confirm Password',
+    register: 'Register',
+    registering: 'Registering...',
+    registerSuccess: 'Congratulations, your {username} account has been registered!',
+    code: 'Verification Code',
+    switchLoginPage: 'Log in with an existing account',
+    rule: {
+      tenantId: {
+        required: 'Please enter your tenant id'
+      },
+      username: {
+        required: 'Please enter your account',
+        length: 'The length of the user account must be between {min} and {max}'
+      },
+      password: {
+        required: 'Please enter your password',
+        length: 'The user password must be between {min} and {max} in length',
+        pattern: "Can't contain illegal characters: {strings}"
+      },
+      code: {
+        required: 'Please enter a verification code'
+      },
+      confirmPassword: {
+        required: 'Please enter your password again',
+        equalToPassword: 'The password entered twice is inconsistent'
+      }
+    }
+  },
+  // 导航栏国际化
+  navbar: {
+    full: 'Full Screen',
+    language: 'Language',
+    dashboard: 'Dashboard',
+    document: 'Document',
+    message: 'Message',
+    layoutSize: 'Layout Size',
+    selectTenant: 'Select Tenant',
+    layoutSetting: 'Layout Setting',
+    personalCenter: 'Personal Center',
+    logout: 'Logout'
+  }
+};

+ 2 - 2
src/lang/index.ts

@@ -2,8 +2,8 @@
 import { createI18n } from 'vue-i18n';
 
 import { LanguageEnum } from '@/enums/LanguageEnum';
-import zh_CN from '@/lang/zh_CN.json';
-import en_US from '@/lang/en_US.json';
+import zh_CN from '@/lang/zh_CN';
+import en_US from '@/lang/en_US';
 
 /**
  * 获取当前语言

+ 0 - 81
src/lang/zh_CN.json

@@ -1,81 +0,0 @@
-{
-  "route": {
-    "dashboard": "首页",
-    "document": "项目文档"
-  },
-  "login": {
-    "selectPlaceholder": "请选择/输入公司名称",
-    "username": "用户名",
-    "password": "密码",
-    "login": "登 录",
-    "logging": "登 录 中...",
-    "code": "验证码",
-    "rememberPassword": "记住我",
-    "switchRegisterPage": "立即注册",
-    "rule": {
-      "tenantId": {
-        "required": "请输入您的租户编号"
-      },
-      "username": {
-        "required": "请输入您的账号"
-      },
-      "password": {
-        "required": "请输入您的密码"
-      },
-      "code": {
-        "required": "请输入验证码"
-      }
-    },
-    "social": {
-      "wechat": "微信登录",
-      "maxkey": "MaxKey登录",
-      "topiam": "TopIam登录",
-      "gitee": "Gitee登录",
-      "github": "Github登录"
-    }
-  },
-  "register": {
-    "selectPlaceholder": "请选择/输入公司名称",
-    "username": "用户名",
-    "password": "密码",
-    "confirmPassword": "确认密码",
-    "register": "注 册",
-    "registering": "注 册 中...",
-    "registerSuccess": "恭喜你,您的账号 {username} 注册成功!",
-    "code": "验证码",
-    "switchLoginPage": "使用已有账户登录",
-    "rule": {
-      "tenantId": {
-        "required": "请输入您的租户编号"
-      },
-      "username": {
-        "required": "请输入您的账号",
-        "length": "用户账号长度必须介于 {min} 和 {max} 之间"
-      },
-      "password": {
-        "required": "请输入您的密码",
-        "length": "用户密码长度必须介于 {min} 和 {max} 之间",
-        "pattern": "不能包含非法字符:{strings}"
-      },
-      "code": {
-        "required": "请输入验证码"
-      },
-      "confirmPassword": {
-        "required": "请再次输入您的密码",
-        "equalToPassword": "两次输入的密码不一致"
-      }
-    }
-  },
-  "navbar": {
-    "full": "全屏",
-    "language": "语言",
-    "dashboard": "首页",
-    "document": "项目文档",
-    "message": "消息",
-    "layoutSize": "布局大小",
-    "selectTenant": "选择租户",
-    "layoutSetting": "布局设置",
-    "personalCenter": "个人中心",
-    "logout": "退出登录"
-  }
-}

+ 85 - 0
src/lang/zh_CN.ts

@@ -0,0 +1,85 @@
+export default {
+  // 路由国际化
+  route: {
+    dashboard: '首页',
+    document: '项目文档'
+  },
+  // 登录页面国际化
+  login: {
+    selectPlaceholder: '请选择/输入公司名称',
+    username: '用户名',
+    password: '密码',
+    login: '登 录',
+    logging: '登 录 中...',
+    code: '验证码',
+    rememberPassword: '记住我',
+    switchRegisterPage: '立即注册',
+    rule: {
+      tenantId: {
+        required: '请输入您的租户编号'
+      },
+      username: {
+        required: '请输入您的账号'
+      },
+      password: {
+        required: '请输入您的密码'
+      },
+      code: {
+        required: '请输入验证码'
+      }
+    },
+    social: {
+      wechat: '微信登录',
+      maxkey: 'MaxKey登录',
+      topiam: 'TopIam登录',
+      gitee: 'Gitee登录',
+      github: 'Github登录'
+    }
+  },
+  // 注册页面国际化
+  register: {
+    selectPlaceholder: '请选择/输入公司名称',
+    username: '用户名',
+    password: '密码',
+    confirmPassword: '确认密码',
+    register: '注 册',
+    registering: '注 册 中...',
+    registerSuccess: '恭喜你,您的账号 {username} 注册成功!',
+    code: '验证码',
+    switchLoginPage: '使用已有账户登录',
+    rule: {
+      tenantId: {
+        required: '请输入您的租户编号'
+      },
+      username: {
+        required: '请输入您的账号',
+        length: '用户账号长度必须介于 {min} 和 {max} 之间'
+      },
+      password: {
+        required: '请输入您的密码',
+        length: '用户密码长度必须介于 {min} 和 {max} 之间',
+        pattern: '不能包含非法字符:{strings}'
+      },
+      code: {
+        required: '请输入验证码'
+      },
+      confirmPassword: {
+        required: '请再次输入您的密码',
+        equalToPassword: '两次输入的密码不一致'
+      }
+    }
+  },
+  // 导航栏国际化
+  navbar: {
+    full: '全屏',
+    language: '语言',
+    dashboard: '首页',
+    document: '项目文档',
+    message: '消息',
+    layoutSize: '布局大小',
+    selectTenant: '选择租户',
+    layoutSetting: '布局设置',
+    personalCenter: '个人中心',
+    logout: '退出登录'
+  }
+};