From 00641a1134b1ece85b379930c8da27cccd1e33f9 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 8 Dec 2023 09:39:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E6=96=87=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/{en1.json => en-1.json}      |  0
 locale/{id1.json => id-1.json}      |  0
 locale/index.js                     | 10 ++++----
 locale/uni-app.en.json              | 36 +++++++++++++++++++++++++++++
 locale/uni-app.id.json              |  4 ++--
 locale/uni-app.zh-Hans.json         | 36 +++++++++++++++++++++++++++++
 locale/{zh1.json => zh-Hans-1.json} |  0
 locale/{zh.json => zh-Hans.json}    |  0
 pages/login/setup.vue               |  2 +-
 9 files changed, 80 insertions(+), 8 deletions(-)
 rename locale/{en1.json => en-1.json} (100%)
 rename locale/{id1.json => id-1.json} (100%)
 create mode 100644 locale/uni-app.en.json
 create mode 100644 locale/uni-app.zh-Hans.json
 rename locale/{zh1.json => zh-Hans-1.json} (100%)
 rename locale/{zh.json => zh-Hans.json} (100%)

diff --git a/locale/en1.json b/locale/en-1.json
similarity index 100%
rename from locale/en1.json
rename to locale/en-1.json
diff --git a/locale/id1.json b/locale/id-1.json
similarity index 100%
rename from locale/id1.json
rename to locale/id-1.json
diff --git a/locale/index.js b/locale/index.js
index de661f1..d884449 100644
--- a/locale/index.js
+++ b/locale/index.js
@@ -1,13 +1,13 @@
 
 import en from './en.json'
-import en1 from './en1.json'
-import zh from './zh.json'
-import zh1 from './zh1.json'
+import en1 from './en-1.json'
+import zhHans from './zh-Hans.json'
+import zhHans1 from './zh-Hans-1.json'
 import id from './id.json'
-import id1 from './id1.json'
+import id1 from './id-1.json'
 const messages = {
 	'en': Object.assign(en, en1),
-	'zh': Object.assign(zh, zh1),
+	'zh-Hans': Object.assign(zhHans, zhHans1),
 	'id': Object.assign(id, id1)
 }
 
diff --git a/locale/uni-app.en.json b/locale/uni-app.en.json
new file mode 100644
index 0000000..88b84ef
--- /dev/null
+++ b/locale/uni-app.en.json
@@ -0,0 +1,36 @@
+{
+  "common": {
+    "uni.app.quit": "Press again to exit the application",
+    "uni.async.error": "Connection to server timeout, click on screen to retry",
+    "uni.showActionSheet.cancel": "取消",
+    "uni.showToast.unpaired": "请注意 showToast 与 hideToast 必须配对使用",
+    "uni.showLoading.unpaired": "请注意 showLoading 与 hideLoading 必须配对使用",
+    "uni.showModal.cancel": "取消",
+    "uni.showModal.confirm": "确定",
+    "uni.chooseImage.cancel": "取消",
+    "uni.chooseImage.sourceType.album": "从相册选择",
+    "uni.chooseImage.sourceType.camera": "拍摄",
+    "uni.chooseVideo.cancel": "取消",
+    "uni.chooseVideo.sourceType.album": "从相册选择",
+    "uni.chooseVideo.sourceType.camera": "拍摄",
+    "uni.previewImage.cancel": "取消",
+    "uni.previewImage.button.save": "保存图像",
+    "uni.previewImage.save.success": "保存图像到相册成功",
+    "uni.previewImage.save.fail": "保存图像到相册失败",
+    "uni.setClipboardData.success": "内容已复制",
+    "uni.scanCode.title": "扫码",
+    "uni.scanCode.album": "相册",
+    "uni.scanCode.fail": "识别失败",
+    "uni.scanCode.flash.on": "轻触照亮",
+    "uni.scanCode.flash.off": "轻触关闭",
+    "uni.startSoterAuthentication.authContent": "指纹识别中...",
+    "uni.picker.done": "完成",
+    "uni.picker.cancel": "取消",
+    "uni.video.danmu": "弹幕",
+    "uni.video.volume": "音量",
+    "uni.button.feedback.title": "问题反馈",
+    "uni.button.feedback.send": "发送"
+  },
+  "ios": {},
+  "android": {}
+}
\ No newline at end of file
diff --git a/locale/uni-app.id.json b/locale/uni-app.id.json
index b8b9867..36d2208 100644
--- a/locale/uni-app.id.json
+++ b/locale/uni-app.id.json
@@ -1,7 +1,7 @@
 {
   "common": {
-    "uni.app.quit": "Tekan lagi, aplikasi akan keluar",
-    "uni.async.error": "Koneksi ke server kehabisan waktu. Klik pada layar untuk mencoba lagi",
+    "uni.app.quit": "Tekan lagi untuk keluar dari aplikasi",
+    "uni.async.error": "Sambungan ke timeout server, klik pada layar untuk mencoba lagi",
     "uni.showActionSheet.cancel": "Batalkan",
     "uni.showToast.unpaired": "Silakan perhatikan bahwa showToast dan hideToast harus dipasang untuk digunakan",
     "uni.showLoading.unpaired": "Silakan perhatikan bahwa ShowLoading dan hideLoading harus dipasang untuk digunakan",
diff --git a/locale/uni-app.zh-Hans.json b/locale/uni-app.zh-Hans.json
new file mode 100644
index 0000000..78cfef2
--- /dev/null
+++ b/locale/uni-app.zh-Hans.json
@@ -0,0 +1,36 @@
+{
+  "common": {
+    "uni.app.quit": "再按一次退出应用",
+    "uni.async.error": "连接服务器超时，点击屏幕重试",
+    "uni.showActionSheet.cancel": "取消",
+    "uni.showToast.unpaired": "请注意 showToast 与 hideToast 必须配对使用",
+    "uni.showLoading.unpaired": "请注意 showLoading 与 hideLoading 必须配对使用",
+    "uni.showModal.cancel": "取消",
+    "uni.showModal.confirm": "确定",
+    "uni.chooseImage.cancel": "取消",
+    "uni.chooseImage.sourceType.album": "从相册选择",
+    "uni.chooseImage.sourceType.camera": "拍摄",
+    "uni.chooseVideo.cancel": "取消",
+    "uni.chooseVideo.sourceType.album": "从相册选择",
+    "uni.chooseVideo.sourceType.camera": "拍摄",
+    "uni.previewImage.cancel": "取消",
+    "uni.previewImage.button.save": "保存图像",
+    "uni.previewImage.save.success": "保存图像到相册成功",
+    "uni.previewImage.save.fail": "保存图像到相册失败",
+    "uni.setClipboardData.success": "内容已复制",
+    "uni.scanCode.title": "扫码",
+    "uni.scanCode.album": "相册",
+    "uni.scanCode.fail": "识别失败",
+    "uni.scanCode.flash.on": "轻触照亮",
+    "uni.scanCode.flash.off": "轻触关闭",
+    "uni.startSoterAuthentication.authContent": "指纹识别中...",
+    "uni.picker.done": "完成",
+    "uni.picker.cancel": "取消",
+    "uni.video.danmu": "弹幕",
+    "uni.video.volume": "音量",
+    "uni.button.feedback.title": "问题反馈",
+    "uni.button.feedback.send": "发送"
+  },
+  "ios": {},
+  "android": {}
+}
\ No newline at end of file
diff --git a/locale/zh1.json b/locale/zh-Hans-1.json
similarity index 100%
rename from locale/zh1.json
rename to locale/zh-Hans-1.json
diff --git a/locale/zh.json b/locale/zh-Hans.json
similarity index 100%
rename from locale/zh.json
rename to locale/zh-Hans.json
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index 55f1034..413ef31 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -45,7 +45,7 @@
 				index: '',
 				addrip: this.$store.getters.baseUrl,
 				setTime: this.$store.getters.setTime / 1000,
-				options1: [{text: '中文',value: 'zh'}, {text: 'English', value: 'en'}, {text: 'Indonesia', value: 'id'}],
+				options1: [{text: '中文',value: 'zh-Hans'}, {text: 'English', value: 'en'}, {text: 'Indonesia', value: 'id'}],
 				index1: '',
 				systemLocale: '',
 				applicationLocale: ''