wagtail 7.0.2__py3-none-any.whl → 7.1rc1__py3-none-any.whl

wagtail/snippets/tests/test_snippets.py

@@ -27,7 +27,7 @@ from wagtail.admin.forms import WagtailAdminModelForm
 from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.menu import admin_menu
 from wagtail.admin.panels import FieldPanel, ObjectList, get_edit_handler
-from wagtail.admin.widgets.button import ButtonWithDropdown
+from wagtail.admin.widgets.button import Button, ButtonWithDropdown, ListingButton
 from wagtail.blocks.field_block import FieldBlockAdapter
 from wagtail.coreutils import get_dummy_request
 from wagtail.models import Locale, ModelLogEntry, Revision
@@ -78,6 +78,7 @@ from wagtail.test.testapp.models import (
 from wagtail.test.utils import WagtailTestUtils
 from wagtail.test.utils.template_tests import AdminTemplateTestUtils
 from wagtail.test.utils.timestamps import submittable_timestamp
+from wagtail.utils.deprecation import RemovedInWagtail80Warning
 from wagtail.utils.timestamps import render_timestamp
 
 
@@ -246,7 +247,7 @@ class TestSnippetListView(WagtailTestUtils, TestCase):
     def test_not_searchable(self):
         self.assertFalse(self.get().context.get("search_form"))
 
-    def test_register_snippet_listing_buttons_hook(self):
+    def test_register_snippet_listing_buttons_hook_deprecated_class(self):
         advert = Advert.objects.create(text="My Lovely advert")
 
         def snippet_listing_buttons(snippet, user, next_url=None):
@@ -261,7 +262,13 @@ class TestSnippetListView(WagtailTestUtils, TestCase):
         with hooks.register_temporarily(
             "register_snippet_listing_buttons", snippet_listing_buttons
         ):
-            response = self.get()
+            with self.assertWarnsMessage(
+                RemovedInWagtail80Warning,
+                "`SnippetListingButton` is deprecated. "
+                "Use `wagtail.admin.widgets.button.Button` "
+                "or `wagtail.admin.widgets.button.ListingButton` instead.",
+            ):
+                response = self.get()
 
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "wagtailadmin/shared/buttons.html")
@@ -279,6 +286,52 @@ class TestSnippetListView(WagtailTestUtils, TestCase):
             "Another useless snippet listing button",
         )
 
+    def test_register_snippet_listing_buttons_hook(self):
+        advert = Advert.objects.create(text="My Lovely advert")
+
+        def snippet_listing_buttons(snippet, user, next_url=None):
+            self.assertEqual(snippet, advert)
+            self.assertEqual(user, self.user)
+            self.assertEqual(next_url, reverse("wagtailsnippets_tests_advert:list"))
+
+            yield ListingButton(
+                "A useless top-level snippet listing button",
+                "/custom-url",
+                priority=10,
+            )
+
+            yield Button(
+                "A useless snippet listing button inside the 'More' dropdown",
+                "/custom-url",
+                priority=10,
+            )
+
+        with hooks.register_temporarily(
+            "register_snippet_listing_buttons", snippet_listing_buttons
+        ):
+            response = self.get()
+
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailadmin/shared/buttons.html")
+
+        soup = self.get_soup(response.content)
+        actions = soup.select_one("tbody tr td ul.actions")
+        custom_buttons = actions.select("a[href='/custom-url']")
+        top_level_custom_button = actions.select_one("li > a[href='/custom-url']")
+        self.assertIs(top_level_custom_button, custom_buttons[0])
+        self.assertEqual(
+            top_level_custom_button.text.strip(),
+            "A useless top-level snippet listing button",
+        )
+        in_dropdown_custom_button = actions.select_one(
+            "li [data-controller='w-dropdown'] a[href='/custom-url']"
+        )
+        self.assertIs(in_dropdown_custom_button, custom_buttons[1])
+        self.assertEqual(
+            in_dropdown_custom_button.text.strip(),
+            "A useless snippet listing button inside the 'More' dropdown",
+        )
+
     def test_register_snippet_listing_buttons_hook_with_dropdown(self):
         advert = Advert.objects.create(text="My Lovely advert")
 
@@ -288,7 +341,8 @@ class TestSnippetListView(WagtailTestUtils, TestCase):
             self.assertEqual(next_url, reverse("wagtailsnippets_tests_advert:list"))
             yield ButtonWithDropdown(
                 label="Moar pls!",
-                buttons=[SnippetListingButton("Alrighty", "/cheers", priority=10)],
+                buttons=[ListingButton("Alrighty", "/cheers", priority=10)],
+                attrs={"data-foo": "bar"},
             )
 
         with hooks.register_temporarily(
@@ -314,6 +368,7 @@ class TestSnippetListView(WagtailTestUtils, TestCase):
                 custom_dropdown = button
         self.assertIsNotNone(custom_dropdown)
         self.assertEqual(custom_dropdown.select_one("button").text.strip(), "Moar pls!")
+        self.assertEqual(custom_dropdown.get("data-foo"), "bar")
         # Should contain the custom button inside the custom dropdown
         custom_button = custom_dropdown.find("a", attrs={"href": "/cheers"})
         self.assertIsNotNone(custom_button)
@@ -919,11 +974,11 @@ class TestSnippetCreateView(WagtailTestUtils, TestCase):
         self.assertContains(response, 'role="tablist"')
         self.assertContains(
             response,
-            '<a id="tab-label-advert" href="#tab-advert" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
+            '<a id="tab-label-advert" href="#tab-advert" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger">',
         )
         self.assertContains(
             response,
-            '<a id="tab-label-other" href="#tab-other" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
+            '<a id="tab-label-other" href="#tab-other" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger">',
         )
         self.assertContains(response, "Other panels help text")
         self.assertContains(response, "Top-level help text")
@@ -2156,13 +2211,14 @@ class TestEditTabbedSnippet(BaseTestSnippetEditView):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "wagtailsnippets/snippets/edit.html")
         self.assertContains(response, 'role="tablist"')
+
         self.assertContains(
             response,
-            '<a id="tab-label-advert" href="#tab-advert" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
+            '<a id="tab-label-advert" href="#tab-advert" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger">',
         )
         self.assertContains(
             response,
-            '<a id="tab-label-other" href="#tab-other" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
+            '<a id="tab-label-other" href="#tab-other" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger">',
         )
 
 
@@ -5772,6 +5828,7 @@ class TestSnippetChooserBlock(TestCase):
                 "isPreviewable": block.is_previewable,
                 "helpText": "pick an advert, any advert",
                 "classname": "w-field w-field--model_choice_field w-field--admin_snippet_chooser",
+                "attrs": {},
                 "showAddCommentButton": True,
                 "strings": {"ADD_COMMENT": "Add Comment"},
             },
@@ -6043,6 +6100,7 @@ class TestSnippetChooserBlockWithCustomPrimaryKey(TestCase):
                 "isPreviewable": block.is_previewable,
                 "helpText": "pick an advert, any advert",
                 "classname": "w-field w-field--model_choice_field w-field--admin_snippet_chooser",
+                "attrs": {},
                 "showAddCommentButton": True,
                 "strings": {"ADD_COMMENT": "Add Comment"},
             },

wagtail/snippets/tests/test_viewset.py

@@ -156,6 +156,30 @@ class TestSnippetChooserBlockWithIcon(TestCase):
         # It should use the icon defined in the FullFeaturedSnippetViewSet
         self.assertEqual(js_args[2]["icon"], "cog")
 
+    def test_adapt_with_explicit_icon(self):
+        block = SnippetChooserBlock(FullFeaturedSnippet, icon="thumbtack")
+
+        block.set_name("test_snippetchooserblock")
+        js_args = FieldBlockAdapter().js_args(block)
+
+        self.assertEqual(js_args[2]["icon"], "thumbtack")
+
+    def test_adapt_with_explicit_default_icon(self):
+        block = SnippetChooserBlock(FullFeaturedSnippet, icon="snippet")
+
+        block.set_name("test_snippetchooserblock")
+        js_args = FieldBlockAdapter().js_args(block)
+
+        self.assertEqual(js_args[2]["icon"], "snippet")
+
+    def test_adapt_with_no_icon_specified_on_block_or_viewset(self):
+        block = SnippetChooserBlock(Advert)
+
+        block.set_name("test_snippetchooserblock")
+        js_args = FieldBlockAdapter().js_args(block)
+
+        self.assertEqual(js_args[2]["icon"], "snippet")
+
     def test_deconstruct(self):
         block = SnippetChooserBlock(FullFeaturedSnippet, required=False)
         path, args, kwargs = block.deconstruct()
@@ -761,8 +785,8 @@ class TestListViewWithCustomColumns(BaseSnippetViewSetTests):
             response,
             """
             <td>
-                <svg class="icon icon-success default w-text-positive-100" aria-hidden="true">
-                    <use href="#icon-success"></use>
+                <svg class="icon icon-check default w-text-positive-100" aria-hidden="true">
+                    <use href="#icon-check"></use>
                 </svg>
                 <span class="w-sr-only">True</span>
             </td>
@@ -774,8 +798,8 @@ class TestListViewWithCustomColumns(BaseSnippetViewSetTests):
             response,
             """
             <td>
-                <svg class="icon icon-error default w-text-critical-100" aria-hidden="true">
-                    <use href="#icon-error"></use>
+                <svg class="icon icon-cross default w-text-text-error" aria-hidden="true">
+                    <use href="#icon-cross"></use>
                 </svg>
                 <span class="w-sr-only">False</span>
             </td>

wagtail/snippets/tests/test_workflows.py

@@ -262,10 +262,11 @@ class TestWorkflowHistory(AdminTemplateTestUtils, BaseWorkflowsTestCase):
         self.assertContains(response, self.get_url("edit"))
         self.assertContains(response, self.get_url("workflow_history"))
 
-        self.assertContains(response, '<div class="w-tabs" data-tabs>')
-        self.assertContains(response, '<div class="tab-content">')
-
         soup = self.get_soup(response.content)
+
+        self.assertIsNotNone(soup.select_one('[data-controller~="w-tabs"]'))
+        self.assertIsNotNone(soup.select_one(".tab-content"))
+
         tasks = soup.select_one("#tab-tasks table")
         self.assertIsNotNone(tasks)
         cells = [
@@ -385,10 +386,11 @@ class TestWorkflowHistory(AdminTemplateTestUtils, BaseWorkflowsTestCase):
         self.assertContains(response, self.get_url("edit"))
         self.assertContains(response, self.get_url("workflow_history"))
 
-        self.assertContains(response, '<div class="w-tabs" data-tabs>')
-        self.assertContains(response, '<div class="tab-content">')
-
         soup = self.get_soup(response.content)
+
+        self.assertIsNotNone(soup.select_one('[data-controller~="w-tabs"]'))
+        self.assertIsNotNone(soup.select_one(".tab-content"))
+
         tasks = soup.select_one("#tab-tasks table")
         self.assertIsNotNone(tasks)
         cells = [

wagtail/snippets/views/snippets.py

@@ -14,10 +14,11 @@ from wagtail import hooks
 from wagtail.admin.checks import check_panels_in_model
 from wagtail.admin.panels import ObjectList, extract_panel_definitions_from_model_class
 from wagtail.admin.ui.components import MediaContainer
+from wagtail.admin.ui.menus import MenuItem
 from wagtail.admin.ui.side_panels import ChecksSidePanel, PreviewSidePanel
 from wagtail.admin.ui.tables import (
     BulkActionsCheckboxColumn,
-    Column,
+    NumberColumn,
     TitleColumn,
 )
 from wagtail.admin.views import generic
@@ -31,7 +32,8 @@ from wagtail.admin.views.generic.preview import (
 from wagtail.admin.viewsets import viewsets
 from wagtail.admin.viewsets.model import ModelViewSet, ModelViewSetGroup
 from wagtail.admin.widgets.button import (
-    BaseDropdownMenuButton,
+    BaseButton,
+    Button,
     ButtonWithDropdown,
 )
 from wagtail.models import (
@@ -127,7 +129,7 @@ class ModelIndexView(generic.BaseListingView):
                 get_url=lambda type: type["url"],
                 sort_key="name",
             ),
-            Column(
+            NumberColumn(
                 "count",
                 label=_("Instances"),
                 sort_key="count",
@@ -187,20 +189,26 @@ class IndexView(generic.IndexViewOptionalFeaturesMixin, generic.IndexView):
         )
 
     def get_list_buttons(self, instance):
-        more_buttons = self.get_list_more_buttons(instance)
         next_url = self.request.path
         list_buttons = []
+        more_buttons = []
 
+        buttons = self.get_list_more_buttons(instance)
         for hook in hooks.get_hooks("register_snippet_listing_buttons"):
-            hook_buttons = hook(instance, self.request.user, next_url)
-            for button in hook_buttons:
-                if isinstance(button, BaseDropdownMenuButton):
-                    # If the button is a dropdown menu, add it to the top-level
-                    # because we do not support nested dropdowns
-                    list_buttons.append(button)
-                else:
-                    # Otherwise, add it to the default "More" dropdown
-                    more_buttons.append(button)
+            buttons.extend(hook(instance, self.request.user, next_url))
+
+        for button in buttons:
+            if isinstance(button, BaseButton) and not button.allow_in_dropdown:
+                # If the button is not allowed in a dropdown menu, add it to
+                # the top-level list of buttons
+                list_buttons.append(button)
+            elif isinstance(button, MenuItem):
+                # Allow simple MenuItem instances to be passed in directly
+                if button.is_shown(self.request.user):
+                    more_buttons.append(Button.from_menu_item(button))
+            elif button.show:
+                # Otherwise, add it to the default "More" dropdown
+                more_buttons.append(button)
 
         # Pass the more_buttons to the construct hooks, as that's what contains
         # the default buttons and most buttons added via register_snippet_listing_buttons

wagtail/snippets/widgets.py

@@ -1,3 +1,5 @@
+from warnings import warn
+
 from django import forms
 from django.core.exceptions import ImproperlyConfigured
 from django.urls import reverse
@@ -6,9 +8,10 @@ from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 
 from wagtail.admin.staticfiles import versioned_static
+from wagtail.admin.telepath import register
 from wagtail.admin.widgets import BaseChooser, BaseChooserAdapter
-from wagtail.admin.widgets.button import ListingButton
-from wagtail.telepath import register
+from wagtail.admin.widgets.button import Button
+from wagtail.utils.deprecation import RemovedInWagtail80Warning
 
 
 class AdminSnippetChooser(BaseChooser):
@@ -67,5 +70,12 @@ class SnippetChooserAdapter(BaseChooserAdapter):
 register(SnippetChooserAdapter(), AdminSnippetChooser)
 
 
-class SnippetListingButton(ListingButton):
-    pass
+class SnippetListingButton(Button):
+    def __init__(self, *args, **kwargs):
+        warn(
+            "`SnippetListingButton` is deprecated. "
+            "Use `wagtail.admin.widgets.button.Button` "
+            "or `wagtail.admin.widgets.button.ListingButton` instead.",
+            category=RemovedInWagtail80Warning,
+        )
+        super().__init__(*args, **kwargs)

wagtail/telepath.py

@@ -1,76 +1,20 @@
-from django import forms
-from telepath import Adapter, AdapterRegistry, JSContextBase
-
-from wagtail.admin.staticfiles import versioned_static
-
-
-class WagtailJSContextBase(JSContextBase):
-    @property
-    def base_media(self):
-        return forms.Media(
-            js=[
-                versioned_static(self.telepath_js_path),
-            ]
-        )
-
-
-class WagtailAdapterRegistry(AdapterRegistry):
-    js_context_base_class = WagtailJSContextBase
-
-
-registry = WagtailAdapterRegistry(
-    telepath_js_path="wagtailadmin/js/telepath/telepath.js"
+import warnings
+
+from wagtail.admin.telepath import (  # noqa: F401
+    Adapter,
+    AdapterRegistry,
+    JSContext,
+    JSContextBase,
+    WagtailAdapterRegistry,
+    WagtailJSContextBase,
+    adapter,
+    register,
+    registry,
 )
-JSContext = registry.js_context_class
-
-
-def register(adapter, cls):
-    registry.register(adapter, cls)
-
-
-def adapter(js_constructor, base=Adapter):
-    """
-    Allows a class to implement its adapting logic with a `js_args()` method on the class itself.
-    This just helps reduce the amount of code you have to write.
-
-    For example:
+from wagtail.utils.deprecation import RemovedInWagtail80Warning
 
-        @adapter('wagtail.mywidget')
-        class MyWidget():
-            ...
-
-            def js_args(self):
-                return [
-                    self.foo,
-                ]
-
-    Is equivalent to:
-
-        class MyWidget():
-            ...
-
-
-        class MyWidgetAdapter(Adapter):
-            js_constructor = 'wagtail.mywidget'
-
-            def js_args(self, obj):
-                return [
-                    self.foo,
-                ]
-    """
-
-    def _wrapper(cls):
-        ClassAdapter = type(
-            cls.__name__ + "Adapter",
-            (base,),
-            {
-                "js_constructor": js_constructor,
-                "js_args": lambda self, obj: obj.js_args(),
-            },
-        )
-
-        register(ClassAdapter(), cls)
-
-        return cls
-
-    return _wrapper
+warnings.warn(
+    "wagtail.telepath has been moved to wagtail.admin.telepath",
+    RemovedInWagtail80Warning,
+    stacklevel=2,
+)

wagtail/test/customuser/models.py

@@ -13,6 +13,7 @@ from django.db import models
 from wagtail.admin.auth import permission_denied  # noqa: F401
 from wagtail.admin.panels import FieldPanel
 from wagtail.admin.views.generic import chooser as chooser_views  # noqa: F401
+from wagtail.search import index
 
 from .fields import ConvertedValueField
 
@@ -55,7 +56,7 @@ class CustomUserManager(BaseUserManager):
         return self._create_user(username, email, password, True, True, **extra_fields)
 
 
-class CustomUser(AbstractBaseUser, PermissionsMixin):
+class CustomUser(index.Indexed, AbstractBaseUser, PermissionsMixin):
     identifier = ConvertedValueField(primary_key=True)
     username = models.CharField(max_length=100, unique=True)
     email = models.EmailField(max_length=255, blank=True)
@@ -81,3 +82,15 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
         FieldPanel("first_name"),
         FieldPanel("last_name"),
     ]
+
+    search_fields = [
+        index.SearchField("country"),
+        index.SearchField("first_name"),
+        index.SearchField("last_name"),
+        index.AutocompleteField("country"),
+        index.AutocompleteField("first_name"),
+        index.AutocompleteField("last_name"),
+        # The PK must be added as FilterField to allow searching
+        # and filtering by group
+        index.FilterField("identifier"),
+    ]

wagtail/test/demosite/models.py

@@ -182,8 +182,8 @@ class HomePageRelatedLink(Orderable, AbstractRelatedLink):
 
 HomePage.content_panels = Page.content_panels + [
     FieldPanel("body"),
-    InlinePanel("carousel_items", label="Carousel items"),
-    InlinePanel("related_links", label="Related links"),
+    InlinePanel("carousel_items", label="carousel item"),
+    InlinePanel("related_links", label="related link"),
 ]
 
 
@@ -232,9 +232,9 @@ class StandardPageRelatedLink(Orderable, AbstractRelatedLink):
 
 StandardPage.content_panels = Page.content_panels + [
     FieldPanel("intro"),
-    InlinePanel("carousel_items", heading="Carousel items", label="Carousel item"),
+    InlinePanel("carousel_items", label="carousel item"),
     FieldPanel("body"),
-    InlinePanel("related_links", heading="Related links", label="Related link"),
+    InlinePanel("related_links", label="related link"),
 ]
 
 
@@ -276,7 +276,7 @@ class StandardIndexPageRelatedLink(Orderable, AbstractRelatedLink):
 
 StandardIndexPage.content_panels = Page.content_panels + [
     FieldPanel("intro"),
-    InlinePanel("related_links", label="Related links"),
+    InlinePanel("related_links", label="related link"),
 ]
 
 
@@ -347,8 +347,8 @@ class BlogEntryPageTag(TaggedItemBase):
 BlogEntryPage.content_panels = Page.content_panels + [
     FieldPanel("date"),
     FieldPanel("body"),
-    InlinePanel("carousel_items", label="Carousel items"),
-    InlinePanel("related_links", label="Related links"),
+    InlinePanel("carousel_items", label="carousel item"),
+    InlinePanel("related_links", label="related link"),
 ]
 
 
@@ -409,7 +409,7 @@ class BlogIndexPageRelatedLink(Orderable, AbstractRelatedLink):
 
 BlogIndexPage.content_panels = Page.content_panels + [
     FieldPanel("intro"),
-    InlinePanel("related_links", label="Related links"),
+    InlinePanel("related_links", label="related link"),
 ]
 
 
@@ -521,10 +521,10 @@ EventPage.content_panels = Page.content_panels + [
     FieldPanel("audience"),
     FieldPanel("cost"),
     FieldPanel("signup_link"),
-    InlinePanel("carousel_items", label="Carousel items"),
+    InlinePanel("carousel_items", label="carousel item"),
     FieldPanel("body"),
-    InlinePanel("speakers", label="Speakers"),
-    InlinePanel("related_links", label="Related links"),
+    InlinePanel("speakers", label="speaker"),
+    InlinePanel("related_links", label="related link"),
 ]
 
 
@@ -571,7 +571,7 @@ class EventIndexPageRelatedLink(Orderable, AbstractRelatedLink):
 
 EventIndexPage.content_panels = Page.content_panels + [
     FieldPanel("intro"),
-    InlinePanel("related_links", label="Related links"),
+    InlinePanel("related_links", label="related link"),
 ]
 
 
@@ -632,7 +632,7 @@ PersonPage.content_panels = Page.content_panels + [
     FieldPanel("biography"),
     FieldPanel("image"),
     MultiFieldPanel(ContactFieldsMixin.panels, "Contact"),
-    InlinePanel("related_links", label="Related links"),
+    InlinePanel("related_links", label="related link"),
 ]
 
 
@@ -690,5 +690,5 @@ class FormPage(AbstractForm):
     )
     api_fields = [APIField("form_fields")]
     content_panels = AbstractForm.content_panels + [
-        InlinePanel("form_fields", label="Form fields")
+        InlinePanel("form_fields", label="form field")
     ]

wagtail/test/settings.py

@@ -228,6 +228,7 @@ else:
     AUTH_USER_MODEL = "customuser.CustomUser"
 
 if os.environ.get("DATABASE_ENGINE") == "django.db.backends.postgresql":
+    INSTALLED_APPS.append("django.contrib.postgres")
     WAGTAILSEARCH_BACKENDS["postgresql"] = {
         "BACKEND": "wagtail.search.backends.database",
         "AUTO_UPDATE": False,

wagtail/test/testapp/migrations/0001_squashed_0073_revisablechildmodel_secret_text.py

@@ -546,7 +546,7 @@ class Migration(migrations.Migration):
                 ),
             ],
             options={
-                "verbose_name": "MTI Base page",
+                "verbose_name": "MTI base page",
             },
             bases=("wagtailcore.page",),
         ),
@@ -1958,8 +1958,8 @@ class Migration(migrations.Migration):
                 ("address", models.CharField(max_length=255, verbose_name="Address")),
             ],
             options={
-                "verbose_name": "Address",
-                "verbose_name_plural": "Addresses",
+                "verbose_name": "address",
+                "verbose_name_plural": "addresses",
             },
             bases=(wagtail.search.index.Indexed, models.Model),
         ),
@@ -1987,8 +1987,8 @@ class Migration(migrations.Migration):
                 ),
             ],
             options={
-                "verbose_name": "Person",
-                "verbose_name_plural": "Persons",
+                "verbose_name": "person",
+                "verbose_name_plural": "persons",
             },
             bases=("wagtailcore.page",),
         ),
@@ -2093,8 +2093,8 @@ class Migration(migrations.Migration):
                 ),
             ],
             options={
-                "verbose_name": "Tag",
-                "verbose_name_plural": "Tags",
+                "verbose_name": "tag",
+                "verbose_name_plural": "tags",
             },
         ),
         migrations.CreateModel(

wagtail/test/testapp/migrations/0025_alter_importantpagesgenericsetting_options.py

@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
         migrations.AlterModelOptions(
             name="importantpagesgenericsetting",
             options={
-                "verbose_name": "Important pages settings",
-                "verbose_name_plural": "Important pages settings",
+                "verbose_name": "important pages settings",
+                "verbose_name_plural": "important pages settings",
             },
         ),
     ]

wagtail/test/testapp/migrations/0038_sociallink.py

@@ -44,8 +44,8 @@ class Migration(migrations.Migration):
                 ),
             ],
             options={
-                "verbose_name": "Social link",
-                "verbose_name_plural": "Social links",
+                "verbose_name": "social link",
+                "verbose_name_plural": "social links",
             },
             bases=(wagtail.search.index.Indexed, models.Model),
         ),