From 689ce584c93f486f920d18f00b4b127f037f6811 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Mon, 5 Sep 2022 18:01:06 +0100 Subject: [PATCH] add warning when no translation language is set --- src/components/extra_buttons/extra_buttons.js | 7 ++- .../extra_buttons/extra_buttons.vue | 10 ++++ .../settings_modal/tabs/general_tab.vue | 51 ++++--------------- src/i18n/en.json | 3 ++ 4 files changed, 30 insertions(+), 41 deletions(-) diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js index 4ac463e6..042a96a1 100644 --- a/src/components/extra_buttons/extra_buttons.js +++ b/src/components/extra_buttons/extra_buttons.js @@ -55,8 +55,10 @@ const ExtraButtons = { hideDeleteStatusConfirmDialog () { this.showingDeleteDialog = false }, - translateStatus () { + if (this.noTranslationTargetSet) { + this.$store.dispatch('pushGlobalNotice', { messageKey: 'toast.no_translation_target_set', level: 'info' }) + } const translateTo = this.$store.getters.mergedConfig.translationLanguage || this.$store.state.instance.interfaceLanguage this.$store.dispatch('translateStatus', { id: this.status.id, language: translateTo }) .then(() => this.$emit('onSuccess')) @@ -120,6 +122,9 @@ const ExtraButtons = { canTranslate () { return this.$store.state.instance.translationEnabled === true }, + noTranslationTargetSet () { + return this.$store.getters.mergedConfig.translationLanguage === undefined + }, statusLink () { if (this.status.is_local) { return `${this.$store.state.instance.server}${this.$router.resolve({ name: 'conversation', params: { id: this.status.id } }).href}` diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue index bbb140e4..b1cbe8dc 100644 --- a/src/components/extra_buttons/extra_buttons.vue +++ b/src/components/extra_buttons/extra_buttons.vue @@ -126,6 +126,16 @@ fixed-width icon="globe" />{{ $t("status.translate") }} + + diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index bf2bd963..608c73af 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -15,11 +15,6 @@ {{ $t('settings.hide_isp') }} -
  • - - {{ $t('settings.right_sidebar') }} - -
  • {{ $t('settings.hide_wallpaper') }} @@ -104,41 +99,7 @@ {{ $t('settings.virtual_scrolling') }}
  • -
  • - - {{ $t('settings.disable_sticky_headers') }} - -
  • -
  • - - {{ $t('settings.show_scrollbars') }} - -
  • -
  • - - {{ $t('settings.third_column_mode') }} - -
  • -
  • - - {{ $t('settings.minimal_scopes_mode') }} - -
  • -
  • - - {{ $t('settings.sensitive_by_default') }} - -
  • -
  • - - {{ $t('settings.sensitive_if_subject') }} - -
  • +
  • {{ $t('settings.render_mfm') }} @@ -496,12 +457,22 @@ />
  • +
  • + + {{ $t('settings.minimal_scopes_mode') }} + +
  • {{ $t('settings.sensitive_by_default') }}
  • +
  • + + {{ $t('settings.sensitive_if_subject') }} + +