diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue index 900f746c..643d498c 100644 --- a/src/components/HeaderSearch/index.vue +++ b/src/components/HeaderSearch/index.vue @@ -37,15 +37,9 @@ export default { computed: { routes() { return this.$store.getters.permission_routes - }, - lang() { - return this.$store.getters.language } }, watch: { - lang() { - this.searchPool = this.generateRoutes(this.routes) - }, routes() { this.searchPool = this.generateRoutes(this.routes) }, diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue index 3d6dba2b..25809279 100644 --- a/src/components/Tinymce/index.vue +++ b/src/components/Tinymce/index.vue @@ -55,21 +55,12 @@ export default { } } }, - computed: { - language() { - return this.languageTypeList[this.$store.getters.language] - } - }, watch: { value(val) { if (!this.hasChange && this.hasInit) { this.$nextTick(() => window.tinymce.get(this.tinymceId).setContent(val || '')) } - }, - language() { - this.destroyTinymce() - this.$nextTick(() => this.initTinymce()) } }, mounted() { @@ -88,7 +79,6 @@ export default { initTinymce() { const _this = this window.tinymce.init({ - language: this.language, selector: `#${this.tinymceId}`, height: this.height, body_class: 'panel-body ', diff --git a/src/store/getters.js b/src/store/getters.js index 3fb5b068..71f9da26 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -1,6 +1,5 @@ const getters = { sidebar: state => state.app.sidebar, - language: state => state.app.language, size: state => state.app.size, device: state => state.app.device, visitedViews: state => state.tagsView.visitedViews, diff --git a/src/store/modules/app.js b/src/store/modules/app.js index 84875dd6..45d89bb9 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -6,7 +6,6 @@ const state = { withoutAnimation: false }, device: 'desktop', - language: Cookies.get('language') || 'en', size: Cookies.get('size') || 'medium' } @@ -28,10 +27,6 @@ const mutations = { TOGGLE_DEVICE: (state, device) => { state.device = device }, - SET_LANGUAGE: (state, language) => { - state.language = language - Cookies.set('language', language) - }, SET_SIZE: (state, size) => { state.size = size Cookies.set('size', size) @@ -48,9 +43,6 @@ const actions = { toggleDevice({ commit }, device) { commit('TOGGLE_DEVICE', device) }, - setLanguage({ commit }, language) { - commit('SET_LANGUAGE', language) - }, setSize({ commit }, size) { commit('SET_SIZE', size) } diff --git a/src/utils/i18n.js b/src/utils/i18n.js deleted file mode 100644 index 76be5a4e..00000000 --- a/src/utils/i18n.js +++ /dev/null @@ -1,12 +0,0 @@ -// translate router.meta.title, be used in breadcrumb sidebar tagsview -export function generateTitle(title) { - const hasKey = this.$te('route.' + title) - - if (hasKey) { - // $t :this method from vue-i18n, inject in @/lang/index.js - const translatedTitle = this.$t('route.' + title) - - return translatedTitle - } - return title -} diff --git a/src/views/components-demo/markdown.vue b/src/views/components-demo/markdown.vue index 8483a470..e9796a4b 100644 --- a/src/views/components-demo/markdown.vue +++ b/src/views/components-demo/markdown.vue @@ -79,7 +79,7 @@ export default { }, computed: { language() { - return this.languageTypeList[this.$store.getters.language] + return this.languageTypeList['en'] } }, methods: {