diff --git a/src/mixin/format.js b/src/mixin/format.js index 5cb42db..c65de04 100644 --- a/src/mixin/format.js +++ b/src/mixin/format.js @@ -1,12 +1,8 @@ import { format } from 'date-format-parse'; -import { getLocale } from '../locale'; +import LocaleMixin from './locale'; export default { - inject: { - locale: { - default: getLocale(), - }, - }, + mixins: [LocaleMixin], methods: { formatDate(date, fmt) { return format(date, fmt, { locale: this.t('formatLocale') }); diff --git a/src/mixin/locale.js b/src/mixin/locale.js index 6ec7417..b6a085a 100644 --- a/src/mixin/locale.js +++ b/src/mixin/locale.js @@ -9,7 +9,7 @@ export default { methods: { t(path) { const arr = path.split('.'); - let current = this.locale; + let current = this.locale || getLocale(); let value; for (let i = 0, len = arr.length; i < len; i++) { const prop = arr[i];