wagtail 7.0rc1__py3-none-any.whl → 7.0.1__py3-none-any.whl

wagtail/contrib/forms/locale/tr_TR/LC_MESSAGES/django.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2014-09-11 15:42+0000\n"
 "Last-Translator: José Luis <alagunajs@gmail.com>, 2015,2017\n"
 "Language-Team: Turkish (Turkey) (http://app.transifex.com/torchbox/wagtail/"
@@ -34,12 +34,6 @@ msgstr "Başlangıç tarihi"
 msgid "Date to"
 msgstr "Bitiş tarihi"
 
-#, python-format
-msgid ""
-"There is another field with the label %(label_name)s, please change one of "
-"them."
-msgstr "%(label_name)s adında başka bir alan var, lütfen birini değiştirin."
-
 msgid "Single line text"
 msgstr "Tek satır metin"
 

wagtail/contrib/forms/locale/ug/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2014-09-11 15:42+0000\n"
 "Last-Translator: Abduqadir Abliz <sahranbay@gmail.com>, 2024\n"
 "Language-Team: Uyghur (http://app.transifex.com/torchbox/wagtail/language/"
@@ -28,12 +28,6 @@ msgstr "مۇددەت باشلىنىشى"
 msgid "Date to"
 msgstr "مۇددەت پۈتۈشى"
 
-#, python-format
-msgid ""
-"There is another field with the label %(label_name)s, please change one of "
-"them."
-msgstr "يەنە بىر %(label_name)s بۆلەك بار، ئۇلارنىڭ بىرىنى ئۆزگەرتىڭ."
-
 msgid "Single line text"
 msgstr "يەككە قۇرلۇق تېكىست"
 

wagtail/contrib/forms/locale/uk/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2014-09-11 15:42+0000\n"
 "Last-Translator: d55ee35323c0c760f088259cd23b1b6d_9e8a7d1 "
 "<5459f3ae99ecdd5ed0be0220acd46004_1019581>, 2021\n"
@@ -35,12 +35,6 @@ msgstr "Дата початку"
 msgid "Date to"
 msgstr "Дата кінця"
 
-#, python-format
-msgid ""
-"There is another field with the label %(label_name)s, please change one of "
-"them."
-msgstr "Є інше поле з міткою %(label_name)s, будь ласка, змініть одну з них."
-
 msgid "Single line text"
 msgstr "Однорядковий текст"
 

wagtail/contrib/forms/locale/vi/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2014-09-11 15:42+0000\n"
 "Last-Translator: Vu Pham, 2021\n"
 "Language-Team: Vietnamese (http://app.transifex.com/torchbox/wagtail/"

wagtail/contrib/forms/locale/zh/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2014-09-11 15:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/forms/locale/zh_Hans/LC_MESSAGES/django.po

@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2014-09-11 15:42+0000\n"
 "Last-Translator: 祝沙军 <zhushajun@gmail.com>, 2017\n"
 "Language-Team: Chinese (China) (http://app.transifex.com/torchbox/wagtail/"
@@ -42,12 +42,6 @@ msgstr "起始日起"
 msgid "Date to"
 msgstr "结束日期"
 
-#, python-format
-msgid ""
-"There is another field with the label %(label_name)s, please change one of "
-"them."
-msgstr "%(label_name)s 标签被其它字段使用，请更换一个标签。"
-
 msgid "Single line text"
 msgstr "单行文本"
 

wagtail/contrib/forms/locale/zh_Hant/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2014-09-11 15:42+0000\n"
 "Last-Translator: Ocin Leung, 2020\n"
 "Language-Team: Chinese Traditional (http://app.transifex.com/torchbox/"
@@ -31,12 +31,6 @@ msgstr "起始日期"
 msgid "Date to"
 msgstr "結束日期"
 
-#, python-format
-msgid ""
-"There is another field with the label %(label_name)s, please change one of "
-"them."
-msgstr "%(label_name)s 標簽被其它欄位使用，請更換一個標簽。"
-
 msgid "Single line text"
 msgstr "單行文本"
 

wagtail/contrib/forms/tests/test_views.py

@@ -1,4 +1,5 @@
 import datetime
+import html
 from io import BytesIO
 
 from django.conf import settings
@@ -552,15 +553,39 @@ class TestFormsSubmissionsList(WagtailTestUtils, TestCase):
         self.assertEqual(len(response.context["data_rows"]), 1)
 
     def test_list_submissions_filtering_range(self):
-        response = self.client.get(
-            reverse("wagtailforms:list_submissions", args=(self.form_page.id,)),
-            {"date_from": "12/31/2013", "date_to": "01/02/2014"},
-        )
+        url = reverse("wagtailforms:list_submissions", args=(self.form_page.id,))
+        params = {"date_from": "12/31/2013", "date_to": "01/02/2014"}
+        response = self.client.get(url, params)
 
         # Check response
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "wagtailforms/submissions_index.html")
         self.assertEqual(len(response.context["data_rows"]), 1)
+        soup = self.get_soup(response.content)
+        next_input = soup.select_one('input[name="next"]')
+        self.assertIsNotNone(next_input)
+        self.assertEqual(next_input["value"], f"{url}?{urlencode(params)}")
+
+    def test_list_submissions_filtering_results(self):
+        index_url = reverse("wagtailforms:list_submissions", args=(self.form_page.id,))
+        results_url = reverse(
+            "wagtailforms:list_submissions_results",
+            args=(self.form_page.id,),
+        )
+        params = {"date_from": "12/31/2013", "date_to": "01/02/2014"}
+        response = self.client.get(results_url, params)
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateNotUsed(response, "wagtailforms/submissions_index.html")
+        self.assertTemplateUsed(response, "wagtailforms/list_submissions.html")
+        self.assertEqual(len(response.context["data_rows"]), 1)
+        soup = self.get_soup(response.content)
+        next_input = soup.select_one('input[name="next"]')
+        self.assertIsNotNone(next_input)
+        # The next URL should point to the index page (instead of results page)
+        # with the same query params to preserve the filter
+        self.assertEqual(next_input["value"], f"{index_url}?{urlencode(params)}")
 
     def test_list_submissions_pagination(self):
         self.make_list_submissions()
@@ -1851,9 +1876,13 @@ class TestDuplicateFormFieldLabels(WagtailTestUtils, TestCase):
 
         self.assertEqual(response.status_code, 200)
 
+        expected_validation_error_msg = html.escape(
+            "Field name 'foo' conflicts with another field. Please change the label."
+        )
+
         self.assertContains(
             response,
-            text="There is another field with the label foo, please change one of them.",
+            expected_validation_error_msg,
         )
 
     def test_adding_duplicate_form_labels_as_cleaned_name(self):
@@ -1889,9 +1918,14 @@ class TestDuplicateFormFieldLabels(WagtailTestUtils, TestCase):
 
         self.assertEqual(response.status_code, 200)
 
+        expected_validation_error_msg = html.escape(
+            "Field name 'low_earth_orbit' conflicts with another field. "
+            "Please change the label."
+        )
+
         self.assertContains(
             response,
-            text="There is another field with the label LOW EARTH ORBIT, please change one of them.",
+            expected_validation_error_msg,
         )
 
     def test_adding_duplicate_form_labels_using_override_clean_name(self):
@@ -1928,9 +1962,14 @@ class TestDuplicateFormFieldLabels(WagtailTestUtils, TestCase):
 
         self.assertEqual(response.status_code, 200)
 
+        expected_validation_error_msg = html.escape(
+            "Field name 'test duplicate' conflicts with another field. "
+            "Please change the label."
+        )
+
         self.assertContains(
             response,
-            text="There is another field with the label duplicate 1, please change one of them.",
+            expected_validation_error_msg,
         )
 
     def test_rename_existing_field_and_add_new_field_with_clashing_clean_name(
@@ -1968,9 +2007,15 @@ class TestDuplicateFormFieldLabels(WagtailTestUtils, TestCase):
         )
 
         self.assertEqual(response.status_code, 200)
+
+        expected_validation_error_msg = html.escape(
+            "Field name 'test_field' conflicts with another field. "
+            "Please change the label."
+        )
+
         self.assertContains(
             response,
-            text="There is another field with the label Test field, please change one of them.",
+            expected_validation_error_msg,
         )
 
     def test_adding_duplicate_form_labels_with_custom_related_name(self):
@@ -2014,10 +2059,145 @@ class TestDuplicateFormFieldLabels(WagtailTestUtils, TestCase):
 
         self.assertEqual(response.status_code, 200)
 
+        expected_validation_error_msg = html.escape(
+            "Field name 'chocolate' conflicts with another field. "
+            "Please change the label."
+        )
+
         self.assertContains(
             response,
-            text="There is another field with the label chocolate, please change one of them.",
+            expected_validation_error_msg,
+        )
+
+    def test_validation_errors_are_added_to_all_duplicate_fields(self):
+        """
+        Ensure all forms with duplicate labels have the correct validation error added.
+        """
+
+        form_page = FormPage(
+            title="Form page!",
+            form_fields=[FormField(label="Test field", field_type="singleline")],
         )
+        self.root_page.add_child(instance=form_page)
+
+        post_data = {
+            "title": "Form page!",
+            "slug": "form-page",
+            "form_fields-TOTAL_FORMS": "5",
+            "form_fields-INITIAL_FORMS": "1",
+            "form_fields-MIN_NUM_FORMS": "0",
+            "form_fields-MAX_NUM_FORMS": "1000",
+            # Duplicate field labels
+            "form_fields-0-id": form_page.form_fields.first().pk,
+            "form_fields-0-label": "Test field",
+            "form_fields-0-field_type": "singleline",
+            "form_fields-1-id": "",
+            "form_fields-1-label": "Test field",
+            "form_fields-1-field_type": "singleline",
+            "form_fields-2-id": "",
+            "form_fields-2-label": "Test field",
+            "form_fields-2-field_type": "singleline",
+            "form_fields-3-id": "",
+            "form_fields-3-label": "duplicate 2",
+            "form_fields-3-field_type": "singleline",
+            "form_fields-4-id": "",
+            "form_fields-4-label": "duplicate 2",
+            "form_fields-4-field_type": "singleline",
+        }
+
+        response = self.client.post(
+            reverse("wagtailadmin_pages:edit", args=[form_page.pk]), post_data
+        )
+
+        self.assertEqual(response.status_code, 200)
+
+        form = response.context["form"]
+        formset = form.formsets["form_fields"]
+
+        # Expected validation error messages
+        expected_error_text_field_0 = (
+            "The name 'test_field' is already assigned to this field and cannot be "
+            "changed. Please enter a different label for the conflicting field."
+        )
+        expected_error_text_fields_1_2 = (
+            "Field name 'test_field' conflicts with another field. Please "
+            "change the label."
+        )
+        expected_error_text_fields_3_4 = (
+            "Field name 'duplicate_2' conflicts with another field. Please "
+            "change the label."
+        )
+
+        # Check validation errors for form 0
+        self.assertIn("label", formset.forms[0].errors)
+        self.assertEqual(
+            formset.forms[0].errors["label"][0],
+            expected_error_text_field_0,
+        )
+
+        # Check validation errors for forms 1 and 2
+        for i in [1, 2]:
+            with self.subTest(
+                form_index=i,
+            ):
+                self.assertIn("label", formset.forms[i].errors)
+                self.assertEqual(
+                    formset.forms[i].errors["label"][0],
+                    expected_error_text_fields_1_2,
+                )
+
+        # Check validation errors for forms 3 and 4
+        for i in [3, 4]:
+            with self.subTest(
+                form_index=i,
+            ):
+                self.assertIn("label", formset.forms[i].errors)
+                self.assertEqual(
+                    formset.forms[i].errors["label"][0],
+                    expected_error_text_fields_3_4,
+                )
+
+    def test_deletion_of_duplicate_formset_form_field_allows_page_publish(self):
+        """
+        Test that deleting a duplicate formset form field allows the page to be
+        published.
+        """
+        form_page = FormPage(
+            title="Form page!",
+            form_fields=[FormField(label="Test field", field_type="singleline")],
+            live=False,
+        )
+        self.root_page.add_child(instance=form_page)
+        self.assertFalse(form_page.live)
+
+        post_data = {
+            "title": "Form page!",
+            "slug": "form-page",
+            "action-publish": "action-publish",
+            "form_fields-TOTAL_FORMS": "2",
+            "form_fields-INITIAL_FORMS": "1",
+            "form_fields-MIN_NUM_FORMS": "0",
+            "form_fields-MAX_NUM_FORMS": "1000",
+            "form_fields-0-id": form_page.form_fields.first().pk,
+            "form_fields-0-label": "Test field",
+            "form_fields-0-field_type": "singleline",
+            # Add a duplicate field but mark it for deletion
+            "form_fields-1-id": "",
+            "form_fields-1-label": "Test field",
+            "form_fields-1-field_type": "singleline",
+            "form_fields-1-DELETE": "on",
+        }
+
+        response = self.client.post(
+            reverse("wagtailadmin_pages:edit", args=[form_page.pk]), post_data
+        )
+
+        # Response should redirect to parent page list view
+        self.assertEqual(response.status_code, 302)
+
+        form_page.refresh_from_db()
+
+        self.assertTrue(form_page.live)
 
 
 class TestPreview(WagtailTestUtils, TestCase):

wagtail/contrib/forms/views.py

@@ -363,5 +363,5 @@ class SubmissionsListView(SpreadsheetExportMixin, BaseListingView):
                 }
             )
 
-        context["next_url"] = self.request.get_full_path()
+        context["next_url"] = f"{self.get_index_url()}?{self.request.GET.urlencode()}"
         return context

wagtail/contrib/redirects/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 18:23+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/contrib/search_promotions/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 18:23+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/contrib/settings/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 18:23+0100\n"
+"POT-Creation-Date: 2025-04-25 23:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/contrib/simple_translation/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 18:23+0100\n"
+"POT-Creation-Date: 2025-04-25 23:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/contrib/styleguide/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 18:23+0100\n"
+"POT-Creation-Date: 2025-04-25 23:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/contrib/table_block/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 18:23+0100\n"
+"POT-Creation-Date: 2025-04-25 23:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/contrib/typed_table_block/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 18:23+0100\n"
+"POT-Creation-Date: 2025-04-25 23:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/documents/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 18:23+0100\n"
+"POT-Creation-Date: 2025-04-25 23:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/embeds/blocks.py

@@ -87,8 +87,11 @@ class EmbedBlock(blocks.URLBlock):
 
     def normalize(self, value):
         if isinstance(value, EmbedValue):
-            return value
-        return EmbedValue(value)
+            return value if value.url else None
+        elif value:
+            return EmbedValue(value)
+        else:
+            return None
 
     class Meta:
         icon = "media"

wagtail/embeds/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 18:24+0100\n"
+"POT-Creation-Date: 2025-04-25 23:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/embeds/tests/test_embeds.py

@@ -952,15 +952,23 @@ class TestEmbedBlock(TestCase):
         block = EmbedBlock()
 
         cleaned_value = block.clean(
-            EmbedValue("https://www.youtube.com/watch?v=_U79Wc965vw")
+            block.normalize(EmbedValue("https://www.youtube.com/watch?v=_U79Wc965vw"))
         )
         self.assertIsInstance(cleaned_value, EmbedValue)
         self.assertEqual(
             cleaned_value.url, "https://www.youtube.com/watch?v=_U79Wc965vw"
         )
 
+    @patch("wagtail.embeds.embeds.get_embed")
+    def test_clean_required_empty(self, get_embed):
+        get_embed.return_value = Embed(html="<h1>Hello world!</h1>")
+
+        block = EmbedBlock()
+
         with self.assertRaisesMessage(ValidationError, ""):
-            block.clean(None)
+            block.clean(block.normalize(None))
+
+        get_embed.assert_not_called()
 
     @patch("wagtail.embeds.embeds.get_embed")
     def test_clean_non_required(self, get_embed):
@@ -976,9 +984,17 @@ class TestEmbedBlock(TestCase):
             cleaned_value.url, "https://www.youtube.com/watch?v=_U79Wc965vw"
         )
 
-        cleaned_value = block.clean(None)
+    @patch("wagtail.embeds.embeds.get_embed")
+    def test_clean_non_required_empty(self, get_embed):
+        get_embed.return_value = Embed(html="<h1>Hello world!</h1>")
+
+        block = EmbedBlock(required=False)
+
+        cleaned_value = block.clean(block.normalize(None))
         self.assertIsNone(cleaned_value)
 
+        get_embed.assert_not_called()
+
     @patch("wagtail.embeds.embeds.get_embed")
     def test_clean_invalid_url(self, get_embed):
         get_embed.side_effect = EmbedNotFoundException
@@ -986,9 +1002,17 @@ class TestEmbedBlock(TestCase):
         non_required_block = EmbedBlock(required=False)
 
         with self.assertRaises(ValidationError):
-            non_required_block.clean(EmbedValue("http://no-oembed-here.com/something"))
+            non_required_block.clean(
+                non_required_block.normalize(
+                    EmbedValue("http://no-oembed-here.com/something")
+                )
+            )
 
         required_block = EmbedBlock()
 
         with self.assertRaises(ValidationError):
-            required_block.clean(EmbedValue("http://no-oembed-here.com/something"))
+            required_block.clean(
+                non_required_block.normalize(
+                    EmbedValue("http://no-oembed-here.com/something")
+                )
+            )

wagtail/images/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 18:24+0100\n"
+"POT-Creation-Date: 2025-04-25 23:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/images/models.py

@@ -1405,8 +1405,8 @@ class AbstractRendition(ImageFileMixin, models.Model):
                         "on the 'image', 'filter_spec', and 'focal_point_key' fields."
                         % cls._meta.label,
                         hint=(
-                            "Add models.UniqueConstraint(fields={"
-                            '"image", "filter_spec", "focal_point_key"}, '
+                            "Add models.UniqueConstraint(fields=("
+                            '"image", "filter_spec", "focal_point_key"), '
                             'name="unique_rendition") to %s.Meta.constraints.'
                             % (cls.__name__,)
                         ),

wagtail/images/tests/test_models.py

@@ -1,3 +1,4 @@
+import hashlib
 import unittest
 
 from django.conf import settings
@@ -131,9 +132,11 @@ class TestImage(TestCase):
             self.image.get_file_size()
 
     def test_file_hash(self):
-        self.assertEqual(
-            self.image.get_file_hash(), "4dd0211870e130b7e1690d2ec53c499a54a48fef"
-        )
+        with self.image.file.open() as f:
+            loaded_hash = hashlib.sha1(f.read()).hexdigest()
+        # Ensure get_file_hash() (which does the hash by chunks) returns the
+        # same hash as the one calculated by loading the file into memory.
+        self.assertEqual(self.image.get_file_hash(), loaded_hash)
 
     def test_get_suggested_focal_point_svg(self):
         """
@@ -548,8 +551,8 @@ class TestRenditions(TestCase):
         )
         self.assertEqual(
             errors[0].hint,
-            "Add models.UniqueConstraint(fields={"
-            '"image", "filter_spec", "focal_point_key"}, '
+            "Add models.UniqueConstraint(fields=("
+            '"image", "filter_spec", "focal_point_key"), '
             'name="unique_rendition") to CustomRendition.Meta.constraints.',
         )
 

wagtail/locale/af/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 12:59+0100\n"
+"POT-Creation-Date: 2025-04-25 23:05+0100\n"
 "PO-Revision-Date: 2014-02-21 15:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Afrikaans (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/locale/ar/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 12:59+0100\n"
+"POT-Creation-Date: 2025-04-25 23:05+0100\n"
 "PO-Revision-Date: 2014-02-21 15:51+0000\n"
 "Last-Translator: ultraify media <ultraify@gmail.com>, 2018\n"
 "Language-Team: Arabic (http://app.transifex.com/torchbox/wagtail/language/"