fix bug of i18n

ldang264 · ldang264 · commit 24bc996d05ee · 2021-08-24T22:09:50.000+08:00
diff --git a/README.md b/README.md
@@ -20,27 +20,27 @@ npm install vue-cron-generator
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 import elementEnLocale from 'element-ui/lib/locale/lang/en'
-import elementZhCNLocale from 'element-ui/lib/locale/lang/zh-CN'
-import enUSLocale from './en-US'
-import zhCNLocale from './zh-CN'
-import { getLocale } from '../util/tools'
+import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN'
+import cronEnLocale from 'vue-cron-generator/src/locale/en'
+import cronZhLocale from 'vue-cron-generator/src/locale/zh'
+import { getLocale } from 'vue-cron-generator/src/util/tools'
 
 Vue.use(VueI18n)
 
 const messages = {
-    en_US: {
-      ...enUSLocale,
+    en: {
+      ...enLocale,
       ...elementEnLocale
     },
-    zh_CN: {
-      ...zhCNLocale,
-      ...elementZhCNLocale
+    zh: {
+      ...zhLocale,
+      ...elementZhLocale
     }
   },
 
   i18n = new VueI18n({
   // set locale
-  // options: 'en_US' | 'zh_CN'
+  // options: 'en' | 'zh'
     locale: getLocale(),
     // set locale messages
     messages
diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -11,44 +11,38 @@
 
 ## 使用(例子代码)
 - 下载依赖([npm](https://www.npmjs.com/package/vue-cron-generator))
-``` bash
-npm install vue-cron-generator
-```
-
-- [src/lang/index.js](https://github.com/attemper/attemper/blob/master/attemper-admin/src/lang/index.js)  
 ``` typescript
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 import elementEnLocale from 'element-ui/lib/locale/lang/en'
-import elementZhCNLocale from 'element-ui/lib/locale/lang/zh-CN'
-import enUSLocale from './en-US'
-import zhCNLocale from './zh-CN'
-import { getLocale } from '../util/tools'
+import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN'
+import cronEnLocale from 'vue-cron-generator/src/locale/en'
+import cronZhLocale from 'vue-cron-generator/src/locale/zh'
+import { getLocale } from 'vue-cron-generator/src/util/tools'
 
 Vue.use(VueI18n)
 
 const messages = {
-    en_US: {
-      ...enUSLocale,
+    en: {
+      ...enLocale,
       ...elementEnLocale
     },
-    zh_CN: {
-      ...zhCNLocale,
-      ...elementZhCNLocale
+    zh: {
+      ...zhLocale,
+      ...elementZhLocale
     }
   },
 
   i18n = new VueI18n({
   // set locale
-  // options: 'en_US' | 'zh_CN'
+  // options: 'en' | 'zh'
     locale: getLocale(),
     // set locale messages
     messages
   })
 
 export default i18n
 
-
 ```
 
 - [main.js](https://github.com/attemper/attemper/blob/master/attemper-admin/src/lang/index.js)  
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue-cron-generator",
   "description": "a project using vue,element-ui to generate cron expression",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "author": "ldang264 <820704815@qq.com>",
   "license": "MIT",
   "private": false,
diff --git a/src/components/config/common/every.vue b/src/components/config/common/every.vue
@@ -7,8 +7,8 @@
 </template>
 
 <script>
-import { EVERY } from '@/constant/filed'
-import watchValue from '@/mixins/watchValue'
+import { EVERY } from '../../../constant/filed'
+import watchValue from '../../../mixins/watchValue'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/config/common/fixed.vue b/src/components/config/common/fixed.vue
@@ -31,10 +31,10 @@
 </template>
 
 <script>
-import { sortNum } from '@/util/tools'
-import { FIXED } from '@/constant/filed'
-import watchValue from '@/mixins/watchValue'
-import { isNumber } from '@/util/tools'
+import { sortNum } from '../../../util/tools'
+import { FIXED } from '../../../constant/filed'
+import watchValue from '../../../mixins/watchValue'
+import { isNumber } from '../../../util/tools'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/config/common/period.vue b/src/components/config/common/period.vue
@@ -12,9 +12,9 @@
 </template>
 
 <script>
-import { EVERY, PERIOD } from '@/constant/filed'
-import watchValue from '@/mixins/watchValue'
-import { isNumber } from '@/util/tools'
+import { EVERY, PERIOD } from '../../../constant/filed'
+import watchValue from '../../../mixins/watchValue'
+import { isNumber } from '../../../util/tools'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/config/common/range.vue b/src/components/config/common/range.vue
@@ -12,9 +12,9 @@
 </template>
 
 <script>
-import { RANGE } from '@/constant/filed'
-import watchValue from '@/mixins/watchValue'
-import { isNumber } from '@/util/tools'
+import { RANGE } from '../../../constant/filed'
+import watchValue from '../../../mixins/watchValue'
+import { isNumber } from '../../../util/tools'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/config/custom/dayOfWeek/last.vue b/src/components/config/custom/dayOfWeek/last.vue
@@ -22,9 +22,9 @@
 </template>
 
 <script>
-import { LAST } from '@/constant/filed'
-import watchValue from '@/mixins/watchValue'
-import { isNumber } from '@/util/tools'
+import { LAST } from '../../../../constant/filed'
+import watchValue from '../../../../mixins/watchValue'
+import { isNumber } from '../../../../util/tools'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/config/custom/dayOfWeek/period.vue b/src/components/config/custom/dayOfWeek/period.vue
@@ -26,9 +26,9 @@
 </template>
 
 <script>
-import { PERIOD } from '@/constant/filed'
-import watchValue from '@/mixins/watchValue'
-import { isNumber } from '@/util/tools'
+import { PERIOD } from '../../../../constant/filed'
+import watchValue from '../../../../mixins/watchValue'
+import { isNumber } from '../../../../util/tools'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/config/custom/dayOfWeek/range.vue b/src/components/config/custom/dayOfWeek/range.vue
@@ -42,9 +42,9 @@
 </template>
 
 <script>
-import { RANGE } from '@/constant/filed'
-import watchValue from '@/mixins/watchValue'
-import { isNumber } from '@/util/tools'
+import { RANGE } from '../../../../constant/filed'
+import watchValue from '../../../../mixins/watchValue'
+import { isNumber } from '../../../../util/tools'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/config/custom/dayOfWeek/weekDay.vue b/src/components/config/custom/dayOfWeek/weekDay.vue
@@ -25,9 +25,9 @@
 </template>
 
 <script>
-import watchValue from '@/mixins/watchValue'
-import { WEEK_DAY } from '@/constant/filed'
-import { isNumber } from '@/util/tools'
+import watchValue from '../../../../mixins/watchValue'
+import { WEEK_DAY } from '../../../../constant/filed'
+import { isNumber } from '../../../../util/tools'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/config/custom/last.vue b/src/components/config/custom/last.vue
@@ -10,9 +10,9 @@
 </template>
 
 <script>
-import { LAST } from '@/constant/filed'
-import watchValue from '@/mixins/watchValue'
-import { isNumber } from '@/util/tools'
+import { LAST } from '../../../constant/filed'
+import watchValue from '../../../mixins/watchValue'
+import { isNumber } from '../../../util/tools'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/config/custom/lastWorkDay.vue b/src/components/config/custom/lastWorkDay.vue
@@ -8,8 +8,8 @@
 </template>
 
 <script>
-import { LAST_WORK_DAY } from '@/constant/filed'
-import watchValue from '@/mixins/watchValue'
+import { LAST_WORK_DAY } from '../../../constant/filed'
+import watchValue from '../../../mixins/watchValue'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/config/custom/unfixed.vue b/src/components/config/custom/unfixed.vue
@@ -8,8 +8,8 @@
 </template>
 
 <script>
-import { UNFIXED } from '@/constant/filed'
-import watchValue from '@/mixins/watchValue'
+import { UNFIXED } from '../../../constant/filed'
+import watchValue from '../../../mixins/watchValue'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/config/custom/workDay.vue b/src/components/config/custom/workDay.vue
@@ -10,9 +10,9 @@
 </template>
 
 <script>
-import { WORK_DAY } from '@/constant/filed'
-import watchValue from '@/mixins/watchValue'
-import { isNumber } from '@/util/tools'
+import { WORK_DAY } from '../../../constant/filed'
+import watchValue from '../../../mixins/watchValue'
+import { isNumber } from '../../../util/tools'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/config/custom/year/empty.vue b/src/components/config/custom/year/empty.vue
@@ -7,8 +7,8 @@
 </template>
 
 <script>
-import { EMPTY } from '@/constant/filed'
-import watchValue from '@/mixins/watchValue'
+import { EMPTY } from '../../../../constant/filed'
+import watchValue from '../../../../mixins/watchValue'
 
 export default {
   mixins: [watchValue],
diff --git a/src/components/cron-input.vue b/src/components/cron-input.vue
@@ -11,7 +11,7 @@
 
 <script>
 import Cron from './cron'
-import { DEFAULT_CRON_EXPRESSION } from '@/constant/filed'
+import { DEFAULT_CRON_EXPRESSION } from '../constant/filed'
 export default {
   name: 'CronInput',
   components: {
diff --git a/src/components/cron.vue b/src/components/cron.vue
@@ -129,7 +129,7 @@ import DayOfMonth from './time/dayOfMonth'
 import Month from './time/month'
 import Year from './time/year'
 import DayOfWeek from './time/dayOfWeek'
-import { getLocale } from '@/util/tools'
+import { getLocale } from '../util/tools'
 
 import {
   EMPTY,
@@ -139,7 +139,7 @@ import {
   DAY_OF_MONTH_SYMBOL,
   DAY_OF_WEEK_SYMBOL,
   DEFAULT_CRON_EXPRESSION
-} from '@/constant/filed'
+} from '../constant/filed'
 
 export default {
   name: 'Cron',
@@ -273,7 +273,7 @@ export default {
       }
     },
     loadConst() {
-      import('@/translate/dict.js').then(array => {
+      import('../translate/dict.js').then(array => {
         this.bakCases = this.cases = array['cases_' + getLocale()]
       })
     }
diff --git a/src/components/time/dayOfMonth.vue b/src/components/time/dayOfMonth.vue
@@ -91,8 +91,8 @@ import Unfixed from '../config/custom/unfixed'
 import WorkDay from '../config/custom/workDay'
 import Last from '../config/custom/last'
 import LastWorkDay from '../config/custom/lastWorkDay'
-import { DAY_OF_MONTH_SYMBOL, EVERY } from '@/constant/filed'
-import watchTime from '@/mixins/watchTime'
+import { DAY_OF_MONTH_SYMBOL, EVERY } from '../../constant/filed'
+import watchTime from '../../mixins/watchTime'
 
 // 31 days
 const LENGTH = 31, LOWER_LIMIT = 1, STEP = 1
diff --git a/src/components/time/dayOfWeek.vue b/src/components/time/dayOfWeek.vue
@@ -76,13 +76,13 @@
 import Every from '../config/common/every'
 import Fixed from '../config/common/fixed'
 import Unfixed from '../config/custom/unfixed'
-import { DAY_OF_WEEK_SYMBOL, DAYS_OF_WEEK, UNFIXED } from '@/constant/filed'
+import { DAY_OF_WEEK_SYMBOL, DAYS_OF_WEEK, UNFIXED } from '../../constant/filed'
 import Period from '../config/custom/dayOfWeek/period'
 import Range from '../config/custom/dayOfWeek/range'
 import Last from '../config/custom/dayOfWeek/last'
 import WeekDay from '../config/custom/dayOfWeek/weekDay'
-import watchTime from '@/mixins/watchTime'
-import { getLocale } from '@/util/tools'
+import watchTime from '../../mixins/watchTime'
+import { getLocale } from '../../util/tools'
 
 // 31 days
 const LENGTH = 7, LOWER_LIMIT = 1, STEP = 1
@@ -148,7 +148,7 @@ export default {
   methods: {
     // 7 days like [ {label: 'Sunday', value: 1}...{label: 'Saturday', value: 7} ]
     initNums() {
-      import('@/translate/dict.js').then(array => {
+      import('../../translate/dict.js').then(array => {
         this.nums = array['daysOfWeek_' + getLocale()]
       })
     },
diff --git a/src/components/time/hour.vue b/src/components/time/hour.vue
@@ -49,8 +49,8 @@ import Every from '../config/common/every'
 import Period from '../config/common/period'
 import Range from '../config/common/range'
 import Fixed from '../config/common/fixed'
-import { BASE_SYMBOL, EVERY } from '@/constant/filed'
-import watchTime from '@/mixins/watchTime'
+import { BASE_SYMBOL, EVERY } from '../../constant/filed'
+import watchTime from '../../mixins/watchTime'
 
 // 24 hours
 const LENGTH = 24, LOWER_LIMIT = 0, STEP = 1
diff --git a/src/components/time/minute.vue b/src/components/time/minute.vue
@@ -49,8 +49,8 @@ import Every from '../config/common/every'
 import Period from '../config/common/period'
 import Range from '../config/common/range'
 import Fixed from '../config/common/fixed'
-import { BASE_SYMBOL, EVERY } from '@/constant/filed'
-import watchTime from '@/mixins/watchTime'
+import { BASE_SYMBOL, EVERY } from '../../constant/filed'
+import watchTime from '../../mixins/watchTime'
 
 // 60 minutes
 const LENGTH = 60, LOWER_LIMIT = 0, STEP = 1
diff --git a/src/components/time/month.vue b/src/components/time/month.vue
@@ -48,8 +48,8 @@ import Every from '../config/common/every'
 import Period from '../config/common/period'
 import Range from '../config/common/range'
 import Fixed from '../config/common/fixed'
-import { BASE_SYMBOL, EVERY, MONTHS } from '@/constant/filed'
-import watchTime from '@/mixins/watchTime'
+import { BASE_SYMBOL, EVERY, MONTHS } from '../../constant/filed'
+import watchTime from '../../mixins/watchTime'
 
 // 1 months
 const LENGTH = 12, LOWER_LIMIT = 1, STEP = 1
diff --git a/src/components/time/second.vue b/src/components/time/second.vue
@@ -48,8 +48,8 @@ import Every from '../config/common/every'
 import Period from '../config/common/period'
 import Range from '../config/common/range'
 import Fixed from '../config/common/fixed'
-import { EVERY, BASE_SYMBOL } from '@/constant/filed'
-import watchTime from '@/mixins/watchTime'
+import { EVERY, BASE_SYMBOL } from '../../constant/filed'
+import watchTime from '../../mixins/watchTime'
 
 // 60 seconds
 const LENGTH = 60, LOWER_LIMIT = 0, STEP = 1
diff --git a/src/components/time/year.vue b/src/components/time/year.vue
@@ -57,8 +57,8 @@ import Period from '../config/common/period'
 import Range from '../config/common/range'
 import Fixed from '../config/common/fixed'
 import Empty from '../config/custom/year/empty'
-import { BASE_SYMBOL, CUR_YEAR, EMPTY, UPPER_LIMIT_YEAR } from '@/constant/filed'
-import watchTime from '@/mixins/watchTime'
+import { BASE_SYMBOL, CUR_YEAR, EMPTY, UPPER_LIMIT_YEAR } from '../../constant/filed'
+import watchTime from '../../mixins/watchTime'
 
 // 2099 years
 const LOWER_LIMIT = CUR_YEAR, LENGTH = UPPER_LIMIT_YEAR, STEP = 1
diff --git a/src/locale/en.js b/src/locale/en.js
@@ -1,4 +1,4 @@
-import { CUR_YEAR, UPPER_LIMIT_YEAR } from '@/constant/filed'
+import { CUR_YEAR, UPPER_LIMIT_YEAR } from '../constant/filed'
 
 export default {
   common: {
diff --git a/src/locale/index.js b/src/locale/index.js
diff --git a/src/locale/zh.js b/src/locale/zh.js
diff --git a/src/main.js b/src/main.js
diff --git a/src/mixins/watchTime.js b/src/mixins/watchTime.js
diff --git a/src/translate/dict.js b/src/translate/dict.js
diff --git a/src/util/tools.js b/src/util/tools.js

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vue-cron-generator",`
`3`	`3`	`"description": "a project using vue,element-ui to generate cron expression",`
`4`		`- "version": "0.2.0",`
	`4`	`+ "version": "0.2.2",`
`5`	`5`	`"author": "ldang264 <[email protected]>",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"private": false,`