IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored i18n plugin and fixed several bugs

Browse Source
This commit is contained in:
Grzegorz Leoniec 2018-12-21 15:11:51 +01:00
parent 4f3a18263b
commit 4a0d03e011
No known key found for this signature in database
GPG Key ID: 3AA43686D4EB1377
2 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/LocaleSwitch.vue
View File

@ -68,24 +68,13 @@ export default {
}, },
computed: { computed: {
current() { current() {
console.log('current', this.$i18n.locale()) return find(this.locales, { code: this.$i18n.locale() })
return find(this.locales, ['code', this.$i18n.locale()])
} }
}, },
methods: { methods: {
changeLanguage(locale) { changeLanguage(locale) {
// TODO: move that logic to store!? this.$i18n.set(locale)
// check if the locale has already been loaded this.$refs.menu.toggleMenu()
if (this.$i18n.localeExists(locale)) {
this.$i18n.set(locale)
this.$refs.menu.toggleMenu()
return
}
import(`~/locales/${locale}.json`).then(res => {
this.$i18n.add(locale, res.default)
this.$i18n.set(locale)
this.$refs.menu.toggleMenu()
})
} }
} }
} }

47
plugins/i18n.js
View File

@ -11,33 +11,46 @@ export default ({ app, req, cookie, store }) => {
const debug = app.$env.NODE_ENV !== 'production' const debug = app.$env.NODE_ENV !== 'production'
const key = 'locale' const key = 'locale'
const changeHandler = debounce((mutation, store) => { const changeHandler = async mutation => {
if (process.server) return if (process.server) return
const currentLocale = app.$cookies.get(mutation.payload.locale) const newLocale = mutation.payload.locale
const isDifferent = mutation.payload.locale !== currentLocale const currentLocale = await app.$cookies.get(key)
if (isDifferent) { const isDifferent = newLocale !== currentLocale
app.$cookies.set(key, mutation.payload.locale)
if (!isDifferent) {
return
}
app.$cookies.set(key, newLocale)
if (!app.$i18n.localeExists(newLocale)) {
import(`~/locales/${newLocale}.json`).then(res => {
app.$i18n.add(newLocale, res.default)
})
} }
const user = store.getters['auth/user'] const user = store.getters['auth/user']
const token = store.getters['auth/token'] const token = store.getters['auth/token']
// persist language if it differs from last value // persist language if it differs from last value
if (isDifferent && user && user._id && token) { if (user && user._id && token) {
// TODO: SAVE LOCALE // TODO: SAVE LOCALE
// store.dispatch('usersettings/patch', { // store.dispatch('usersettings/patch', {
// uiLanguage: mutation.payload.locale // uiLanguage: newLocale
// }, { root: true }) // }, { root: true })
} }
}, 500) }
const i18nStore = new Vuex.Store({ // const i18nStore = new Vuex.Store({
strict: debug // strict: debug
}) // })
Vue.use(vuexI18n.plugin, i18nStore, { Vue.use(vuexI18n.plugin, store, {
onTranslationNotFound: function(locale, key) { onTranslationNotFound: function(locale, key) {
console.warn(`vuex-i18n :: Key '${key}' not found for locale '${locale}'`) if (debug) {
console.warn(
`vuex-i18n :: Key '${key}' not found for locale '${locale}'`
)
}
} }
}) })
@ -75,15 +88,15 @@ export default ({ app, req, cookie, store }) => {
Vue.i18n.set(locale) Vue.i18n.set(locale)
Vue.i18n.fallback('en') Vue.i18n.fallback('en')
if (process.client) { if (process.browser) {
i18nStore.subscribe((mutation, s) => { store.subscribe(mutation => {
if (mutation.type === 'i18n/SET_LOCALE') { if (mutation.type === 'i18n/SET_LOCALE') {
changeHandler(mutation, store) changeHandler(mutation)
} }
}) })
} }
app.$i18n = Vue.i18n app.$i18n = Vue.i18n
return i18nStore return store
} }