aboutsummaryrefslogtreecommitdiff
path: root/src/components/interface_language_switcher/interface_language_switcher.vue
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2019-10-29 07:41:29 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2019-10-29 07:41:29 +0000
commit21989c673ee3690f17ed3095e9fbc51501791c02 (patch)
treede26f9a87bcaa6d8e576cf33165247f5c66b61af /src/components/interface_language_switcher/interface_language_switcher.vue
parent42f428d90e87315107dd20975548a5bd63dc2d53 (diff)
parentb66564a30dfadfdd2b216072931576c6c4dcbd61 (diff)
Merge branch 'settings-refactor' into 'develop'
Settings refactor See merge request pleroma/pleroma-fe!960
Diffstat (limited to 'src/components/interface_language_switcher/interface_language_switcher.vue')
-rw-r--r--src/components/interface_language_switcher/interface_language_switcher.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index 83df9a0b..1ca22001 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -40,7 +40,7 @@ export default {
},
language: {
- get: function () { return this.$store.state.config.interfaceLanguage },
+ get: function () { return this.$store.getters.mergedConfig.interfaceLanguage },
set: function (val) {
this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val })
this.$i18n.locale = val