diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-06-09 09:31:33 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-06-09 09:31:33 +0000 |
| commit | aa125072b329a7e2f3ce645d0f2666c9875bc484 (patch) | |
| tree | 6fd9bc179a41d0d6b822d6d1175955444226c020 /src/main.js | |
| parent | 951f25707a3e38d0585a55a4d18135c8b64c0d2a (diff) | |
| parent | 44db3af0db55454c537a26bf9ea3fc8e121c7e43 (diff) | |
Merge branch 'async-language-loading' into 'develop'
Messages: Load languages asynchronously.
See merge request pleroma/pleroma-fe!1136
Diffstat (limited to 'src/main.js')
| -rw-r--r-- | src/main.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main.js b/src/main.js index be4213fa..9a201e4f 100644 --- a/src/main.js +++ b/src/main.js @@ -46,11 +46,13 @@ Vue.use(VBodyScrollLock) const i18n = new VueI18n({ // By default, use the browser locale, we will update it if neccessary - locale: currentLocale, + locale: 'en', fallbackLocale: 'en', - messages + messages: messages.default }) +messages.setLanguage(i18n, currentLocale) + const persistedStateOptions = { paths: [ 'config', |