AkkomaGang/admin-fe
6
2
Fork 9
Code Issues 5 Pull requests 2 Projects Releases Wiki Activity

Merge branch 'fix/linter' into 'master'

Browse source 
Linter fixes

See merge request pleroma/admin-fe!33
This commit is contained in:
Maxim Filippov 2019-08-14 10:24:51 +00:00
commit d2deb02605
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lang/index.js
View file

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