Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • pleroma/admin-fe
  • linafilippova/admin-fe
  • Exilat_a_Tolosa/admin-fe
  • mkljczk/admin-fe
  • maxf/admin-fe
  • kphrx/admin-fe
  • vaartis/admin-fe
  • ELR/admin-fe
  • eugenijm/admin-fe
  • jp/admin-fe
  • mkfain/admin-fe
  • lorenzoancora/admin-fe
  • alexgleason/admin-fe
  • seanking/admin-fe
  • ilja/admin-fe
15 results
Show changes
Commits on Source (2)
...@@ -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
} }
} }
......
...@@ -158,4 +158,4 @@ export default { ...@@ -158,4 +158,4 @@ export default {
closeOthers: 'Tampar los autres', closeOthers: 'Tampar los autres',
closeAll: 'Los tampar totes' closeAll: 'Los tampar totes'
} }
} }
\ No newline at end of file