Merge pull request #865 from QingWei-Li/fix/locale-fallback

Locale: fallback default config
pull/873/head
baiyaaaaa 2016-11-07 10:47:31 +08:00 committed by GitHub
commit 1c47153e1a
5 changed files with 10 additions and 1 deletions

View File

@ -7,7 +7,7 @@
["module-resolver", {
"root": ["element-ui"],
"alias": {
"element-ui/src/locale": "element-ui/lib/locale"
"element-ui/src": "element-ui/lib"
}
}]
]

View File

@ -36,6 +36,7 @@ if (typeof window !== 'undefined' && window.Vue) {
module.exports = {
version: '{{version}}',
locale,
install,
{{list}}
};

View File

@ -40,6 +40,7 @@
},
"dependencies": {
"async-validator": "^1.6.6",
"deepmerge": "^1.2.0",
"throttle-debounce": "^1.0.1",
"vue-popup": "^0.2.9",
"wind-dom": "0.0.3"

View File

@ -131,6 +131,7 @@ if (typeof window !== 'undefined' && window.Vue) {
module.exports = {
version: '1.0.0-rc.8',
locale,
install,
Pagination,
Dialog,

View File

@ -1,13 +1,19 @@
import defaultLang from 'element-ui/src/locale/lang/zh-cn';
import Vue from 'vue';
import deepmerge from 'deepmerge';
import Format from './format';
const format = Format(Vue);
let lang = defaultLang;
let merged = false;
export const $t = function(path, options) {
const vuei18n = Object.getPrototypeOf(this || Vue).$t;
if (typeof vuei18n === 'function') {
if (!merged) {
merged = true;
Vue.locale(Vue.config.lang, deepmerge(lang, Vue.locale(Vue.config.lang), { clone: true }));
}
return vuei18n.apply(this, [path, options]);
}
const array = path.split('.');