Fix captcha error message.

robgietema · robgietema · commit ee31af0594a0 · 2025-05-08T11:40:44.000+02:00
diff --git a/frontend/packages/volto-form-block/locales/de/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/de/LC_MESSAGES/volto.po
@@ -180,10 +180,15 @@ msgstr "Bei Aktivierung werden die Daten für eine spätere Verwendung beim Abse
 msgid "Yes"
 msgstr "Ja"
 
-#. Default: "Your form could not be sent. Please try again later."
+#. Default: "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 #: components/ViewSchemaForm
-msgid "Your form could not be sent. Please try again later."
-msgstr "Ihr Formular konnte nicht versendet werden. Bitte versuchen Sie es später nochmals."
+msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
+msgstr "Ihr Formular konnte nicht versendet werden. Bitte laden Sie die Seite neu und versuchen Sie es erneut. Ihre eingegebenen Daten bleiben erhalten."
+
+#. Default: "Your form could not be sent. Please try again."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again."
+msgstr "Formular konnte nicht gesendet werden. Versuchen Sie es nochmal."
 
 #. Default: "Admin info"
 #: components/schema
diff --git a/frontend/packages/volto-form-block/locales/en/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/en/LC_MESSAGES/volto.po
@@ -180,9 +180,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#. Default: "Your form could not be sent. Please try again later."
+#. Default: "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 #: components/ViewSchemaForm
-msgid "Your form could not be sent. Please try again later."
+msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
+msgstr ""
+
+#. Default: "Your form could not be sent. Please try again."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again."
 msgstr ""
 
 #. Default: "Admin info"
diff --git a/frontend/packages/volto-form-block/locales/es/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/es/LC_MESSAGES/volto.po
@@ -186,9 +186,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#. Default: "Your form could not be sent. Please try again later."
+#. Default: "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 #: components/ViewSchemaForm
-msgid "Your form could not be sent. Please try again later."
+msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
+msgstr ""
+
+#. Default: "Your form could not be sent. Please try again."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again."
 msgstr ""
 
 #. Default: "Admin info"
diff --git a/frontend/packages/volto-form-block/locales/eu/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/eu/LC_MESSAGES/volto.po
@@ -182,9 +182,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#. Default: "Your form could not be sent. Please try again later."
+#. Default: "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 #: components/ViewSchemaForm
-msgid "Your form could not be sent. Please try again later."
+msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
+msgstr ""
+
+#. Default: "Your form could not be sent. Please try again."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again."
 msgstr ""
 
 #. Default: "Admin info"
diff --git a/frontend/packages/volto-form-block/locales/fr/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/fr/LC_MESSAGES/volto.po
@@ -180,10 +180,15 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#. Default: "Your form could not be sent. Please try again later."
+#. Default: "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 #: components/ViewSchemaForm
-msgid "Your form could not be sent. Please try again later."
-msgstr "Votre formulaire n'a pas pu être envoyé. Veuillez réessayer plus tard."
+msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
+msgstr ""
+
+#. Default: "Your form could not be sent. Please try again."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again."
+msgstr ""
 
 #. Default: "Admin info"
 #: components/schema
diff --git a/frontend/packages/volto-form-block/locales/it/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/it/LC_MESSAGES/volto.po
@@ -180,9 +180,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#. Default: "Your form could not be sent. Please try again later."
+#. Default: "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 #: components/ViewSchemaForm
-msgid "Your form could not be sent. Please try again later."
+msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
+msgstr ""
+
+#. Default: "Your form could not be sent. Please try again."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again."
 msgstr ""
 
 #. Default: "Admin info"
diff --git a/frontend/packages/volto-form-block/locales/ja/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/ja/LC_MESSAGES/volto.po
@@ -180,9 +180,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#. Default: "Your form could not be sent. Please try again later."
+#. Default: "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 #: components/ViewSchemaForm
-msgid "Your form could not be sent. Please try again later."
+msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
+msgstr ""
+
+#. Default: "Your form could not be sent. Please try again."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again."
 msgstr ""
 
 #. Default: "Admin info"
diff --git a/frontend/packages/volto-form-block/locales/nl/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/nl/LC_MESSAGES/volto.po
@@ -180,9 +180,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#. Default: "Your form could not be sent. Please try again later."
+#. Default: "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 #: components/ViewSchemaForm
-msgid "Your form could not be sent. Please try again later."
+msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
+msgstr ""
+
+#. Default: "Your form could not be sent. Please try again."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again."
 msgstr ""
 
 #. Default: "Admin info"
diff --git a/frontend/packages/volto-form-block/locales/pt/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/pt/LC_MESSAGES/volto.po
@@ -180,9 +180,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#. Default: "Your form could not be sent. Please try again later."
+#. Default: "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 #: components/ViewSchemaForm
-msgid "Your form could not be sent. Please try again later."
+msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
+msgstr ""
+
+#. Default: "Your form could not be sent. Please try again."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again."
 msgstr ""
 
 #. Default: "Admin info"
diff --git a/frontend/packages/volto-form-block/locales/pt_BR/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/pt_BR/LC_MESSAGES/volto.po
@@ -186,9 +186,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#. Default: "Your form could not be sent. Please try again later."
+#. Default: "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 #: components/ViewSchemaForm
-msgid "Your form could not be sent. Please try again later."
+msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
+msgstr ""
+
+#. Default: "Your form could not be sent. Please try again."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again."
 msgstr ""
 
 #. Default: "Admin info"
diff --git a/frontend/packages/volto-form-block/locales/ro/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/ro/LC_MESSAGES/volto.po
@@ -180,9 +180,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#. Default: "Your form could not be sent. Please try again later."
+#. Default: "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 #: components/ViewSchemaForm
-msgid "Your form could not be sent. Please try again later."
+msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
+msgstr ""
+
+#. Default: "Your form could not be sent. Please try again."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again."
 msgstr ""
 
 #. Default: "Admin info"
diff --git a/frontend/packages/volto-form-block/locales/volto.pot b/frontend/packages/volto-form-block/locales/volto.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2025-04-10T08:48:11.074Z\n"
+"POT-Creation-Date: 2025-05-08T09:34:22.308Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -182,9 +182,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#. Default: "Your form could not be sent. Please try again later."
+#. Default: "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 #: components/ViewSchemaForm
-msgid "Your form could not be sent. Please try again later."
+msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
+msgstr ""
+
+#. Default: "Your form could not be sent. Please try again."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again."
 msgstr ""
 
 #. Default: "Admin info"
diff --git a/frontend/packages/volto-form-block/src/components/ViewSchemaForm.jsx b/frontend/packages/volto-form-block/src/components/ViewSchemaForm.jsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { defineMessages, useIntl } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 import { Form } from '@plone/volto/components/manage/Form';
 import { submitForm } from 'volto-form-block/actions';
 import { tryParseJSON, extractInvariantErrors } from '@plone/volto/helpers';
@@ -39,8 +39,9 @@ const messages = defineMessages({
     defaultMessage: 'Submit',
   },
   errorSend: {
-    id: 'Your form could not be sent. Please try again later.',
-    defaultMessage: 'Your form could not be sent. Please try again later.',
+    id: 'Your form could not be sent. Please reload the page and try again. The data you entered will be retained.',
+    defaultMessage:
+      'Your form could not be sent. Please reload the page and try again. The data you entered will be retained.',
   },
   cancel: {
     id: 'Cancel',
@@ -72,16 +73,23 @@ const FormBlockView = ({ data, id, path, moment: momentlib }) => {
   const queryParams = qs.parse(location.search);
   let initialData = {};
 
-  let localStorageData;
+  let localStorageData = {};
   try {
     localStorageData = JSON.parse(localStorage.getItem('formBlocks'));
+    if (!localStorageData) {
+      localStorageData = {};
+    }
   } catch (error) {
     localStorageData = {};
   }
   if (id in localStorageData) {
     initialData = localStorageData[id];
   }
 
+  // Get captcha error
+  const captchaError =
+    localStorage.getItem('formBlockError') === 'error' ? true : false;
+
   propertyNames.map((property) => {
     if (queryParams[property] !== undefined) {
       initialData[property] = queryParams[property];
@@ -191,6 +199,7 @@ const FormBlockView = ({ data, id, path, moment: momentlib }) => {
         // Set submitted
         setSubmitted(true);
         setSubmittedData(submitData);
+        localStorage.removeItem('formBlockError');
 
         // Clear localstorage
         let localStorageData;
@@ -226,13 +235,19 @@ const FormBlockView = ({ data, id, path, moment: momentlib }) => {
         if (Array.isArray(errorsList)) {
           invariantErrors = extractInvariantErrors(errorsList);
         }
+        localStorage.setItem('formBlockError', 'error');
+        window.location.reload();
+        /*
         if (invariantErrors.length > 0) {
           toast.error(
             <Toast
               error
               title={intl.formatMessage(messages.error)}
               content={invariantErrors.join(' - ')}
             />,
+            {
+              autoClose: false,
+            },
           );
         } else {
           toast.error(
@@ -241,8 +256,12 @@ const FormBlockView = ({ data, id, path, moment: momentlib }) => {
               title={intl.formatMessage(messages.errorSend)}
               content={message}
             />,
+            {
+              autoClose: false,
+            },
           );
         }
+        */
 
         setSubmitPressed(false);
       });
@@ -351,6 +370,14 @@ const FormBlockView = ({ data, id, path, moment: momentlib }) => {
           textButtons={true}
         />
       )}
+      {captchaError && (
+        <Message error size="small`">
+          <FormattedMessage
+            id="Your form could not be sent. Please try again."
+            defaultMessage="Your form could not be sent. Please try again."
+          />
+        </Message>
+      )}
     </div>
   );
 };
