Merge branch 'master' into chore/readme

src/lang/index.js

@@ -2,9 +2,8 @@ import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 import Cookies from 'js-cookie'
 import elementEnLocale from 'element-ui/lib/locale/lang/en' // element-ui lang
-import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN'// element-ui lang
-import elementEsLocale from 'element-ui/lib/locale/lang/es'// element-ui lang
-import elementOcLocale from 'element-ui/lib/locale/lang/oc' //element-ui lang
+import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN' // element-ui lang
+import elementEsLocale from 'element-ui/lib/locale/lang/es' // element-ui lang
 import enLocale from './en'
 import zhLocale from './zh'
 import esLocale from './es'
@@ -27,7 +26,6 @@ const messages = {
   },
   oc: {
     ...ocLocale
-    ...elementOcLocale
   }
 }
 

src/lang/oc.js

@@ -158,4 +158,4 @@ export default {
     closeOthers: 'Tampar los autres',
     closeAll: 'Los tampar totes'
   }
-}
+}
\ No newline at end of file