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

wagtail/admin/views/pages/search.py

@@ -1,23 +1,17 @@
-from typing import Any, Dict
+from typing import Any
 
-from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.db.models.query import QuerySet
 from django.http import Http404
+from django.utils.functional import classproperty
 from django.utils.translation import gettext_lazy as _
 
-from wagtail.admin.forms.search import SearchForm
-from wagtail.admin.ui.tables import Column, DateColumn
 from wagtail.admin.ui.tables.pages import (
-    BulkActionsColumn,
     NavigateToChildrenColumn,
-    PageStatusColumn,
-    PageTable,
-    PageTitleColumn,
-    ParentPageColumn,
 )
 from wagtail.admin.views.generic.base import BaseListingView
 from wagtail.admin.views.generic.permissions import PermissionCheckedMixin
+from wagtail.admin.views.pages.listing import PageListingMixin
 from wagtail.models import Page
 from wagtail.permissions import page_permission_policy
 from wagtail.search.query import MATCH_ALL
@@ -49,7 +43,7 @@ def page_filter_search(q, pages, all_pages=None, ordering=None):
     return pages, all_pages
 
 
-class BaseSearchView(PermissionCheckedMixin, BaseListingView):
+class SearchView(PageListingMixin, PermissionCheckedMixin, BaseListingView):
     permission_policy = page_permission_policy
     any_permission_required = {
         "add",
@@ -60,43 +54,24 @@ class BaseSearchView(PermissionCheckedMixin, BaseListingView):
         "unlock",
     }
     paginate_by = 20
-    page_kwarg = "p"
-    context_object_name = "pages"
-    table_class = PageTable
+    page_title = _("Search")
+    header_icon = "search"
     index_url_name = "wagtailadmin_pages:search"
+    index_results_url_name = "wagtailadmin_pages:search_results"
+    # We override get_queryset here that has a custom search implementation
+    is_searchable = True
+    # This view has its own filtering mechanism that doesn't use django-filter
+    filterset_class = None
+    template_name = "wagtailadmin/pages/search.html"
+    results_template_name = "wagtailadmin/pages/search_results.html"
 
-    columns = [
-        BulkActionsColumn("bulk_actions"),
-        PageTitleColumn(
-            "title",
-            classname="title",
-            label=_("Title"),
-            sort_key="title",
-        ),
-        ParentPageColumn("parent", label=_("Parent")),
-        DateColumn(
-            "latest_revision_created_at",
-            label=_("Updated"),
-            sort_key="latest_revision_created_at",
-            width="12%",
-        ),
-        Column(
-            "type",
-            label=_("Type"),
-            accessor="page_type_display_name",
-            width="12%",
-        ),
-        PageStatusColumn(
-            "status",
-            label=_("Status"),
-            sort_key="live",
-            width="12%",
-        ),
-        NavigateToChildrenColumn("navigate", width="10%"),
-    ]
+    @classproperty
+    def columns(cls):
+        columns = PageListingMixin.columns.copy()
+        columns.append(NavigateToChildrenColumn("navigate", width="10%"))
+        return columns
 
     def get(self, request):
-        self.show_locale_labels = getattr(settings, "WAGTAIL_I18N_ENABLED", False)
         self.content_types = []
         self.ordering = None
 
@@ -126,13 +101,13 @@ class BaseSearchView(PermissionCheckedMixin, BaseListingView):
         else:
             self.selected_content_type = None
 
-        self.q = self.request.GET.get("q", "")
-
         return super().get(request)
 
     def get_queryset(self) -> QuerySet[Any]:
-        pages = self.all_pages = (
-            Page.objects.all().prefetch_related("content_type").specific()
+        pages = self.all_pages = Page.objects.all().filter(
+            pk__in=page_permission_policy.explorable_instances(
+                self.request.user
+            ).values_list("pk", flat=True)
         )
         if self.show_locale_labels:
             pages = pages.select_related("locale")
@@ -143,15 +118,17 @@ class BaseSearchView(PermissionCheckedMixin, BaseListingView):
         if self.selected_content_type:
             pages = pages.filter(content_type=self.selected_content_type)
 
+        pages = self.annotate_queryset(pages)
+
         # Parse query and filter
         pages, self.all_pages = page_filter_search(
-            self.q, pages, self.all_pages, self.ordering
+            self.search_query, pages, self.all_pages, self.ordering
         )
 
         # Facets
         if pages.supports_facet:
             self.content_types = [
-                (ContentType.objects.get(id=content_type_id), count)
+                (ContentType.objects.get_for_id(content_type_id), count)
                 for content_type_id, count in self.all_pages.facet(
                     "content_type_id"
                 ).items()
@@ -159,34 +136,13 @@ class BaseSearchView(PermissionCheckedMixin, BaseListingView):
 
         return pages
 
-    def get_table_kwargs(self):
-        kwargs = super().get_table_kwargs()
-        kwargs["show_locale_labels"] = self.show_locale_labels
-        kwargs["actions_next_url"] = self.get_index_url()
-        return kwargs
-
-    def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
+    def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
         context = super().get_context_data(**kwargs)
         context.update(
             {
                 "all_pages": self.all_pages,
-                "query_string": self.q,
                 "content_types": self.content_types,
                 "selected_content_type": self.selected_content_type,
-                "ordering": self.ordering,
             }
         )
         return context
-
-
-class SearchView(BaseSearchView):
-    template_name = "wagtailadmin/pages/search.html"
-
-    def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
-        context = super().get_context_data(**kwargs)
-        context["search_form"] = SearchForm(self.request.GET)
-        return context
-
-
-class SearchResultsView(BaseSearchView):
-    template_name = "wagtailadmin/pages/search_results.html"

wagtail/admin/views/pages/usage.py

@@ -1,41 +1,45 @@
-from typing import Any, Dict
+from typing import Any
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
 from django.http import Http404
 from django.urls import reverse
+from django.utils.functional import cached_property, classproperty
+from django.utils.text import capfirst
+from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
 
-from wagtail.admin.ui.tables import Column, DateColumn
-from wagtail.admin.ui.tables.pages import (
-    PageStatusColumn,
-    PageTable,
-    PageTitleColumn,
-    ParentPageColumn,
-)
 from wagtail.admin.views import generic
 from wagtail.admin.views.generic.base import BaseListingView
+from wagtail.admin.views.generic.permissions import PermissionCheckedMixin
+from wagtail.admin.views.pages.listing import PageFilterSet, PageListingMixin
 from wagtail.admin.views.pages.utils import (
     GenericPageBreadcrumbsMixin,
 )
 from wagtail.models import Page
+from wagtail.permissions import page_permission_policy
 
 
-class ContentTypeUseView(BaseListingView):
-    results_template_name = "wagtailadmin/pages/usage_results.html"
+class ContentTypeUseView(PageListingMixin, PermissionCheckedMixin, BaseListingView):
+    permission_policy = page_permission_policy
+    any_permission_required = {
+        "add",
+        "change",
+        "publish",
+        "bulk_delete",
+        "lock",
+        "unlock",
+    }
+    index_url_name = "wagtailadmin_pages:type_use"
+    index_results_url_name = "wagtailadmin_pages:type_use_results"
     page_title = _("Pages using")
     header_icon = "doc-empty-inverse"
-    page_kwarg = "p"
     paginate_by = 50
-    columns = [
-        PageTitleColumn("title", classname="title", label=_("Title")),
-        ParentPageColumn("parent", label=_("Parent")),
-        DateColumn("latest_revision_created_at", label=_("Updated"), width="12%"),
-        Column("type", label=_("Type"), accessor="page_type_display_name", width="12%"),
-        PageStatusColumn("status", label=_("Status"), width="12%"),
-    ]
-    table_class = PageTable
-    table_classname = "listing"
+    filterset_class = PageFilterSet
+
+    @classproperty
+    def columns(cls):
+        return [col for col in PageListingMixin.columns if col.name != "type"]
 
     def get(self, request, *, content_type_app_name, content_type_model_name):
         try:
@@ -56,19 +60,54 @@ class ContentTypeUseView(BaseListingView):
     def get_page_subtitle(self):
         return self.page_class.get_verbose_name()
 
-    def get_queryset(self):
-        return self.page_class.objects.all().specific(defer=True)
+    @cached_property
+    def verbose_name_plural(self):
+        return self.page_class._meta.verbose_name_plural
+
+    def get_base_queryset(self):
+        queryset = self.page_class._default_manager.all().filter(
+            pk__in=self.permission_policy.explorable_instances(
+                self.request.user
+            ).values_list("pk", flat=True)
+        )
+        return self.annotate_queryset(queryset)
 
     def get_index_url(self):
         return reverse(
-            "wagtailadmin_pages:type_use",
+            self.index_url_name,
+            args=[
+                self.kwargs["content_type_app_name"],
+                self.kwargs["content_type_model_name"],
+            ],
+        )
+
+    def get_index_results_url(self):
+        return reverse(
+            self.index_results_url_name,
             args=[
                 self.kwargs["content_type_app_name"],
                 self.kwargs["content_type_model_name"],
             ],
         )
 
-    def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
+    def get_breadcrumbs_items(self):
+        return self.breadcrumbs_items + [
+            # Initially, this page was only accessible via the "choose page type"
+            # step of the page creation flow. However, that view might be skipped
+            # if there's only one valid page type. Since then, we've introduced
+            # the "page types usage" report, which always provides a link to this
+            # view for all page types. Use that as the parent link.
+            {
+                "url": reverse("wagtailadmin_reports:page_types_usage"),
+                "label": gettext("Page types usage"),
+            },
+            {
+                "url": self.get_index_url(),
+                "label": capfirst(self.page_class._meta.verbose_name_plural),
+            },
+        ]
+
+    def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
         context = super().get_context_data(**kwargs)
         context["page_class"] = self.page_class
         return context

wagtail/admin/views/pages/utils.py

@@ -66,6 +66,7 @@ class GenericPageBreadcrumbsMixin:
         # which in most cases is the final item that links to the current view.
         # However, this can be customised in the case of generic views that are
         # nested inside another generic view.
-        return self.breadcrumbs_items + [
-            super().get_breadcrumbs_items()[-self.breadcrumbs_items_to_take]
-        ]
+        return (
+            self.breadcrumbs_items
+            + super().get_breadcrumbs_items()[-self.breadcrumbs_items_to_take :]
+        )

wagtail/admin/views/reports/base.py

@@ -13,12 +13,6 @@ class ReportView(SpreadsheetExportMixin, PermissionCheckedMixin, BaseListingView
     results_template_name = "wagtailadmin/reports/base_report_results.html"
     title = ""
     paginate_by = 50
-    _show_breadcrumbs = True
-
-    def get_breadcrumbs_items(self):
-        return super().get_breadcrumbs_items() + [
-            {"url": "", "label": self.get_page_title()}
-        ]
 
     def get_page_title(self):
         if self.page_title:

wagtail/admin/views/workflows.py

@@ -4,7 +4,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
 from django.core.paginator import Paginator
 from django.db import transaction
-from django.db.models import Count, OuterRef, Prefetch
+from django.db.models import Count, Prefetch
 from django.db.models.functions import Lower
 from django.http import Http404, HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect, render
@@ -20,7 +20,10 @@ from django.views.generic import TemplateView
 
 from wagtail.admin import messages
 from wagtail.admin.auth import PermissionPolicyChecker
-from wagtail.admin.filters import MultipleContentTypeFilter, WagtailFilterSet
+from wagtail.admin.filters import (
+    MultipleContentTypeFilter,
+    WagtailFilterSet,
+)
 from wagtail.admin.forms.workflows import (
     TaskChooserSearchForm,
     WorkflowContentTypeForm,
@@ -31,13 +34,15 @@ from wagtail.admin.forms.workflows import (
 from wagtail.admin.modal_workflow import render_modal_workflow
 from wagtail.admin.ui.tables import BaseColumn, Column, TitleColumn
 from wagtail.admin.views.generic import CreateView, DeleteView, EditView, IndexView
+from wagtail.admin.views.generic.base import BaseListingView
+from wagtail.admin.views.generic.permissions import PermissionCheckedMixin
+from wagtail.admin.views.pages.listing import PageListingMixin
 from wagtail.coreutils import resolve_model_string
 from wagtail.models import (
     Page,
     Task,
     TaskState,
     Workflow,
-    WorkflowContentType,
     WorkflowState,
     WorkflowTask,
 )
@@ -138,7 +143,6 @@ class Index(IndexView):
     default_ordering = "name"
     search_fields = ["name"]
     filterset_class = WorkflowFilterSet
-    _show_breadcrumbs = True
     paginate_by = 20
 
     def show_disabled(self):
@@ -146,10 +150,7 @@ class Index(IndexView):
 
     def get_base_queryset(self):
         queryset = super().get_base_queryset()
-        content_types = WorkflowContentType.objects.filter(
-            workflow=OuterRef("pk")
-        ).values_list("pk", flat=True)
-        queryset = queryset.annotate(content_types=Count(content_types))
+        queryset = queryset.annotate(content_types=Count("workflow_content_types"))
         return queryset.prefetch_related(
             "workflow_pages",
             "workflow_pages__page",
@@ -259,6 +260,7 @@ class Edit(EditView):
     enable_item_label = _("Enable")
     enable_url_name = "wagtailadmin_workflows:enable"
     header_icon = "tasks"
+    header_more_buttons = []
     edit_handler = None
     MAX_PAGES = 5
     _show_breadcrumbs = True
@@ -393,24 +395,64 @@ class Disable(DeleteView):
         self.object.deactivate(user=self.request.user)
 
 
-def usage(request, pk):
-    workflow = get_object_or_404(Workflow, id=pk)
+class WorkflowUsageView(PageListingMixin, PermissionCheckedMixin, BaseListingView):
+    permission_policy = workflow_permission_policy
+    any_permission_required = {"add", "change", "delete", "view"}
+    pk_url_kwarg = "pk"
+    index_url_name = "wagtailadmin_workflows:usage"
+    index_results_url_name = "wagtailadmin_workflows:usage_results"
+    paginate_by = 20
+    header_icon = "tasks"
+    page_title = _("Usage")
 
-    editable_pages = page_permission_policy.instances_user_has_permission_for(
-        request.user, "change"
-    )
-    pages = workflow.all_pages() & editable_pages
-    paginator = Paginator(pages, per_page=10)
-    pages = paginator.get_page(request.GET.get("p"))
+    def dispatch(self, request, *args, **kwargs):
+        self.object = self.get_object()
 
-    return render(
-        request,
-        "wagtailadmin/workflows/usage.html",
-        {
-            "workflow": workflow,
-            "used_by": pages,
-        },
-    )
+        # We set workflow_permission_policy as the main permission policy for this view
+        # for consistency with the other workflow views. However, since we are listing
+        # page objects in this view, we want to ensure the user has a page permission.
+        if not page_permission_policy.user_has_any_permission(
+            request.user,
+            {"add", "change", "publish", "bulk_delete", "lock", "unlock"},
+        ):
+            raise PermissionDenied
+
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_page_subtitle(self):
+        return self.object.name
+
+    def get_breadcrumbs_items(self):
+        title = self.get_page_title()
+        subtitle = self.get_page_subtitle()
+        return self.breadcrumbs_items + [
+            {
+                "url": reverse("wagtailadmin_workflows:index"),
+                "label": capfirst(Workflow._meta.verbose_name_plural),
+            },
+            {
+                "url": reverse("wagtailadmin_workflows:edit", args=(self.object.pk,)),
+                "label": subtitle,
+            },
+            {"url": "", "label": title, "sublabel": subtitle},
+        ]
+
+    def get_index_url(self):
+        return reverse(self.index_url_name, args=(self.object.pk,))
+
+    def get_index_results_url(self):
+        return reverse(self.index_results_url_name, args=(self.object.pk,))
+
+    def get_object(self):
+        return get_object_or_404(Workflow, id=self.kwargs.get(self.pk_url_kwarg))
+
+    def get_base_queryset(self):
+        editable_pages = page_permission_policy.instances_user_has_permission_for(
+            self.request.user, "change"
+        ).filter(depth__gt=1)
+        pages = self.object.all_pages() & editable_pages
+        pages = self.annotate_queryset(pages)
+        return pages
 
 
 @require_POST
@@ -529,7 +571,6 @@ class TaskIndex(IndexView):
     default_ordering = "name"
     search_fields = ["name"]
     filterset_class = TaskFilterSet
-    _show_breadcrumbs = True
     paginate_by = 50
 
     def show_disabled(self):
@@ -662,6 +703,7 @@ class EditTask(EditView):
     enable_item_label = _("Enable")
     enable_url_name = "wagtailadmin_workflows:enable_task"
     header_icon = "thumbtack"
+    header_more_buttons = []
     _show_breadcrumbs = True
 
     @cached_property

wagtail/admin/viewsets/model.py

@@ -8,6 +8,7 @@ from django.forms.models import modelform_factory
 from django.shortcuts import redirect
 from django.urls import path
 from django.utils.functional import cached_property
+from django.utils.text import capfirst
 
 from wagtail import hooks
 from wagtail.admin.admin_url_finder import (
@@ -468,7 +469,7 @@ class ModelViewSet(ViewSet):
         subclass of `django_filters.FilterSet <https://django-filter.readthedocs.io/en/stable/ref/filterset.html>`_.
         This will be passed to the ``filterset_class`` attribute of the index view.
         """
-        return self.index_view_class.filterset_class
+        return self.UNDEFINED
 
     @cached_property
     def search_fields(self):
@@ -514,7 +515,7 @@ class ModelViewSet(ViewSet):
 
     @cached_property
     def menu_label(self):
-        return self.model_opts.verbose_name_plural.title()
+        return capfirst(self.model_opts.verbose_name_plural)
 
     @cached_property
     def menu_item_class(self):
@@ -696,7 +697,7 @@ class ModelViewSetGroup(ViewSetGroup):
     def get_app_label_from_subitems(self):
         for instance in self.registerables:
             if app_label := getattr(instance, "app_label", ""):
-                return app_label.title()
+                return capfirst(app_label)
         return ""
 
     @cached_property

wagtail/admin/widgets/chooser.py

@@ -7,6 +7,7 @@ from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.safestring import mark_safe
+from django.utils.text import capfirst
 from django.utils.translation import gettext_lazy as _
 
 from wagtail.admin.admin_url_finder import AdminURLFinder
@@ -250,7 +251,7 @@ class AdminPageChooser(BaseChooser):
             cleaned_target_models = [Page]
 
         if len(cleaned_target_models) == 1 and cleaned_target_models[0] is not Page:
-            model_name = cleaned_target_models[0]._meta.verbose_name.title()
+            model_name = capfirst(cleaned_target_models[0]._meta.verbose_name)
             self.choose_one_text += " (" + model_name + ")"
 
         self.user_perms = user_perms

wagtail/api/v2/tests/test_pages.py

@@ -1822,7 +1822,7 @@ class TestPageDetailWithStreamField(TestCase):
         self.assertEqual(content["body"][0]["value"], "foo")
         self.assertTrue(content["body"][0]["id"])
 
-    def test_image_block(self):
+    def test_image_chooser_block(self):
         stream_page = self.make_stream_page('[{"type": "image", "value": 1}]')
 
         response_url = reverse("wagtailapi_v2:pages:detail", args=(stream_page.id,))
@@ -1833,7 +1833,7 @@ class TestPageDetailWithStreamField(TestCase):
         self.assertEqual(content["body"][0]["type"], "image")
         self.assertEqual(content["body"][0]["value"], 1)
 
-    def test_image_block_with_custom_get_api_representation(self):
+    def test_image_chooser_block_with_custom_get_api_representation(self):
         stream_page = self.make_stream_page('[{"type": "image", "value": 1}]')
 
         response_url = "{}?extended=1".format(
@@ -1848,6 +1848,19 @@ class TestPageDetailWithStreamField(TestCase):
             content["body"][0]["value"], {"id": 1, "title": "A missing image"}
         )
 
+    def test_image_block(self):
+        stream_page = self.make_stream_page(
+            '[{"type": "image_with_alt", "value": {"image": 1, "alt_text": "Some alt text", "decorative": false}}]'
+        )
+
+        response_url = reverse("wagtailapi_v2:pages:detail", args=(stream_page.id,))
+        response = self.client.get(response_url)
+        content = json.loads(response.content.decode("utf-8"))
+
+        self.assertEqual(content["body"][0]["type"], "image_with_alt")
+        self.assertEqual(content["body"][0]["value"]["image"], 1)
+        self.assertEqual(content["body"][0]["value"]["alt_text"], "Some alt text")
+
 
 @override_settings(
     WAGTAILFRONTENDCACHE={

wagtail/blocks/field_block.py

@@ -1,3 +1,4 @@
+import copy
 import datetime
 from decimal import Decimal
 
@@ -817,11 +818,22 @@ class ChooserBlock(FieldBlock):
         """Return the model instances for the given list of primary keys.
 
         The instances must be returned in the same order as the values and keep None values.
+        If the same ID appears multiple times, a distinct object instance is created for each one.
         """
         objects = self.model_class.objects.in_bulk(values)
-        return [
-            objects.get(id) for id in values
-        ]  # Keeps the ordering the same as in values.
+        seen_ids = set()
+        result = []
+
+        for id in values:
+            obj = objects.get(id)
+            if obj is not None and id in seen_ids:
+                # this object is already in the result list, so we need to make a copy
+                obj = copy.copy(obj)
+
+            result.append(obj)
+            seen_ids.add(id)
+
+        return result
 
     def get_prep_value(self, value):
         # the native value (a model instance or None) should serialise to a PK or None

wagtail/blocks/static_block.py

@@ -33,6 +33,9 @@ class StaticBlock(Block):
     def normalize(self, value):
         return None
 
+    def render_basic(self, value, context=None):
+        return ""
+
     class Meta:
         admin_text = None
         default = None

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

@@ -6,13 +6,14 @@
 # Adam Hughes <adamhughes31@gmail.com>, 2017
 # 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: 2014-09-11 15:42+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"
@@ -106,9 +107,22 @@ msgstr "ofynnol"
 msgid "choices"
 msgstr "dewisiadau"
 
+msgid ""
+"Comma or new line separated list of choices. Only applicable in checkboxes, "
+"radio and dropdown."
+msgstr ""
+"Coma neu restr o ddewisiadau wedi'u gwahanu â llinell newydd. Dim ond yn "
+"berthnasol mewn blychau ticio, radio a'r gwymplen."
+
 msgid "default value"
 msgstr "gwerth rhagosodedig"
 
+msgid ""
+"Default value. Comma or new line separated values supported for checkboxes."
+msgstr ""
+"Gwerth diofyn. Cefnogir atalnod neu werthoedd gwahanu llinell newydd ar "
+"gyfer blychau ticio."
+
 msgid "help text"
 msgstr "testun cymorth"
 
@@ -148,6 +162,17 @@ msgstr "Dileu data'r ffurflen%(title)s"
 msgid "Delete form data"
 msgstr "Dileu data'r ffurflen"
 
+msgid "Are you sure you want to delete this form submission?"
+msgid_plural "Are you sure you want to delete these form submissions?"
+msgstr[0] ""
+"Ydych chi'n siŵr eich fod chi am ddileu cyflwyniadau'r ffurflen hon?"
+msgstr[1] ""
+"Ydych chi'n siŵr eich fod chi am ddileu'r cyflwyniadau ffurflen hyn?"
+msgstr[2] ""
+"Ydych chi'n siŵr eich fod chi am ddileu'r cyflwyniadau ffurflen hyn?"
+msgstr[3] ""
+"Ydych chi'n siŵr eich fod chi am ddileu'r cyflwyniadau ffurflen hyn?"
+
 msgid "Delete"
 msgstr "Dileu"
 
@@ -187,3 +212,6 @@ msgstr[0] "Mae un cyflwyniad wedi'u dileu."
 msgstr[1] "Mae %(count)d cyflwyniad wedi'u dileu."
 msgstr[2] "Mae %(count)d cyflwyniad wedi'u dileu."
 msgstr[3] "Mae %(count)d cyflwyniad wedi'u dileu."
+
+msgid "Form data"
+msgstr "Data ffurflen"