From 11e269546592fa32d8f6a91daf962895fc573687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Mon, 20 Jan 2025 10:57:45 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"update=20=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8?= =?UTF-8?q?json=20=E4=B9=A6=E5=86=99=E6=9B=B4=E6=96=B9=E4=BE=BF"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8d398d2940df74723a07c6a8ec877b3f203fb428. --- src/lang/en_US.json | 81 ------------------------------------------ src/lang/en_US.ts | 85 +++++++++++++++++++++++++++++++++++++++++++++ src/lang/index.ts | 4 +-- src/lang/zh_CN.json | 81 ------------------------------------------ src/lang/zh_CN.ts | 85 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 172 insertions(+), 164 deletions(-) delete mode 100644 src/lang/en_US.json create mode 100644 src/lang/en_US.ts delete mode 100644 src/lang/zh_CN.json create mode 100644 src/lang/zh_CN.ts diff --git a/src/lang/en_US.json b/src/lang/en_US.json deleted file mode 100644 index f465aa6..0000000 --- a/src/lang/en_US.json +++ /dev/null @@ -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" - } -} diff --git a/src/lang/en_US.ts b/src/lang/en_US.ts new file mode 100644 index 0000000..b090d3e --- /dev/null +++ b/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' + } +}; diff --git a/src/lang/index.ts b/src/lang/index.ts index a6bf6b8..4f8e74c 100644 --- a/src/lang/index.ts +++ b/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'; /** * 获取当前语言 diff --git a/src/lang/zh_CN.json b/src/lang/zh_CN.json deleted file mode 100644 index 14138b5..0000000 --- a/src/lang/zh_CN.json +++ /dev/null @@ -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": "退出登录" - } -} diff --git a/src/lang/zh_CN.ts b/src/lang/zh_CN.ts new file mode 100644 index 0000000..3cc9872 --- /dev/null +++ b/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: '退出登录' + } +};