From 9527c0b93975e5dcb25a5d2507c1e3ccc06a1c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Mon, 21 Jun 2021 22:12:12 +0200
Subject: [PATCH] Confirmation modals about missing image descriptions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 .env.example                                             | 3 +++
 app/soapbox/actions/compose.js                           | 1 -
 app/soapbox/features/preferences/index.js                | 2 +-
 .../features/ui/components/missing_description_modal.js  | 9 ++-------
 app/soapbox/locales/pl.json                              | 5 ++---
 5 files changed, 8 insertions(+), 12 deletions(-)
 create mode 100644 .env.example

diff --git a/.env.example b/.env.example
new file mode 100644
index 000000000..b116e6d40
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,3 @@
+NODE_ENV=development
+# BACKEND_URL="https://example.com"
+# PROXY_HTTPS_INSECURE=false
diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js
index 4d92fe37d..6c3057436 100644
--- a/app/soapbox/actions/compose.js
+++ b/app/soapbox/actions/compose.js
@@ -203,7 +203,6 @@ export function submitCompose(routerHistory, group) {
 
     if (missingDescriptionModal && media.filter(item => !item.get('description')).size) {
       dispatch(openModal('MISSING_DESCRIPTION', {
-        some: media.filter(item => !item.get('description')).size !== media.size,
         onContinue: () => onModalSubmitCompose(),
       }));
     } else onModalSubmitCompose();
diff --git a/app/soapbox/features/preferences/index.js b/app/soapbox/features/preferences/index.js
index ad3ccc4f7..7d188afc6 100644
--- a/app/soapbox/features/preferences/index.js
+++ b/app/soapbox/features/preferences/index.js
@@ -203,7 +203,7 @@ class Preferences extends ImmutablePureComponent {
               path={['deleteModal']}
             />
             <SettingsCheckbox
-              label={<FormattedMessage id='preferences.fields.missing_description_modal_label' defaultMessage='Show confirmation dialog before sending a post without media description' />}
+              label={<FormattedMessage id='preferences.fields.missing_description_modal_label' defaultMessage='Show confirmation dialog before sending a post without media descriptions' />}
               path={['missingDescriptionModal']}
             />
           </FieldsGroup>
diff --git a/app/soapbox/features/ui/components/missing_description_modal.js b/app/soapbox/features/ui/components/missing_description_modal.js
index f00cddbe9..0cbdad660 100644
--- a/app/soapbox/features/ui/components/missing_description_modal.js
+++ b/app/soapbox/features/ui/components/missing_description_modal.js
@@ -7,7 +7,6 @@ export default @injectIntl
 class MissingDescriptionModal extends React.PureComponent {
 
   static propTypes = {
-    some: PropTypes.bool,
     onClose: PropTypes.func,
     onContinue: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
@@ -31,14 +30,10 @@ class MissingDescriptionModal extends React.PureComponent {
   }
 
   render() {
-    const { some } = this.props;
-
     return (
       <div className='modal-root__modal confirmation-modal'>
         <div className='confirmation-modal__container'>
-          {some
-            ? <FormattedMessage id='missing_description_modal.some' defaultMessage='Some of media you are going to post lacks media description. Are you sure you want to continue?' />
-            : <FormattedMessage id='missing_description_modal.all' defaultMessage='You are about to post undescribed media. Are you sure you want to continue?' />}
+          <FormattedMessage id='missing_description_modal.text' defaultMessage='You have not entered a description for all attachments. Continue anyway?' />
         </div>
 
         <div className='confirmation-modal__action-bar'>
@@ -46,7 +41,7 @@ class MissingDescriptionModal extends React.PureComponent {
             <FormattedMessage id='missing_description_modal.cancel' defaultMessage='Cancel' />
           </Button>
           <Button onClick={this.handleContinue}>
-            <FormattedMessage id='missing_description_modal.continue' defaultMessage='Continue' />
+            <FormattedMessage id='missing_description_modal.continue' defaultMessage='Post' />
           </Button>
         </div>
       </div>
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index 1c820b85f..532770f18 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -421,10 +421,9 @@
   "mfa.setup_otp_title": "Wyłączono OTP",
   "mfa.setup_recoverycodes": "Kody przywracania",
   "mfa.setup_warning": "Zapisz te kody gdzieś w bezpiecznym miejscu – jeżeli tego nie zrobisz, już ich nie zobaczysz. Jeśli utracisz dostęp do aplikacji 2FA i tych kodów, stracisz dostęp do swojego konta.",
-  "missing_description_modal.all": "Zamierzasz opublikować media, które nie zawierają opisu. Czy na pewno chcesz kontynuować?",
   "missing_description_modal.cancel": "Anuluj",
-  "missing_description_modal.continue": "Kontynuuj",
-  "missing_description_modal.some": "Niektóre media które zamierzasz opublikować nie zawierają opisu. Czy na pewno chcesz kontynuować?",
+  "missing_description_modal.continue": "Opublikuj",
+  "missing_description_modal.text": "Nie podałeś(-aś) opisu dla wszystkich załączników. Czy na pewno chcesz kontynuować?",
   "missing_indicator.label": "Nie znaleziono",
   "missing_indicator.sublabel": "Nie można odnaleźć tego zasobu",
   "morefollows.followers_label": "…i {count} więcej {count, plural, one {obserwujący(-a)} few {obserwujących} many {obserwujących} other {obserwujących}} na zdalnych stronach.",