From 870f2c85a2b3b4868b8ffd21687faf9a59b35119 Mon Sep 17 00:00:00 2001 From: animegrafmays Date: Wed, 13 Sep 2023 14:54:27 -0400 Subject: [PATCH 1/2] fix scheduled post cancel button text --- .../components/scheduled-status-action-bar.tsx | 2 +- app/soapbox/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx b/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx index 6ff3d867b..c59d27f0c 100644 --- a/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx +++ b/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx @@ -12,7 +12,7 @@ import type { Status as StatusEntity } from 'soapbox/types/entities'; const messages = defineMessages({ cancel: { id: 'scheduled_status.cancel', defaultMessage: 'Cancel' }, - deleteConfirm: { id: 'confirmations.scheduled_status_delete.confirm', defaultMessage: 'Cancel' }, + deleteConfirm: { id: 'confirmations.scheduled_status_delete.confirm', defaultMessage: 'Discard' }, deleteHeading: { id: 'confirmations.scheduled_status_delete.heading', defaultMessage: 'Cancel scheduled post' }, deleteMessage: { id: 'confirmations.scheduled_status_delete.message', defaultMessage: 'Are you sure you want to cancel this scheduled post?' }, }); diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index 0f313f39a..eba750d17 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -527,7 +527,7 @@ "confirmations.revoke_session.confirm": "Revoke", "confirmations.revoke_session.heading": "Revoke current session", "confirmations.revoke_session.message": "You are about to revoke your current session. You will be signed out.", - "confirmations.scheduled_status_delete.confirm": "Cancel", + "confirmations.scheduled_status_delete.confirm": "Discard", "confirmations.scheduled_status_delete.heading": "Cancel scheduled post", "confirmations.scheduled_status_delete.message": "Are you sure you want to cancel this scheduled post?", "confirmations.unfollow.confirm": "Unfollow", From 301c5224bfc5e758a6cf9277196e203c61df324f Mon Sep 17 00:00:00 2001 From: animegrafmays Date: Wed, 13 Sep 2023 15:02:48 -0400 Subject: [PATCH 2/2] clarify we mean to discard the post --- .../components/scheduled-status-action-bar.tsx | 2 +- app/soapbox/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx b/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx index c59d27f0c..3c88fd7f8 100644 --- a/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx +++ b/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx @@ -14,7 +14,7 @@ const messages = defineMessages({ cancel: { id: 'scheduled_status.cancel', defaultMessage: 'Cancel' }, deleteConfirm: { id: 'confirmations.scheduled_status_delete.confirm', defaultMessage: 'Discard' }, deleteHeading: { id: 'confirmations.scheduled_status_delete.heading', defaultMessage: 'Cancel scheduled post' }, - deleteMessage: { id: 'confirmations.scheduled_status_delete.message', defaultMessage: 'Are you sure you want to cancel this scheduled post?' }, + deleteMessage: { id: 'confirmations.scheduled_status_delete.message', defaultMessage: 'Are you sure you want to discard this scheduled post?' }, }); interface IScheduledStatusActionBar { diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index eba750d17..956c3db7b 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -529,7 +529,7 @@ "confirmations.revoke_session.message": "You are about to revoke your current session. You will be signed out.", "confirmations.scheduled_status_delete.confirm": "Discard", "confirmations.scheduled_status_delete.heading": "Cancel scheduled post", - "confirmations.scheduled_status_delete.message": "Are you sure you want to cancel this scheduled post?", + "confirmations.scheduled_status_delete.message": "Are you sure you want to discard this scheduled post?", "confirmations.unfollow.confirm": "Unfollow", "copy.success": "Copied to clipboard!", "crypto_donate.explanation_box.message": "{siteTitle} accepts cryptocurrency donations. You may send a donation to any of the addresses below. Thank you for your support!",