refactor(components): add common text

emqx · Nov 28, 2024 · 14206d6 · 14206d6
1 parent 28dce4f
commit 14206d6
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 10 deletions.
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -28,7 +28,6 @@
     "dev": "vite",
     "build": "vue-tsc && vite build",
     "preview": "vite preview",
-    "test": "vitest run --coverage",
     "version:patch": "npm version patch",
     "version:minor": "npm version minor",
     "version:major": "npm version major",

diff --git a/packages/components/streaming/StreamForm.vue b/packages/components/streaming/StreamForm.vue
@@ -3,7 +3,6 @@
     <el-form-item prop="stream_name">
       <template #label>
         {{ t('streaming.streamName') }}
-        {{ t('Base.username') }}
         <component v-if="tipComponent" :is="tipComponent" :content="t('streaming.streamNameTip')" />
       </template>
       <el-input v-model="record.stream_name" />

diff --git a/packages/components/streaming/StreamingACLForm.vue b/packages/components/streaming/StreamingACLForm.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form :model="record" label-position="top">
-    <el-form-item prop="principal_name" :label="$t('auth.username')">
+    <el-form-item prop="principal_name" :label="t('common.username')">
       <el-input v-model="record.principal_name" />
     </el-form-item>
     <el-form-item prop="host" :label="tl('host')">
@@ -15,7 +15,12 @@
     </el-form-item>
     <el-form-item prop="resource_type" :label="tl('aclResourceType')">
       <el-radio-group v-model="record.resource_type" @change="changeResourceType">
-        <el-radio v-for="item in resourceTypeOptions" :key="item.value" :value="item.value">
+        <el-radio
+          v-for="item in resourceTypeOptions"
+          :key="item.value"
+          :value="item.value"
+          :label="item.value"
+        >
           {{ item.label }}
         </el-radio>
       </el-radio-group>
@@ -46,9 +51,14 @@
         />
       </el-select>
     </el-form-item>
-    <el-form-item prop="permission" :label="$t('acl.access')">
+    <el-form-item prop="permission" :label="t('common.access')">
       <el-radio-group v-model="record.permission">
-        <el-radio v-for="item in permissionOptions" :key="item.value" :value="item.value">
+        <el-radio
+          v-for="item in permissionOptions"
+          :key="item.value"
+          :value="item.value"
+          :label="item.value"
+        >
           {{ item.label }}
         </el-radio>
       </el-radio-group>

diff --git a/packages/components/streaming/StreamingAuthForm.vue b/packages/components/streaming/StreamingAuthForm.vue
@@ -5,7 +5,7 @@
         <el-option v-for="item in authTypeList" :key="item" :label="item" :value="item" />
       </el-select>
     </el-form-item>
-    <el-form-item prop="user_name" :label="t('auth.username')">
+    <el-form-item prop="user_name" :label="t('common.username')">
       <el-input v-model="record.user_name" clearable :disabled="isEdit" />
     </el-form-item>
     <el-form-item prop="password" :label="t('common.password')">

diff --git a/packages/constants/package.json b/packages/constants/package.json
@@ -28,7 +28,6 @@
     "dev": "vite",
     "build": "tsc && vite build",
     "preview": "vite preview",
-    "test": "vitest run --coverage",
     "version:patch": "npm version patch",
     "version:minor": "npm version minor",
     "version:major": "npm version major",

diff --git a/packages/i18n/lib/enCommon.ts b/packages/i18n/lib/enCommon.ts
@@ -0,0 +1,6 @@
+export const enCommon = {
+  access: 'Permission',
+  topic: 'Topic',
+  username: 'Username',
+  password: 'Password',
+}
diff --git a/packages/i18n/lib/index.ts b/packages/i18n/lib/index.ts
@@ -11,3 +11,6 @@ export * from './enIntegrationDesc'
 export * from './enStreaming'
 export * from './zhStreaming'
 export * from './jaStreaming'
+export * from './enCommon'
+export * from './zhCommon'
+export * from './jaCommon'
diff --git a/packages/i18n/lib/jaCommon.ts b/packages/i18n/lib/jaCommon.ts
@@ -0,0 +1,6 @@
+export const jaCommon = {
+  access: '許可/拒否',
+  topic: 'トピック',
+  username: 'ユーザー名',
+  password: 'パスワード',
+}
diff --git a/packages/i18n/lib/zhCommon.ts b/packages/i18n/lib/zhCommon.ts
@@ -0,0 +1,6 @@
+export const zhCommon = {
+  access: '是否允许',
+  topic: '主题',
+  username: '用户名',
+  password: '密码',
+}
diff --git a/packages/utils/lib/useLocale.ts b/packages/utils/lib/useLocale.ts
@@ -1,4 +1,11 @@
-import { jaStreaming, enStreaming, zhStreaming } from '@emqx/shared-ui-i18n'
+import {
+  jaStreaming,
+  enStreaming,
+  zhStreaming,
+  enCommon,
+  zhCommon,
+  jaCommon,
+} from '@emqx/shared-ui-i18n'
 import { createI18n } from 'vue-i18n'
 import type { ComposerTranslation } from 'vue-i18n'
 
@@ -9,12 +16,15 @@ export const useLocale = (locale: string): { t: ComposerTranslation } => {
     messages: {
       en: {
         streaming: enStreaming,
+        common: enCommon,
       },
       zh: {
         streaming: zhStreaming,
+        common: zhCommon,
       },
       ja: {
         streaming: jaStreaming,
+        common: jaCommon,
       },
     },
   }).global

diff --git a/packages/utils/lib/useStreamingAuth.ts b/packages/utils/lib/useStreamingAuth.ts
@@ -16,7 +16,7 @@ export const useStreamingAuth = (lang: string) => {
   ]
   const resourceTypeOptions = [
     {
-      label: t('acl.topic'),
+      label: t('common.topic'),
       value: StreamResourceType.Topic,
     },
     {