From a1297934bc23da28807539d9c9d220350cd201ae Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 8 Dec 2023 13:36:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
locale/en.json | 9 +++++--
locale/id.json | 9 +++++--
locale/uni-app.en.json | 56 +++++++++++++++++++++---------------------
locale/uni-app.id.json | 4 +--
locale/zh-Hans.json | 10 +++++---
pages/login/setup.vue | 8 +++---
utils/request.js | 4 ++-
utils/request1.js | 4 ++-
8 files changed, 61 insertions(+), 43 deletions(-)
diff --git a/locale/en.json b/locale/en.json
index 551f39d..d2ff6ef 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -1,5 +1,9 @@
{
- "index.language-change-confirm": "Applying this setting will restart the app",
+ "utils.loading": "Loading...",
+ "uni.dataSelect.placeholder": "Please select",
+ "uni.dataSelect.emptyTips": "No options available",
+ "button.confirm": "OK",
+ "button.search": "Query",
"login.username": "User name",
"login.password": "Password",
"login.remember": "Remember username",
@@ -11,5 +15,6 @@
"setting.language": "language",
"setting.server": "server address",
"setting.refresh": "Refresh time",
- "setting.customer-label-printing": "Label printing"
+ "setting.customer-label-printing": "Label printing",
+ "setting.language-change-confirm": "Applying this setting will restart the app"
}
\ No newline at end of file
diff --git a/locale/id.json b/locale/id.json
index bc17267..2137eca 100644
--- a/locale/id.json
+++ b/locale/id.json
@@ -1,5 +1,9 @@
{
- "index.language-change-confirm": "Menggunakan pengaturan ini akan memulai ulang aplikasi",
+ "utils.loading": "Memuatkan...",
+ "uni.dataSelect.placeholder": "Silakan pilih",
+ "uni.dataSelect.emptyTips": "Tidak ada pilihan tersedia",
+ "button.confirm": "OK",
+ "button.search": "pertanyaan",
"login.username": "Nama pengguna",
"login.password": "Sandi",
"login.remember": "Ingat nama pengguna",
@@ -11,5 +15,6 @@
"setting.language": "Bahasa",
"setting.server": "Alamat server",
"setting.refresh": "Waktu segar",
- "setting.customer-label-printing": "Label pelanggan"
+ "setting.customer-label-printing": "Label pelanggan",
+ "setting.language-change-confirm": "Menggunakan pengaturan ini akan memulai ulang aplikasi"
}
\ No newline at end of file
diff --git a/locale/uni-app.en.json b/locale/uni-app.en.json
index 88b84ef..acb9998 100644
--- a/locale/uni-app.en.json
+++ b/locale/uni-app.en.json
@@ -2,34 +2,34 @@
"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": "发送"
+ "uni.showActionSheet.cancel": "Cancel",
+ "uni.showToast.unpaired": "Please note that showToast and hideToast must be paired for use",
+ "uni.showLoading.unpaired": "Please note that showLoading and hideLoading must be paired for use",
+ "uni.showModal.cancel": "Cancel",
+ "uni.showModal.confirm": "Ok",
+ "uni.chooseImage.cancel": "Cancel",
+ "uni.chooseImage.sourceType.album": "Select from album",
+ "uni.chooseImage.sourceType.camera": "Capture",
+ "uni.chooseVideo.cancel": "Cancel",
+ "uni.chooseVideo.sourceType.album": "Select from album",
+ "uni.chooseVideo.sourceType.camera": "Capture",
+ "uni.previewImage.cancel": "Cancel",
+ "uni.previewImage.button.save": "Save image",
+ "uni.previewImage.save.success": "Successfully saved image to album",
+ "uni.previewImage.save.fail": "Saving image to album failed",
+ "uni.setClipboardData.success": "Content copied",
+ "uni.scanCode.title": "Scan Code",
+ "uni.scanCode.album": "Album",
+ "uni.scanCode.fail": "Recognition failed",
+ "uni.scanCode.flash.on": "Tap to illuminate",
+ "uni.scanCode.flash.off": "Tap to close",
+ "uni.startSoterAuthentication.authContent": "Fingerprint recognition in progress...",
+ "uni.picker.done": "Complete",
+ "uni.picker.cancel": "Cancel",
+ "uni.video.danmu": "Barrage",
+ "uni.video.volume": "Volume",
+ "uni.button.feedback.title": "Problem feedback",
+ "uni.button.feedback.send": "Send"
},
"ios": {},
"android": {}
diff --git a/locale/uni-app.id.json b/locale/uni-app.id.json
index 36d2208..c0751fc 100644
--- a/locale/uni-app.id.json
+++ b/locale/uni-app.id.json
@@ -26,8 +26,8 @@
"uni.startSoterAuthentication.authContent": "Pengenalan sidik jari...",
"uni.picker.done": "Selesai",
"uni.picker.cancel": "Batalkan",
- "uni.video.danmu": "Layar peluru",
- "uni.video.volume": "Roll",
+ "uni.video.danmu": "Percakapan peluru",
+ "uni.video.volume": "Volume",
"uni.button.feedback.title": "Balasan masalah",
"uni.button.feedback.send": "kirim"
},
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index dfe2a85..deeae63 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -1,5 +1,9 @@
{
- "index.language-change-confirm": "应用此设置将重启App",
+ "utils.loading": "加载中...",
+ "uni.dataSelect.placeholder": "请选择",
+ "uni.dataSelect.emptyTips": "无选项",
+ "button.confirm": "确定",
+ "button.search": "查询",
"login.username": "用户名",
"login.password": "密码",
"login.remember": "记住用户名",
@@ -11,6 +15,6 @@
"setting.language": "语言",
"setting.server": "服务器地址",
"setting.refresh": "刷新时间",
- "setting.customer-label-printing": "客户标签打印"
-
+ "setting.customer-label-printing": "客户标签打印",
+ "setting.language-change-confirm": "应用此设置将重启App"
}
\ No newline at end of file
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index 413ef31..6024968 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -20,14 +20,14 @@
{{$t('setting.customer-label-printing')}}
-
+
-
-
+
+
@@ -68,7 +68,7 @@
onLocaleChange(e) {
if (this.isAndroid) {
uni.showModal({
- content: this.$t('index.language-change-confirm'),
+ content: this.$t('setting.language-change-confirm'),
success: (res) => {
if (res.confirm) {
uni.setLocale(e);
diff --git a/utils/request.js b/utils/request.js
index fa0020a..abc91fc 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,5 +1,6 @@
// import qs from 'qs' // 处理data
import store from '@/vuex/store'
+import i18n from '../locale/index.js'
const request = (params) => {
let _self = this;
let url = params.url;
@@ -36,7 +37,8 @@ const request = (params) => {
}
const requestUrl = `${store.getters.baseUrl}/` + url;
uni.showLoading({
- title: '加载中...'
+ // title: '加载中...'
+ title: i18n.tc('utils.loading')
});
return new Promise((resolve, reject) => {
uni.request({
diff --git a/utils/request1.js b/utils/request1.js
index 90dbecf..1cdff30 100644
--- a/utils/request1.js
+++ b/utils/request1.js
@@ -1,4 +1,5 @@
import store from '@/vuex/store'
+import i18n from '../locale/index.js'
const request1 = (params) => {
let _self = this;
let url = params.url;
@@ -35,7 +36,8 @@ const request1 = (params) => {
}
const requestUrl = url;
uni.showLoading({
- title: '加载中...'
+ // title: '加载中...'
+ title: i18n.tc('utils.loading')
});
return new Promise((resolve, reject) => {
uni.request({