diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-26 00:01:33 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-26 00:01:33 +0000 |
| commit | 5bb5ef43ef272bbabe722b8a3fd4c32c087c3c27 (patch) | |
| tree | d48ac98c5d75e24e9935e678819b9bc4e6d7e17e /src/main.js | |
| parent | 9e111f14fd088d4281b8ac6067313c63df924f84 (diff) | |
| parent | c1e4bfa90ffa26e203ca61717b4fb99209ad0d99 (diff) | |
Merge branch 'language-override' into 'develop'
Make interface language configurable from settings
Closes #36
See merge request pleroma/pleroma-fe!315
Diffstat (limited to 'src/main.js')
| -rw-r--r-- | src/main.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.js b/src/main.js index 87dc49df..37ef49f7 100644 --- a/src/main.js +++ b/src/main.js @@ -60,6 +60,7 @@ const persistedStateOptions = { 'config.loopVideoSilentOnly', 'config.pauseOnUnfocused', 'config.stopGifs', + 'config.interfaceLanguage', 'users.lastLoginName', 'statuses.notifications.maxSavedId' ] @@ -79,6 +80,7 @@ const store = new Vuex.Store({ }) const i18n = new VueI18n({ + // By default, use the browser locale, we will update it if neccessary locale: currentLocale, fallbackLocale: 'en', messages @@ -201,4 +203,3 @@ window.fetch('/nodeinfo/2.0.json') store.dispatch('setOption', { name: 'suggestionsEnabled', value: suggestions.enabled }) store.dispatch('setOption', { name: 'suggestionsWeb', value: suggestions.web }) }) - |