From fbf4df9ae2b58bf4fcc17ed27c6d6f1f65d9944d Mon Sep 17 00:00:00 2001 From: Buster Neece Date: Sun, 11 Dec 2022 17:46:50 -0600 Subject: [PATCH] Fix gettext. --- .../scss/azuracast/overrides/_material-icons.scss | 12 ++++++++++++ frontend/vue/vendor/gettext.js | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/frontend/scss/azuracast/overrides/_material-icons.scss b/frontend/scss/azuracast/overrides/_material-icons.scss index 40877745d..458350b02 100644 --- a/frontend/scss/azuracast/overrides/_material-icons.scss +++ b/frontend/scss/azuracast/overrides/_material-icons.scss @@ -3,4 +3,16 @@ @include reset-material-icons($material-icon-size * 2); line-height: 0.5em; } + + .btn > & { + margin-right: calc($btn-padding-x / 2); + } + + .btn-lg > & { + margin-right: calc($btn-padding-x-lg / 2); + } + + .btn-sm > & { + margin-right: calc($btn-padding-x-sm / 2); + } } diff --git a/frontend/vue/vendor/gettext.js b/frontend/vue/vendor/gettext.js index f02b647e5..02f79f620 100644 --- a/frontend/vue/vendor/gettext.js +++ b/frontend/vue/vendor/gettext.js @@ -2,7 +2,7 @@ import translations from "../../../translations/translations.json"; import {createGettext} from "vue3-gettext"; export default createGettext({ - defaultLanguage: 'en_US', + defaultLanguage: App.locale, translations: translations, silent: true });