From 82d9edc7aa5c78daec3efcc6a92b9ba435f1dab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Fri, 6 Sep 2024 13:27:55 +0200 Subject: [PATCH] Only display sensitive media button if there are any MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- .../src/features/compose/components/compose-form.tsx | 4 ++-- .../{spoiler-button.tsx => sensitive-media-button.tsx} | 10 +++++----- packages/pl-fe/src/locales/en.json | 10 ++++++++-- packages/pl-fe/src/locales/pl.json | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) rename packages/pl-fe/src/features/compose/components/{spoiler-button.tsx => sensitive-media-button.tsx} (67%) diff --git a/packages/pl-fe/src/features/compose/components/compose-form.tsx b/packages/pl-fe/src/features/compose/components/compose-form.tsx index e3a340791..54a26273a 100644 --- a/packages/pl-fe/src/features/compose/components/compose-form.tsx +++ b/packages/pl-fe/src/features/compose/components/compose-form.tsx @@ -33,7 +33,7 @@ import ReplyGroupIndicator from './reply-group-indicator'; import ReplyMentions from './reply-mentions'; import ScheduleButton from './schedule-button'; import ScheduleForm from './schedule-form'; -import SpoilerButton from './spoiler-button'; +import SensitiveMediaButton from './sensitive-media-button'; import SpoilerInput from './spoiler-input'; import TextCharacterCounter from './text-character-counter'; import UploadForm from './upload-form'; @@ -179,7 +179,7 @@ const ComposeForm = ({ id, shouldCondense, autoFocus, clickab {features.polls && } {features.scheduledStatuses && } - {features.spoilers && } + {anyMedia && features.spoilers && } ), [features, id]); diff --git a/packages/pl-fe/src/features/compose/components/spoiler-button.tsx b/packages/pl-fe/src/features/compose/components/sensitive-media-button.tsx similarity index 67% rename from packages/pl-fe/src/features/compose/components/spoiler-button.tsx rename to packages/pl-fe/src/features/compose/components/sensitive-media-button.tsx index 3c209c168..707b911c4 100644 --- a/packages/pl-fe/src/features/compose/components/spoiler-button.tsx +++ b/packages/pl-fe/src/features/compose/components/sensitive-media-button.tsx @@ -7,15 +7,15 @@ import { useAppDispatch, useCompose } from 'pl-fe/hooks'; import ComposeFormButton from './compose-form-button'; const messages = defineMessages({ - marked: { id: 'compose_form.spoiler.marked', defaultMessage: 'Media is marked as sensitive' }, - unmarked: { id: 'compose_form.spoiler.unmarked', defaultMessage: 'Media is not marked as sensitive' }, + marked: { id: 'compose_form.sensitive.marked', defaultMessage: 'Media is marked as sensitive' }, + unmarked: { id: 'compose_form.sensitive.unmarked', defaultMessage: 'Media is not marked as sensitive' }, }); -interface ISpoilerButton { +interface ISensitiveMediaButton { composeId: string; } -const SpoilerButton: React.FC = ({ composeId }) => { +const SensitiveMediaButton: React.FC = ({ composeId }) => { const intl = useIntl(); const dispatch = useAppDispatch(); @@ -34,4 +34,4 @@ const SpoilerButton: React.FC = ({ composeId }) => { ); }; -export { SpoilerButton as default }; +export { SensitiveMediaButton as default }; diff --git a/packages/pl-fe/src/locales/en.json b/packages/pl-fe/src/locales/en.json index e3557fec5..1c953b270 100644 --- a/packages/pl-fe/src/locales/en.json +++ b/packages/pl-fe/src/locales/en.json @@ -485,8 +485,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "Save changes", "compose_form.schedule": "Schedule", - "compose_form.spoiler.marked": "Media is marked as sensitive", - "compose_form.spoiler.unmarked": "Media is not marked as sensitive", + "compose_form.sensitive.marked": "Media is marked as sensitive", + "compose_form.sensitive.unmarked": "Media is not marked as sensitive", "compose_form.spoiler_placeholder": "Subject (optional)", "confirmation_modal.cancel": "Cancel", "confirmations.admin.deactivate_user.confirm": "Deactivate @{name}", @@ -1512,6 +1512,12 @@ "status.unbookmarked": "Bookmark removed.", "status.unmute_conversation": "Unmute conversation", "status.unpin": "Unpin from profile", + "status.visibility.direct": "The post is only visible to mentioned users", + "status.visibility.list": "The post is only visible to the members of a list", + "status.visibility.list.named": "The post is only visible to the members of a {name} list", + "status.visibility.local": "The post is only visible to users on your instance", + "status.visibility.mutuals_only": "The post is only visible to people who mutually follow the author", + "status.visibility.private": "The post is only visible to followers of the author", "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "statuses.quote_tombstone": "Post is unavailable.", "statuses.tombstone": "One or more posts are unavailable.", diff --git a/packages/pl-fe/src/locales/pl.json b/packages/pl-fe/src/locales/pl.json index 1cbe2284b..783dbc933 100644 --- a/packages/pl-fe/src/locales/pl.json +++ b/packages/pl-fe/src/locales/pl.json @@ -485,8 +485,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "Zapisz zmiany", "compose_form.schedule": "Zaplanuj", - "compose_form.spoiler.marked": "Media są oznaczone jako wrażliwe", - "compose_form.spoiler.unmarked": "Media nie są oznaczone jako wrażliwe", + "compose_form.sensitive.marked": "Media są oznaczone jako wrażliwe", + "compose_form.sensitive.unmarked": "Media nie są oznaczone jako wrażliwe", "compose_form.spoiler_placeholder": "Temat (nieobowiązkowy)", "confirmation_modal.cancel": "Anuluj", "confirmations.admin.deactivate_user.confirm": "Dezaktywuj @{name}",