liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: match page current locale for UI

Browse Source
This commit is contained in:
Nick 2019-06-21 23:55:56 -04:00
parent 1dfb55e803
commit abfba4b47e
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/components/admin/admin-users.vue
View File

@ -6,11 +6,11 @@
img.animated.fadeInUp(src='/svg/icon-customer.svg', alt='Users', style='width: 80px;') img.animated.fadeInUp(src='/svg/icon-customer.svg', alt='Users', style='width: 80px;')
.admin-header-title .admin-header-title
.headline.blue--text.text--darken-2.animated.fadeInLeft Users .headline.blue--text.text--darken-2.animated.fadeInLeft Users
.subheading.grey--text.animated.fadeInLeft.wait-p2s Manage users .subheading.grey--text.animated.fadeInLeft.wait-p2s Manage users #[v-chip(label, color='primary', small).white--text coming soon]
v-spacer v-spacer
v-btn.animated.fadeInDown.wait-p2s(outline, color='grey', large, @click='refresh') v-btn.animated.fadeInDown.wait-p2s(outline, color='grey', large, @click='refresh')
v-icon refresh v-icon refresh
v-btn.animated.fadeInDown(color='primary', large, depressed, @click='createUser') v-btn.animated.fadeInDown(color='primary', large, depressed, @click='createUser', disabled)
v-icon(left) add v-icon(left) add
span New User span New User
v-card.wiki-form.mt-3.animated.fadeInUp v-card.wiki-form.mt-3.animated.fadeInUp

2
client/components/common/nav-header.vue
View File

@ -141,7 +141,7 @@
v-tooltip(bottom, slot='activator') v-tooltip(bottom, slot='activator')
v-btn(icon, slot='activator') v-btn(icon, slot='activator')
v-icon(color='grey') language v-icon(color='grey') language
span Language span {{$t('common:header.language')}}
v-list.py-0 v-list.py-0
template(v-for='(lc, idx) of locales') template(v-for='(lc, idx) of locales')
v-list-tile(@click='changeLocale(lc)') v-list-tile(@click='changeLocale(lc)')

6
client/themes/default/components/page.vue
View File

@ -141,6 +141,8 @@ import Prism from '@/libs/prism/prism.js'
import { get } from 'vuex-pathify' import { get } from 'vuex-pathify'
import _ from 'lodash' import _ from 'lodash'
/* global siteLangs */
export default { export default {
components: { components: {
StatusIndicator StatusIndicator
@ -259,6 +261,10 @@ export default {
this.$store.commit('page/SET_UPDATED_AT', this.updatedAt) this.$store.commit('page/SET_UPDATED_AT', this.updatedAt)
this.$store.commit('page/SET_MODE', 'view') this.$store.commit('page/SET_MODE', 'view')
if (siteLangs.length > 0) {
this.$i18n.i18next.changeLanguage(this.locale)
}
}, },
mounted () { mounted () {
Prism.highlightAllUnder(this.$refs.container) Prism.highlightAllUnder(this.$refs.container)