aboutsummaryrefslogtreecommitdiff
path: root/src/components/interface_language_switcher
diff options
context:
space:
mode:
authorTarteka <info@tarteka.net>2019-10-30 22:17:19 +0100
committerTarteka <info@tarteka.net>2019-10-30 22:17:19 +0100
commitfe4845a7c1ca9d6fa51132a0ef9bc5103facae66 (patch)
tree92aceb88e58d149a5446e5a9d7bca6084cb6fa99 /src/components/interface_language_switcher
parenta178346f1e0fbe2246532bbfeba5fd1cc0c1cb2d (diff)
parent74f5f168d639e9e21e294ac45dd6091694a041cc (diff)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop
Diffstat (limited to 'src/components/interface_language_switcher')
-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