From 55a840ba9dfb0f9cb89b1a2203c6c6b2a02116d7 Mon Sep 17 00:00:00 2001 From: Sol Fisher Romanoff <sol@solfisher.com> Date: Mon, 25 Jul 2022 21:44:38 +0300 Subject: [PATCH] Merge disabled boost and quote buttons on private posts --- src/components/quote_button/quote_button.vue | 10 +--------- src/i18n/en.json | 3 +-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/components/quote_button/quote_button.vue b/src/components/quote_button/quote_button.vue index 7a4c6b4b..4367f495 100644 --- a/src/components/quote_button/quote_button.vue +++ b/src/components/quote_button/quote_button.vue @@ -1,10 +1,9 @@ <template> <div - v-if="loggedIn" + v-if="(visibility === 'public' || visibility === 'unlisted') && loggedIn" class="QuoteButton" > <button - v-if="visibility === 'public' || visibility === 'unlisted'" class="button-unstyled interactive" :class="{'-active': quoting}" :title="$t('tool_tip.quote')" @@ -15,13 +14,6 @@ icon="quote-left" /> </button> - <span v-else-if="loggedIn"> - <FAIcon - class="fa-scale-110 fa-old-padding" - icon="lock" - :title="$t('timeline.no_quote_hint')" - /> - </span> </div> </template> diff --git a/src/i18n/en.json b/src/i18n/en.json index 0971f77c..36252ec7 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -781,8 +781,7 @@ "conversation": "Conversation", "error": "Error fetching timeline: {0}", "load_older": "Load older statuses", - "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated", - "no_quote_hint": "Post is marked as followers-only or direct and cannot be quoted", + "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated or quoted", "repeated": "repeated", "show_new": "Show new", "reload": "Reload",