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/components/settings/settings.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/components/settings/settings.js')
| -rw-r--r-- | src/components/settings/settings.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index d5ca33cc..f8eaad00 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -1,5 +1,6 @@ /* eslint-env browser */ import StyleSwitcher from '../style_switcher/style_switcher.vue' +import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue' import { filter, trim } from 'lodash' const settings = { @@ -28,7 +29,8 @@ const settings = { } }, components: { - StyleSwitcher + StyleSwitcher, + InterfaceLanguageSwitcher }, computed: { user () { |