From ea9ff45306815368c3f18ad6df41fc4d032f7159 Mon Sep 17 00:00:00 2001
From: chansee97 <chen.dev@foxmail.com>
Date: Mon, 8 Apr 2024 20:22:49 +0800
Subject: [PATCH] fix: perfect i18n text

---
 .env.test                                  |  6 +++++
 locales/{enUS.json => en_US.json}          | 21 +++++++++++++++++
 locales/{zhCN.json => zh_CN.json}          | 21 +++++++++++++++++
 src/components/custom/IconSelect/index.vue |  6 +++--
 src/modules/i18n.ts                        |  4 ++--
 src/service/http/config.ts                 | 27 +++++++++++-----------
 6 files changed, 68 insertions(+), 17 deletions(-)
 create mode 100644 .env.test
 rename locales/{enUS.json => en_US.json} (85%)
 rename locales/{zhCN.json => zh_CN.json} (86%)

diff --git a/.env.test b/.env.test
new file mode 100644
index 0000000..29a3c4e
--- /dev/null
+++ b/.env.test
@@ -0,0 +1,6 @@
+# 是否开启压缩资源
+VITE_BUILD_COMPRESS=N
+
+# 压缩算法 gzip | brotliCompress | deflate | deflateRaw
+VITE_COMPRESS_TYPE=gzip
+
diff --git a/locales/enUS.json b/locales/en_US.json
similarity index 85%
rename from locales/enUS.json
rename to locales/en_US.json
index f34b0a0..de86448 100644
--- a/locales/enUS.json
+++ b/locales/en_US.json
@@ -116,5 +116,26 @@
     "setting": "System settings",
     "userCenter": "Personal Center",
     "accountSetting": "User settings"
+  },
+  "http": {
+    "defaultTip": "Request error",
+    "400": "Syntax error in the request",
+    "401": "User unauthorized",
+    "403": "Server refused access",
+    "404": "Requested resource does not exist",
+    "405": "Request method not allowed",
+    "408": "Network request timed out",
+    "500": "Internal server error",
+    "501": "Server not implemented the requested functionality",
+    "502": "Bad gateway",
+    "503": "Service unavailable",
+    "504": "Gateway timeout",
+    "505": "HTTP version not supported for this request"
+  },
+  "components": {
+    "iconSelector": {
+      "inputPlaceholder": "Select target icon",
+      "searchPlaceholder": "Search icon"
+    }
   }
 }
diff --git a/locales/zhCN.json b/locales/zh_CN.json
similarity index 86%
rename from locales/zhCN.json
rename to locales/zh_CN.json
index d51e3b5..da911ba 100644
--- a/locales/zhCN.json
+++ b/locales/zh_CN.json
@@ -53,6 +53,27 @@
     "closeAll": "全部关闭",
     "backHome": "回到首页"
   },
+  "http": {
+    "defaultTip": "请求错误",
+    "400": "请求出现语法错误",
+    "401": "用户未授权",
+    "403": "服务器拒绝访问",
+    "404": "请求的资源不存在",
+    "405": "请求方法未允许",
+    "408": "网络请求超时",
+    "500": "服务器内部错误",
+    "501": "服务器未实现请求功能",
+    "502": "错误网关",
+    "503": "服务不可用",
+    "504": "网关超时",
+    "505": "http版本不支持该请求"
+  },
+  "components": {
+    "iconSelector": {
+      "inputPlaceholder": "选择目标图标",
+      "searchPlaceholder": "搜索图标"
+    }
+  },
   "login": {
     "signInTitle": "登录",
     "accountPlaceholder": "输入账号",
diff --git a/src/components/custom/IconSelect/index.vue b/src/components/custom/IconSelect/index.vue
index 8105a3b..7e0adef 100644
--- a/src/components/custom/IconSelect/index.vue
+++ b/src/components/custom/IconSelect/index.vue
@@ -5,6 +5,8 @@ const currentIcon = ref('')
 const searchValue = ref('')
 const showPopover = ref(false)
 
+const { t } = useI18n()
+
 const iconList = computed(() => icons.filter(item => item.includes(searchValue.value)))
 
 function handleSelectIcon(icon: string) {
@@ -16,14 +18,14 @@ function handleSelectIcon(icon: string) {
 <template>
   <n-popover v-model:show="showPopover" placement="bottom" trigger="click">
     <template #trigger>
-      <n-input v-model:value="currentIcon" readonly placeholder="选择目标图标">
+      <n-input v-model:value="currentIcon" readonly :placeholder="t('components.iconSelector.inputPlaceholder')">
         <template #suffix>
           <nova-icon :icon="currentIcon || 'icon-park-outline:all-application'" />
         </template>
       </n-input>
     </template>
     <template #header>
-      <n-input v-model:value="searchValue" type="text" placeholder="搜索图标" />
+      <n-input v-model:value="searchValue" type="text" :placeholder="t('components.iconSelector.searchPlaceholder')" />
     </template>
     <div class="w-400px">
       <div v-if="iconList.length > 0" class="grid grid-cols-9 h-auto overflow-auto gap-1">
diff --git a/src/modules/i18n.ts b/src/modules/i18n.ts
index d5f1546..3306190 100644
--- a/src/modules/i18n.ts
+++ b/src/modules/i18n.ts
@@ -1,7 +1,7 @@
 import { createI18n } from 'vue-i18n'
 import type { App } from 'vue'
-import enUS from '../../locales/enUS.json'
-import zhCN from '../../locales/zhCN.json'
+import enUS from '../../locales/en_US.json'
+import zhCN from '../../locales/zh_CN.json'
 import { local } from '@/utils'
 
 export const i18n = createI18n({
diff --git a/src/service/http/config.ts b/src/service/http/config.ts
index 10bf98c..7cd4fe1 100644
--- a/src/service/http/config.ts
+++ b/src/service/http/config.ts
@@ -1,3 +1,4 @@
+import { $t } from '@/utils'
 /** 默认实例的Aixos配置 */
 export const DEFAULT_ALOVA_OPTIONS = {
   // 请求超时时间,默认15秒
@@ -14,19 +15,19 @@ export const DEFAULT_BACKEND_OPTIONS = {
 
 /** 请求不成功各种状态的错误 */
 export const ERROR_STATUS = {
-  default: '请求错误~',
-  400: '400: 请求出现语法错误~',
-  401: '401: 用户未授权~',
-  403: '403: 服务器拒绝访问~',
-  404: '404: 请求的资源不存在~',
-  405: '405: 请求方法未允许~',
-  408: '408: 网络请求超时~',
-  500: '500: 服务器内部错误~',
-  501: '501: 服务器未实现请求功能~',
-  502: '502: 错误网关~',
-  503: '503: 服务不可用~',
-  504: '504: 网关超时~',
-  505: '505: http版本不支持该请求~',
+  default: $t('http.defaultTip'),
+  400: $t('http.400'),
+  401: $t('http.401'),
+  403: $t('http.403'),
+  404: $t('http.404'),
+  405: $t('http.405'),
+  408: $t('http.408'),
+  500: $t('http.500'),
+  501: $t('http.501'),
+  502: $t('http.502'),
+  503: $t('http.503'),
+  504: $t('http.504'),
+  505: $t('http.505'),
 }
 
 /** 没有错误提示的code */