Merge branch 'master' of https://github.com/solspace/craft3-freeform …

…into v3.12/master

packages/builder/src/components/PropertyEditor/Form.jsx

@@ -167,7 +167,7 @@ export default class Form extends BasePropertyEditor {
 
         <TextProperty
           label="Return URL"
-          instructions="The URL the form will redirect to after successful submit."
+          instructions="The URL the form will redirect to after successful submit. This will not work when the Built-in AJAX setting is enabled unless a template-level override is set."
           name="returnUrl"
           value={returnUrl}
           onChangeHandler={this.update}
@@ -201,7 +201,7 @@ export default class Form extends BasePropertyEditor {
         <CheckboxProperty
           label="Enable AJAX"
           bold={true}
-          instructions="Use Freeform's built-in automatic AJAX submit feature."
+          instructions="Use Freeform's built-in automatic AJAX submit feature. This will prevent the value in the Return URL field from working unless a template-level override is set."
           name="ajaxEnabled"
           checked={ajaxEnabled}
           onChangeHandler={this.update}

packages/plugin/src/translations/de/freeform.php

@@ -355,7 +355,7 @@
     'Submission Title' => 'Einreichungs-Titel',
     'What the auto-generated submission titles should look like.' => 'Wie der automatisch generierte Einreichungs-Titel aussehen soll.',
     'Return URL' => 'Rückkehr-URL',
-    'The URL the form will redirect to after successful submit.' => 'Die URL, zu der das Formular nach erfolgreichem Absenden weiterleitet.',
+    'The URL the form will redirect to after successful submit. This will not work when the Built-in AJAX setting is enabled unless a template-level override is set.' => 'Die URL, zu der das Formular nach erfolgreichem Absenden weiterleitet.',
     'Default Status' => 'Standard-Status',
     'The default status to be assigned to new submissions.' => 'Der standardmäßige Status, der neuen Einreichungen zugewiesen wird.',
     'Formatting Template' => 'Formatierungs-Template',
@@ -530,7 +530,7 @@
     'Show all options in a single line?' => 'Zeige alle Optionen in einer Zeile?',
 
     'Enable AJAX' => 'Aktiviere AJAX',
-    'Use Freeform\'s built-in automatic AJAX submit feature.' => 'Verwende das automatische AJAX Submit-Feature von Freeform.',
+    'Use Freeform\'s built-in automatic AJAX submit feature. This will prevent the value in the Return URL field from working unless a template-level override is set.' => 'Verwende das automatische AJAX Submit-Feature von Freeform.',
     'Enable reCAPTCHA' => 'Aktivieren Sie reCAPTCHA',
     'Disabling this option removes the reCAPTCHA check for this specific form.' => 'Durch Deaktivieren dieser Option wird die reCAPTCHA-Prüfung für dieses bestimmte Formular entfernt.',
 

packages/plugin/src/translations/en-US/freeform.php

@@ -379,7 +379,7 @@
     'Submission Title' => 'Submission Title',
     'What the auto-generated submission titles should look like.' => 'What the auto-generated submission titles should look like.',
     'Return URL' => 'Return URL',
-    'The URL the form will redirect to after successful submit.' => 'The URL the form will redirect to after successful submit.',
+    'The URL the form will redirect to after successful submit. This will not work when the Built-in AJAX setting is enabled unless a template-level override is set.' => 'The URL the form will redirect to after successful submit. This will not work when the Built-in AJAX setting is enabled unless a template-level override is set.',
     'Default Status' => 'Default Status',
     'The default status to be assigned to new submissions.' => 'The default status to be assigned to new submissions.',
     'Formatting Template' => 'Formatting Template',
@@ -554,7 +554,7 @@
     'Show all options in a single line?' => 'Show all options in a single line?',
 
     'Enable AJAX' => 'Enable AJAX',
-    'Use Freeform\'s built-in automatic AJAX submit feature.' => 'Use Freeform\'s built-in automatic AJAX submit feature.',
+    'Use Freeform\'s built-in automatic AJAX submit feature. This will prevent the value in the Return URL field from working unless a template-level override is set.' => 'Use Freeform\'s built-in automatic AJAX submit feature. This will prevent the value in the Return URL field from working unless a template-level override is set.',
     'Enable reCAPTCHA' => 'Enable reCAPTCHA',
     'Disabling this option removes the reCAPTCHA check for this specific form.' => 'Disabling this option removes the reCAPTCHA check for this specific form.',
 

packages/plugin/src/translations/nl/freeform.php

@@ -367,7 +367,7 @@
     'Submission Title' => 'Inzending titel',
     'What the auto-generated submission titles should look like.' => 'Hoe de automatisch gegenereerde indieningstitels eruit moeten zien.',
     'Return URL' => 'Terugkeer URL',
-    'The URL the form will redirect to after successful submit.' => 'De URL waarnaar het formulier wordt omgeleid na het verzenden.',
+    'The URL the form will redirect to after successful submit. This will not work when the Built-in AJAX setting is enabled unless a template-level override is set.' => 'De URL waarnaar het formulier wordt omgeleid na het verzenden.',
     'Default Status' => 'Standaard Status',
     'The default status to be assigned to new submissions.' => 'De standaardstatus die moet worden toegewezen aan nieuwe inzendingen.',
     'Formatting Template' => 'Template opmaken',
@@ -544,7 +544,7 @@
     'Show all options in a single line?' => 'Alle opties op één regel weergeven?',
 
     'Enable AJAX' => 'Schakel AJAX in',
-    'Use Freeform\'s built-in automatic AJAX submit feature.' => 'Geburik Freeform\'s ingebouwde automatische AJAX verzendfunctie.',
+    'Use Freeform\'s built-in automatic AJAX submit feature. This will prevent the value in the Return URL field from working unless a template-level override is set.' => 'Geburik Freeform\'s ingebouwde automatische AJAX verzendfunctie.',
     'Enable reCAPTCHA' => 'Schakel reCAPTCHA in',
     'Disabling this option removes the reCAPTCHA check for this specific form.' => 'Als u deze optie uitschakelt, wordt de reCAPTCHA-controle voor dit specifieke formulier verwijderd.',