From f56764ae4b2b12a96685d2676e36e97dffd6dc0e Mon Sep 17 00:00:00 2001
From: haibiao_gu <haibiao_gu@pro-mart.cn>
Date: Sat, 21 Sep 2024 22:56:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(utils):=20=E4=BF=AE=E5=A4=8Dwindows?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=8B=E4=BD=BF=E7=94=A8vscode=E7=9A=84i18?=
 =?UTF-8?q?nAlly=E6=8F=92=E4=BB=B6=E6=97=A0=E6=B3=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E8=AE=B0=E5=BE=97=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?.json=E5=90=8E=E7=BC=80=E7=9A=84=E6=96=87=E4=BB=B6=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: haibiao_gu <haibiao_gu@pro-mart.cn>
---
 .vscode/settings.json        | 2 +-
 src/locales/langs/en-us.json | 3 +++
 src/locales/langs/en-us.ts   | 5 ++++-
 src/locales/langs/zh-cn.json | 3 +++
 src/locales/langs/zh-cn.ts   | 5 ++++-
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 src/locales/langs/en-us.json
 create mode 100644 src/locales/langs/zh-cn.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4fd9e522..219c34d3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,7 +7,7 @@
   "editor.formatOnSave": false,
   "eslint.validate": ["html", "css", "scss", "json", "jsonc"],
   "i18n-ally.displayLanguage": "zh-cn",
-  "i18n-ally.enabledParsers": ["ts"],
+  "i18n-ally.enabledParsers": ["ts", "json"],
   "i18n-ally.enabledFrameworks": ["vue"],
   "i18n-ally.editor.preferEditor": true,
   "i18n-ally.keystyle": "nested",
diff --git a/src/locales/langs/en-us.json b/src/locales/langs/en-us.json
new file mode 100644
index 00000000..f59cb4fc
--- /dev/null
+++ b/src/locales/langs/en-us.json
@@ -0,0 +1,3 @@
+{
+  "test": "Test i18ally inserting vscode into the window system"
+}
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 8b331859..e71fa1fc 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -1,3 +1,5 @@
+import enUS from './en-us.json';
+
 const local: App.I18n.Schema = {
   system: {
     title: 'SoybeanAdmin',
@@ -281,7 +283,8 @@ const local: App.I18n.Schema = {
   },
   datatable: {
     itemCount: 'Total {total} items'
-  }
+  },
+  ...enUS
 };
 
 export default local;
diff --git a/src/locales/langs/zh-cn.json b/src/locales/langs/zh-cn.json
new file mode 100644
index 00000000..9ba3958a
--- /dev/null
+++ b/src/locales/langs/zh-cn.json
@@ -0,0 +1,3 @@
+{
+  "test": "测试插入window系统下vscode的i18nally"
+}
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 630b2910..482a4c88 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -1,3 +1,5 @@
+import zhCN from './zh-cn.json';
+
 const local: App.I18n.Schema = {
   system: {
     title: 'Soybean 管理系统',
@@ -281,7 +283,8 @@ const local: App.I18n.Schema = {
   },
   datatable: {
     itemCount: '共 {total} 条'
-  }
+  },
+  ...zhCN
 };
 
 export default local;