diff options
| author | Henry Jameson <me@hjkos.com> | 2022-04-07 10:33:20 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-04-07 10:33:20 +0300 |
| commit | ab7490e49b275425176aec66405fd20a4e6f958d (patch) | |
| tree | b07534e2cb9867456978a2bc9477c3948d401efd /src/i18n/messages.js | |
| parent | 6a319154d94c51f0464e0de31c6f88fbe20defea (diff) | |
| parent | d8324dd80b2beeb96b81b4bc05df12550bbda407 (diff) | |
Merge remote-tracking branch 'origin/develop' into threecolumn
* origin/develop:
Fix active popover style
Use panel text instead of text for shoutbox icon
Fix dropdown menu style inside panel header
Fix phoenix sockets in dev mode
Fix no reactivity on vuex 4 values
fix tegulu
heck
fix i18n for good??
force runtime build of i18n
fix CSP by compiling the i18n templates as well
Diffstat (limited to 'src/i18n/messages.js')
| -rw-r--r-- | src/i18n/messages.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 2a1161be..977b8eb3 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -41,12 +41,12 @@ const loaders = { const messages = { languages: ['en', ...Object.keys(loaders)], default: { - en: require('./en.json') + en: require('./en.json').default }, setLanguage: async (i18n, language) => { if (loaders[language]) { let messages = await loaders[language]() - i18n.setLocaleMessage(language, messages) + i18n.setLocaleMessage(language, messages.default) } i18n.locale = language } |