mirror of
https://github.com/misenhower/splatoon2.ink.git
synced 2026-09-28 04:06:52 -05:00
Fix locale loading and dev server
This commit is contained in:
@@ -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');
|
||||
|
||||
@@ -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 });
|
||||
},
|
||||
};
|
||||
|
||||
@@ -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: {
|
||||
|
||||
Reference in New Issue
Block a user