wagtail 6.2.2__py3-none-any.whl → 6.3rc2__py3-none-any.whl

wagtail/contrib/simple_translation/tests/test_views.py

@@ -33,6 +33,7 @@ from wagtail.test.utils import TestCase, WagtailTestUtils
         ("fr", "French"),
         ("de", "German"),
     ],
+    WAGTAIL_I18N_ENABLED=True,
 )
 class TestSubmitTranslationView(WagtailTestUtils, TestCase):
     def setUp(self):
@@ -118,6 +119,7 @@ class TestSubmitTranslationView(WagtailTestUtils, TestCase):
         ("fr", "French"),
         ("de", "German"),
     ],
+    WAGTAIL_I18N_ENABLED=True,
 )
 class TestSubmitPageTranslationView(WagtailTestUtils, TestCase):
     def setUp(self):
@@ -222,6 +224,7 @@ class TestSubmitPageTranslationView(WagtailTestUtils, TestCase):
         ("fr", "French"),
         ("de", "German"),
     ],
+    WAGTAIL_I18N_ENABLED=True,
 )
 class TestSubmitSnippetTranslationView(WagtailTestUtils, TestCase):
     def setUp(self):
@@ -401,6 +404,7 @@ class TestSubmitSnippetTranslationWithDraftState(WagtailTestUtils, TestCase):
         ("de", "German"),
     ],
     WAGTAILSIMPLETRANSLATION_SYNC_PAGE_TREE=True,
+    WAGTAIL_I18N_ENABLED=True,
 )
 class TestPageTreeSync(WagtailTestUtils, TestCase):
     def setUp(self):
@@ -438,3 +442,50 @@ class TestPageTreeSync(WagtailTestUtils, TestCase):
 
         self.assertFalse(en_blog_index.has_translation(self.fr_locale))
         self.assertFalse(en_blog_index.has_translation(self.de_locale))
+
+
+@override_settings(
+    LANGUAGES=[
+        ("en", "English"),
+        ("fr", "French"),
+        ("de", "German"),
+    ],
+    WAGTAIL_CONTENT_LANGUAGES=[
+        ("en", "English"),
+        ("fr", "French"),
+        ("de", "German"),
+    ],
+    WAGTAIL_I18N_ENABLED=True,
+)
+class TestPageListing(WagtailTestUtils, TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.en_locale = Locale.objects.first()
+        cls.fr_locale = Locale.objects.create(language_code="fr")
+        cls.de_locale = Locale.objects.create(language_code="de")
+
+        cls.en_homepage = Page.objects.get(depth=2)
+        cls.pages = []
+        for i in range(10):
+            instance = TestPage(title=f"Foo {i}", slug=f"foo-{i}")
+            cls.pages.append(cls.en_homepage.add_child(instance=instance))
+
+    def setUp(self):
+        self.user = self.login()
+
+    def test_translate_button_displayed(self):
+        url = reverse("wagtailadmin_explore", args=(self.en_homepage.pk,))
+        response = self.client.get(url)
+        with self.assertNumQueries(41):
+            response = self.client.get(url)
+
+        soup = self.get_soup(response.content)
+        page = self.pages[0]
+        translate_url = reverse(
+            "simple_translation:submit_page_translation",
+            args=[page.id],
+        )
+        translate_button = soup.select_one(f'a[href="{translate_url}"]')
+        self.assertIsNotNone(translate_button)
+        self.assertEqual(translate_button.text.strip(), "Translate")
+        self.assertIsNotNone(translate_button.select_one("svg.icon-globe"))

wagtail/contrib/simple_translation/wagtail_hooks.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from django.conf import settings
 from django.contrib.admin.utils import quote
 from django.contrib.auth.models import Permission
@@ -50,17 +48,24 @@ def register_submit_translation_permission():
 @hooks.register("register_page_listing_more_buttons")
 def page_listing_more_buttons(page, user, next_url=None):
     if user.has_perm("simple_translation.submit_translation") and not page.is_root():
-        # If there's at least one locale that we haven't translated into yet,
-        # show "Translate this page" button
-        has_locale_to_translate_to = Locale.objects.exclude(
-            id__in=page.get_translations(inclusive=True).values_list(
-                "locale_id", flat=True
-            )
-        ).exists()
+        if hasattr(page, "_has_untranslated_locale"):
+            # `_has_untranslated_locale` may be populated by `annotate_has_untranslated_locale`
+            # on querysets as a performance optimisation
+            has_locale_to_translate_to = page._has_untranslated_locale
+        else:
+            # If there's at least one locale that we haven't translated into yet,
+            # show "Translate this page" button
+            has_locale_to_translate_to = Locale.objects.exclude(
+                id__in=page.get_translations(inclusive=True).values_list(
+                    "locale_id", flat=True
+                )
+            ).exists()
 
         if has_locale_to_translate_to:
             url = reverse("simple_translation:submit_page_translation", args=[page.id])
-            yield wagtailadmin_widgets.Button(_("Translate"), url, priority=60)
+            yield wagtailadmin_widgets.Button(
+                _("Translate"), url, icon_name="globe", priority=60
+            )
 
 
 @hooks.register("register_page_header_buttons")
@@ -118,7 +123,7 @@ def register_snippet_listing_buttons(snippet, user, next_url=None):
 
 
 @hooks.register("construct_translated_pages_to_cascade_actions")
-def construct_translated_pages_to_cascade_actions(pages: List[Page], action: str):
+def construct_translated_pages_to_cascade_actions(pages: list[Page], action: str):
     if not getattr(settings, "WAGTAILSIMPLETRANSLATION_SYNC_PAGE_TREE", False):
         return
 

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

@@ -6,13 +6,14 @@
 # Adam Hughes <adamhughes31@gmail.com>, 2020
 # Philip Crisp, 2022
 # Philip Crisp, 2022
+# Philip Lindsay-Crisp, 2024
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2015-08-26 14:07+0000\n"
-"Last-Translator: Philip Crisp, 2022\n"
+"Last-Translator: Philip Lindsay-Crisp, 2024\n"
 "Language-Team: Welsh (http://app.transifex.com/torchbox/wagtail/language/"
 "cy/)\n"
 "MIME-Version: 1.0\n"
@@ -25,6 +26,9 @@ msgstr ""
 msgid "Wagtail style guide"
 msgstr "Canllaw arddull Wagtail"
 
+msgid "Minimap"
+msgstr "Map fychan"
+
 msgid "Save"
 msgstr "Cadw"
 

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: 2024-08-07 10:06+0100\n"
+"POT-Creation-Date: 2024-10-21 17:53+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/cy/LC_MESSAGES/django.po

@@ -6,13 +6,14 @@
 # Adam Hughes <adamhughes31@gmail.com>, 2020
 # Philip Crisp, 2022
 # Philip Crisp, 2022
+# Philip Lindsay-Crisp, 2024
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2016-05-11 20:23+0000\n"
-"Last-Translator: Philip Crisp, 2022\n"
+"Last-Translator: Philip Lindsay-Crisp, 2024\n"
 "Language-Team: Welsh (http://app.transifex.com/torchbox/wagtail/language/"
 "cy/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +29,36 @@ msgstr "Bloc bwrdd Wagtail"
 msgid "Row header"
 msgstr "Pennawd rhes"
 
+msgid "Table headers"
+msgstr "Penawdau tabl"
+
+msgid "Display the first row as a header"
+msgstr "Dangoswch y rhes gyntaf fel pennawd"
+
+msgid "Display the first column as a header"
+msgstr "Dangoswch y colofn gyntaf fel pennawd"
+
 msgid "Column header"
 msgstr "Pennawd colofn"
 
+msgid "Display the first row AND first column as headers"
+msgstr "Dangoswch y rhes gyntaf A'R golofn gyntaf fel pennawd"
+
+msgid "No headers"
+msgstr "Dim penawdau"
+
+msgid "Which cells should be displayed as headers?"
+msgstr "Pa gelloedd ddylai gael eu harddangos fel penawd?"
+
 msgid "Table caption"
 msgstr "Pennawd bwrdd"
 
+msgid ""
+"A heading that identifies the overall topic of the table, and is useful for "
+"screen reader users."
+msgstr ""
+"Pennawd sy'n nodi pwnc cyffredinol y tabl, ac sy'n ddefnyddiol i ddefnyddwyr "
+"efo darllenwyr sgrin."
+
 msgid "Table"
 msgstr "Bwrdd"

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: 2024-08-07 10:06+0100\n"
+"POT-Creation-Date: 2024-10-21 17:53+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/blocks.py

@@ -163,6 +163,31 @@ class BaseTypedTableBlock(Block):
                 "caption": "",
             }
 
+    def get_api_representation(self, table, context=None):
+        if table:
+            return {
+                "columns": [
+                    {"type": col["block"].name, "heading": col["heading"]}
+                    for col in table.columns
+                ],
+                "rows": [
+                    {
+                        "values": [
+                            column["block"].get_api_representation(val, context=context)
+                            for column, val in zip(table.columns, row["values"])
+                        ]
+                    }
+                    for row in table.row_data
+                ],
+                "caption": table.caption,
+            }
+        else:
+            return {
+                "columns": [],
+                "rows": [],
+                "caption": "",
+            }
+
     def to_python(self, value):
         if value:
             columns = [

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

@@ -5,6 +5,7 @@
 #
 # Translators:
 # Philip Crisp, 2022
+# Philip Lindsay-Crisp, 2024
 #
 #, fuzzy
 msgid ""
@@ -13,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2021-10-15 16:05+0000\n"
-"Last-Translator: Philip Crisp, 2022\n"
+"Last-Translator: Philip Lindsay-Crisp, 2024\n"
 "Language-Team: Welsh (https://app.transifex.com/torchbox/teams/8009/cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +23,16 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
 "11) ? 2 : 3;\n"
 
+msgid "Caption"
+msgstr "Capsiwn"
+
+msgid ""
+"A heading that identifies the overall topic of the table, and is useful for "
+"screen reader users."
+msgstr ""
+"Pennawd sy'n nodi pwnc cyffredinol y tabl, ac sy'n ddefnyddiol i ddefnyddwyr "
+"efo darllenwyr sgrin."
+
 msgid "Add column"
 msgstr "Ychwanegu colofn"
 

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: 2024-08-07 10:06+0100\n"
+"POT-Creation-Date: 2024-10-21 17:53+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"
@@ -18,40 +18,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: blocks.py:313
+#: blocks.py:338
 msgid "Caption"
 msgstr ""
 
-#: blocks.py:315
+#: blocks.py:340
 msgid ""
 "A heading that identifies the overall topic of the table, and is useful for "
 "screen reader users."
 msgstr ""
 
-#: blocks.py:317
+#: blocks.py:342
 msgid "Add column"
 msgstr ""
 
-#: blocks.py:318
+#: blocks.py:343
 msgid "Add row"
 msgstr ""
 
-#: blocks.py:319
+#: blocks.py:344
 msgid "Column heading"
 msgstr ""
 
-#: blocks.py:320
+#: blocks.py:345
 msgid "Insert column"
 msgstr ""
 
-#: blocks.py:321
+#: blocks.py:346
 msgid "Delete column"
 msgstr ""
 
-#: blocks.py:322
+#: blocks.py:347
 msgid "Insert row"
 msgstr ""
 
-#: blocks.py:323
+#: blocks.py:348
 msgid "Delete row"
 msgstr ""

wagtail/contrib/typed_table_block/tests.py

@@ -14,11 +14,14 @@ from wagtail.contrib.typed_table_block.blocks import (
 
 
 class CountryChoiceBlock(blocks.ChoiceBlock):
-    """A ChoiceBlock with a custom rendering, to check that block rendering is honoured"""
+    """A ChoiceBlock with a custom rendering and API representation, to check that block rendering is honoured"""
 
     def render_basic(self, value, context=None):
         return value.upper() if value else value
 
+    def get_api_representation(self, value, context=None):
+        return f".{value}" if value else value
+
 
 class TestTableBlock(TestCase):
     def setUp(self):
@@ -76,6 +79,18 @@ class TestTableBlock(TestCase):
             "caption": "Countries and their food",
         }
 
+        self.api_data = {
+            "columns": [
+                {"type": "country", "heading": "Country"},
+                {"type": "text", "heading": "Description"},
+            ],
+            "rows": [
+                {"values": [".nl", "A small country with stroopwafels"]},
+                {"values": [".fr", "A large country with baguettes"]},
+            ],
+            "caption": "Countries and their food",
+        }
+
     def test_value_from_datadict(self):
         """
         Test that we can turn posted form data into a TypedTable instance,
@@ -174,6 +189,14 @@ class TestTableBlock(TestCase):
         table_data = self.block.get_prep_value(table)
         self.assertEqual(table_data, self.db_data)
 
+    def test_get_api_representation(self):
+        """
+        Test that the API representation honours custom representations of child blocks
+        """
+        table = self.block.to_python(self.db_data)
+        table_api_representation = self.block.get_api_representation(table)
+        self.assertEqual(table_api_representation, self.api_data)
+
     def test_clean(self):
         table = self.block.value_from_datadict(self.form_data, {}, "table")
         # cleaning a valid table should return a TypedTable instance

wagtail/coreutils.py

@@ -3,8 +3,9 @@ import inspect
 import logging
 import re
 import unicodedata
+from collections.abc import Iterable
 from hashlib import md5
-from typing import TYPE_CHECKING, Any, Dict, Iterable, Union
+from typing import TYPE_CHECKING, Any, Union
 from warnings import warn
 
 from anyascii import anyascii
@@ -256,7 +257,7 @@ def find_available_slug(parent, requested_slug, ignore_page_id=None):
     return slug
 
 
-@functools.lru_cache(maxsize=None)
+@functools.cache
 def get_content_languages():
     """
     Cache of settings.WAGTAIL_CONTENT_LANGUAGES in a dictionary for easy lookups by key.
@@ -443,14 +444,7 @@ def safe_md5(data=b"", usedforsecurity=True):
     to use the digest for secure purposes and to please just go ahead and
     allow it to happen.
     """
-
-    # Although ``accepts_kwarg`` works great on Python 3.8+, on Python 3.7 it
-    # raises a ValueError, saying "no signature found for builtin". So, back
-    # to the try/except.
-    try:
-        return md5(data, usedforsecurity=usedforsecurity)
-    except TypeError:
-        return md5(data)
+    return md5(data, usedforsecurity=usedforsecurity)
 
 
 class BatchProcessor:
@@ -552,7 +546,7 @@ class BatchCreator(BatchProcessor):
         if self.max_size and len(self.items) == self.max_size:
             self.process()
 
-    def extend(self, iterable: Iterable[Union[Model, Dict[str, Any]]]) -> None:
+    def extend(self, iterable: Iterable[Union[Model, dict[str, Any]]]) -> None:
         for value in iterable:
             if isinstance(value, self.model):
                 self.add(instance=value)

wagtail/documents/admin_urls.py

@@ -10,8 +10,8 @@ urlpatterns = [
         documents.IndexView.as_view(results_only=True),
         name="index_results",
     ),
-    path("add/", documents.add, name="add"),
-    path("edit/<int:document_id>/", documents.edit, name="edit"),
+    path("add/", documents.CreateView.as_view(), name="add"),
+    path("edit/<int:document_id>/", documents.EditView.as_view(), name="edit"),
     path("delete/<int:document_id>/", documents.DeleteView.as_view(), name="delete"),
     path("multiple/add/", multiple.AddView.as_view(), name="add_multiple"),
     path("multiple/<int:doc_id>/", multiple.EditView.as_view(), name="edit_multiple"),

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

@@ -142,6 +142,13 @@ msgstr "Ia, dileu"
 msgid "No, don't delete"
 msgstr "Na, peidiwch a ddileu"
 
+msgid ""
+"Why not <a class=\"upload-one-now\" href=\"#tab-upload\" data-tab-"
+"trigger>upload one now</a>?"
+msgstr ""
+"Beth am <a class=\"upload-one-now\" href=\"#tab-upload\" data-tab-"
+"trigger>uwchlwytho un rwan</a>?"
+
 msgid "Uploading…"
 msgstr "Wrthi'n uwchlwytho…"
 
@@ -176,6 +183,9 @@ msgstr "Ychwanegu at y casgliad:"
 msgid "Sorry, upload failed."
 msgstr "Mae'n ddrwg gennym, ni fu modd uwchlwytho."
 
+msgid "Tags"
+msgstr "Tagiau"
+
 msgid "Tag"
 msgstr "Tag"