github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1095 from QingWei-Li/fix/default-locale 

Locale: compatible vue-i18n, fixed #973
pull/1100/head
SkyAo 2016-11-16 14:34:03 +08:00 committed by GitHub
parent d4e45e8d9b 2241e9f2b4
commit b20995fced
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/locale/index.js
View File

@ -12,7 +12,10 @@ export const t = function(path, options) {
if (typeof vuei18n === 'function') { if (typeof vuei18n === 'function') {
if (!merged) { if (!merged) {
merged = true; merged = true;
Vue.locale(Vue.config.lang, deepmerge(lang, Vue.locale(Vue.config.lang), { clone: true })); Vue.locale(
Vue.config.lang,
deepmerge(lang, Vue.locale(Vue.config.lang) || {}, { clone: true })
);
} }
return vuei18n.apply(this, [path, options]); return vuei18n.apply(this, [path, options]);
} }