Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/lang/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,22 @@ const messages = {
...elementEsLocale
}
}

export function getLanguage() {
const chooseLanguage = Cookies.get('language')
if (chooseLanguage) return chooseLanguage
const language = (navigator.language || navigator.browserLanguage).toLowerCase()
const locales = Object.keys(messages)
for (const locale of locales) {
if (language.indexOf(locale) > -1) {
return locale
}
}
return 'en'
}
const i18n = new VueI18n({
// set locale
// options: en | zh | es
locale: Cookies.get('language') || 'en',
locale: getLanguage(),
// set locale messages
messages
})
Expand Down
23 changes: 8 additions & 15 deletions src/store/index.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
import Vue from 'vue'
import Vuex from 'vuex'
import app from './modules/app'
import errorLog from './modules/errorLog'
import permission from './modules/permission'
import tagsView from './modules/tagsView'
import settings from './modules/settings'
import user from './modules/user'
import getters from './getters'

Vue.use(Vuex)

const modulesFiles = require.context('./modules', false, /\.js$/)
const modules = {}
modulesFiles.keys().forEach(item => {
const key = item.replace(/^\.\/(.*)\.\w+$/, '$1')
const value = modulesFiles(item)
modules[key] = value.default
})
const store = new Vuex.Store({
modules: {
app,
errorLog,
permission,
tagsView,
settings,
user
},
modules,
getters
})

Expand Down
4 changes: 2 additions & 2 deletions src/store/modules/app.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import Cookies from 'js-cookie'

import { getLanguage } from '@/lang/index'
const state = {
sidebar: {
opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
withoutAnimation: false
},
device: 'desktop',
language: Cookies.get('language') || 'en',
language: getLanguage(),
size: Cookies.get('size') || 'medium'
}

Expand Down
12 changes: 12 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* 不是真实的 webpack 配置,仅为兼容 webstorm 和 intellij idea 代码跳转
* ref: https://github.com/umijs/umi/issues/1109#issuecomment-423380125
*/

module.exports = {
resolve: {
alias: {
"@": require("path").resolve(__dirname, "src")
}
}
};