Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Angelina Filippova
admin-fe
Commits
d2deb026
Commit
d2deb026
authored
Aug 14, 2019
by
Maxim Filippov
🌚
Browse files
Merge branch 'fix/linter' into 'master'
Linter fixes See merge request
pleroma/admin-fe!33
parents
0241c3d0
64c82c5b
Changes
2
Show whitespace changes
Inline
Side-by-side
src/lang/index.js
View file @
d2deb026
...
@@ -2,9 +2,8 @@ import Vue from 'vue'
...
@@ -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 = {
...
@@ -27,7 +26,6 @@ const messages = {
},
},
oc
:
{
oc
:
{
...
ocLocale
...
ocLocale
...
elementOcLocale
}
}
}
}
...
...
src/lang/oc.js
View file @
d2deb026
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment