diff --git a/src/web/i18n/index.js b/src/web/i18n/index.js index 4eeba38..232e942 100644 --- a/src/web/i18n/index.js +++ b/src/web/i18n/index.js @@ -6,7 +6,7 @@ import shiftyStations from '@/common/data/shiftyStations.json'; Vue.use(VuexI18n.plugin, store); // Make sure English is always loaded -Vue.i18n.add('en', require('@/web/locale/en')); +Vue.i18n.add('en', { ...require('@/web/locale/en') }); Vue.i18n.set('en'); Vue.i18n.fallback('en'); diff --git a/src/web/store/splatoon/languages.js b/src/web/store/splatoon/languages.js index 1e4c0af..f5f3565 100644 --- a/src/web/store/splatoon/languages.js +++ b/src/web/store/splatoon/languages.js @@ -38,6 +38,6 @@ export const actions = { // import(/* webpackChunkName: "lang-[request]" */ `@/web/locale/${locale}`) // .then(translations => dispatch('i18n/addLocale', { locale, translations: translations.default }, { root: true })); - dispatch('i18n/addLocale', { locale, translations: require(`@/web/locale/${locale}`) }, { root: true }); + dispatch('i18n/addLocale', { locale, translations: { ...require(`@/web/locale/${locale}`) } }, { root: true }); }, }; diff --git a/vue.config.js b/vue.config.js index da22e2b..8cc0806 100644 --- a/vue.config.js +++ b/vue.config.js @@ -39,10 +39,9 @@ module.exports = { }) }, devServer: { - static: [ - { directory: path.join(__dirname, 'public') }, - { directory: path.join(__dirname, 'dist') }, - ] + static: { + directory: path.join(__dirname, 'dist'), + } }, pages: { index: {