working at i18n @admin page
This commit is contained in:
@@ -61,7 +61,7 @@ export default ({ app, store }) => {
|
||||
|
||||
Vue.filter('recurrentDetail', event => {
|
||||
const parent = event.parent
|
||||
if (!parent.frequency || !parent.type) return
|
||||
if (!parent.recurrent.frequency) return
|
||||
const { frequency, type } = parent.recurrent
|
||||
let recurrent
|
||||
if (frequency === '1w' || frequency === '2w') {
|
||||
|
||||
@@ -1,35 +1,36 @@
|
||||
import Vue from 'vue'
|
||||
import VueI18n from 'vue-i18n'
|
||||
import merge from 'lodash/merge'
|
||||
export default async ({ app, store, res, $vuetify }) => {
|
||||
|
||||
Vue.use(VueI18n)
|
||||
$vuetify.lang.current = app.i18n.locale
|
||||
|
||||
export default async ({ app, store, res }) => {
|
||||
const messages = {}
|
||||
if (process.server) {
|
||||
if (res.locals) {
|
||||
store.commit('setLocale', res.locals.acceptedLocale)
|
||||
if (res.locals.user_locale) {
|
||||
store.commit('setUserLocale', res.locals.user_locale)
|
||||
}
|
||||
}
|
||||
app.i18n.onLanguageSwitched = (oldLocale, newLocale) => {
|
||||
$vuetify.lang.current = newLocale
|
||||
}
|
||||
|
||||
messages[store.state.locale] = await import(/* webpackChunkName: "lang-[request]" */`../locales/${store.state.locale}.json`)
|
||||
// const messages = {}
|
||||
// if (process.server) {
|
||||
// if (res.locals) {
|
||||
// store.commit('setLocale', res.locals.acceptedLocale)
|
||||
// if (res.locals.user_locale) {
|
||||
// store.commit('setUserLocale', res.locals.user_locale)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// messages[store.state.locale] = await import(/* webpackChunkName: "lang-[request]" */`../locales/${store.state.locale}.json`)
|
||||
|
||||
// always include en fallback locale
|
||||
if (store.state.locale !== 'en') {
|
||||
messages.en = await import('../locales/en.json')
|
||||
}
|
||||
// if (store.state.locale !== 'en') {
|
||||
// messages.en = await import('../locales/en.json')
|
||||
// }
|
||||
|
||||
if (store.state.user_locale) {
|
||||
merge(messages[store.state.locale], store.state.user_locale)
|
||||
}
|
||||
// if (store.state.user_locale) {
|
||||
// merge(messages[store.state.locale], store.state.user_locale)
|
||||
// }
|
||||
|
||||
// Set i18n instance on app
|
||||
app.i18n = new VueI18n({
|
||||
locale: store.state.locale,
|
||||
fallbackLocale: 'en',
|
||||
messages
|
||||
})
|
||||
// app.i18n = new VueI18n({
|
||||
// locale: store.state.locale,
|
||||
// fallbackLocale: 'en',
|
||||
// messages
|
||||
// })
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user