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

wagtail/blocks/field_block.py

@@ -13,15 +13,16 @@ from django.utils.safestring import mark_safe
 from django.utils.translation import gettext as _
 
 from wagtail.admin.staticfiles import versioned_static
+from wagtail.admin.telepath import Adapter, register
 from wagtail.compat import URLField
 from wagtail.coreutils import camelcase_to_underscore, resolve_model_string
 from wagtail.rich_text import (
     RichText,
     RichTextMaxLengthValidator,
+    RichTextMinLengthValidator,
     extract_references_from_rich_text,
     get_text_for_indexing,
 )
-from wagtail.telepath import Adapter, register
 
 from .base import Block
 
@@ -120,6 +121,7 @@ class FieldBlockAdapter(Adapter):
             "blockDefId": block.definition_prefix,
             "isPreviewable": block.is_previewable,
             "classname": " ".join(classname),
+            "attrs": block.meta.form_attrs or {},
             "showAddCommentButton": getattr(
                 block.field.widget, "show_add_comment_button", True
             ),
@@ -229,6 +231,7 @@ class FloatBlock(FieldBlock):
     def __init__(
         self,
         required=True,
+        help_text=None,
         max_value=None,
         min_value=None,
         validators=(),
@@ -237,6 +240,7 @@ class FloatBlock(FieldBlock):
     ):
         self.field = forms.FloatField(
             required=required,
+            help_text=help_text,
             max_value=max_value,
             min_value=min_value,
             validators=validators,
@@ -676,6 +680,7 @@ class RichTextBlock(FieldBlock):
         editor="default",
         features=None,
         max_length=None,
+        min_length=None,
         validators=(),
         search_index=True,
         **kwargs,
@@ -684,6 +689,10 @@ class RichTextBlock(FieldBlock):
             validators = list(validators) + [
                 RichTextMaxLengthValidator(max_length),
             ]
+        if min_length is not None:
+            validators = list(validators) + [
+                RichTextMinLengthValidator(min_length),
+            ]
         self.field_options = {
             "required": required,
             "help_text": help_text,
@@ -708,7 +717,7 @@ class RichTextBlock(FieldBlock):
     def normalize(self, value):
         if isinstance(value, RichText):
             return value
-        return RichText(value)
+        return RichText(value and force_str(value))
 
     @cached_property
     def field(self):
@@ -764,7 +773,7 @@ class RawHTMLBlock(FieldBlock):
         super().__init__(**kwargs)
 
     def get_default(self):
-        return self.normalize(self.meta.default or "")
+        return self.normalize(self._evaluate_callable(self.meta.default or ""))
 
     def to_python(self, value):
         return mark_safe(value)

wagtail/blocks/list_block.py

@@ -9,7 +9,7 @@ from django.utils.html import format_html, format_html_join
 from django.utils.translation import gettext as _
 
 from wagtail.admin.staticfiles import versioned_static
-from wagtail.telepath import Adapter, register
+from wagtail.admin.telepath import Adapter, register
 
 from .base import (
     Block,
@@ -456,6 +456,7 @@ class ListBlockAdapter(Adapter):
             "blockDefId": block.definition_prefix,
             "isPreviewable": block.is_previewable,
             "classname": block.meta.form_classname,
+            "attrs": block.meta.form_attrs or {},
             "collapsed": block.meta.collapsed,
             "strings": {
                 "MOVE_UP": _("Move up"),

wagtail/blocks/static_block.py

@@ -4,7 +4,7 @@ from django.utils.safestring import SafeString
 from django.utils.translation import gettext as _
 
 from wagtail.admin.staticfiles import versioned_static
-from wagtail.telepath import Adapter, register
+from wagtail.admin.telepath import Adapter, register
 
 from .base import Block
 
@@ -61,6 +61,7 @@ class StaticBlockAdapter(Adapter):
                 "description": block.get_description(),
                 "blockDefId": block.definition_prefix,
                 "isPreviewable": block.is_previewable,
+                "attrs": block.meta.form_attrs or {},
             },
         ]
 

wagtail/blocks/stream_block.py

@@ -14,7 +14,7 @@ from django.utils.html import format_html_join
 from django.utils.translation import gettext as _
 
 from wagtail.admin.staticfiles import versioned_static
-from wagtail.telepath import Adapter, register
+from wagtail.admin.telepath import Adapter, register
 
 from .base import (
     Block,
@@ -840,6 +840,7 @@ class StreamBlockAdapter(Adapter):
             "blockDefId": block.definition_prefix,
             "isPreviewable": block.is_previewable,
             "classname": block.meta.form_classname,
+            "attrs": block.meta.form_attrs or {},
             "maxNum": block.meta.max_num,
             "minNum": block.meta.min_num,
             "blockCounts": block.meta.block_counts,

wagtail/blocks/struct_block.py

@@ -9,7 +9,7 @@ from django.utils.html import format_html, format_html_join
 from django.utils.safestring import mark_safe
 
 from wagtail.admin.staticfiles import versioned_static
-from wagtail.telepath import Adapter, register
+from wagtail.admin.telepath import Adapter, register
 
 from .base import (
     Block,
@@ -133,12 +133,11 @@ class BaseStructBlock(Block):
         rather than a StructValue; for consistency, we need to convert it to a StructValue
         for StructBlock to work with
         """
+        default = self._evaluate_callable(self.meta.default)
 
         return self.normalize(
             {
-                name: self.meta.default[name]
-                if name in self.meta.default
-                else block.get_default()
+                name: default[name] if name in default else block.get_default()
                 for name, block in self.child_blocks.items()
             }
         )
@@ -378,6 +377,7 @@ class BaseStructBlock(Block):
             ),
             "help_text": getattr(self.meta, "help_text", None),
             "classname": self.meta.form_classname,
+            "collapsed": self.meta.collapsed,
             "block_definition": self,
             "prefix": prefix,
         }
@@ -392,6 +392,7 @@ class BaseStructBlock(Block):
         form_template = None
         value_class = StructValue
         label_format = None
+        collapsed = False
         # No icon specified here, because that depends on the purpose that the
         # block is being used for. Feel encouraged to specify an icon in your
         # descendant block type
@@ -414,6 +415,8 @@ class StructBlockAdapter(Adapter):
             "blockDefId": block.definition_prefix,
             "isPreviewable": block.is_previewable,
             "classname": block.meta.form_classname,
+            "collapsed": block.meta.collapsed,
+            "attrs": block.meta.form_attrs or {},
         }
 
         help_text = getattr(block.meta, "help_text", None)

wagtail/contrib/forms/forms.py

@@ -9,6 +9,17 @@ from wagtail.admin.forms import WagtailAdminPageForm
 from wagtail.compat import URLField
 
 
+def _split_by_newline_or_comma(value):
+    """
+    Split the given string either by new lines, or if no new line is present then
+    by comma.
+    """
+    if len(lines := value.strip().splitlines()) > 1:
+        return [line.strip().rstrip(",").strip() for line in lines]
+    else:
+        return list(map(str.strip, value.split(",")))
+
+
 class BaseForm(django.forms.Form):
     def __init__(self, *args, **kwargs):
         kwargs.setdefault("label_suffix", "")
@@ -103,19 +114,7 @@ class FormBuilder:
         Split the provided choices into a list, separated by new lines.
         If no new lines in the provided choices, split by commas.
         """
-
-        if "\n" in field.choices:
-            choices = (
-                (
-                    x.strip().rstrip(",").strip(),
-                    x.strip().rstrip(",").strip(),
-                )
-                for x in field.choices.split("\r\n")
-            )
-        else:
-            choices = ((x.strip(), x.strip()) for x in field.choices.split(","))
-
-        return choices
+        return [(x, x) for x in _split_by_newline_or_comma(field.choices)]
 
     def get_formatted_field_initial(self, field):
         """
@@ -123,15 +122,7 @@ class FormBuilder:
         Split the supplied default values into a list, separated by new lines.
         If no new lines in the provided default values, split by commas.
         """
-
-        if "\n" in field.default_value:
-            values = [
-                x.strip().rstrip(",").strip() for x in field.default_value.split("\r\n")
-            ]
-        else:
-            values = [x.strip() for x in field.default_value.split(",")]
-
-        return values
+        return _split_by_newline_or_comma(field.default_value)
 
     @property
     def formfields(self):

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

@@ -31,7 +31,22 @@ msgid "Date from"
 msgstr "التاريخ من"
 
 msgid "Date to"
-msgstr "تاريخ لـ"
+msgstr "التاريخ إلى"
+
+#, python-format
+msgid ""
+"The name '%(duplicate_clean_name)s' is already assigned to this field and "
+"cannot be changed. Please enter a different label for the conflicting field."
+msgstr ""
+"الاسم '%(duplicate_clean_name)s' معيّن مسبقًا لهذا الحقل ولا يمكن تغييره. يرجى "
+"إدخال تسمية مختلفة للحقل المتعارض."
+
+#, python-format
+msgid ""
+"Field name '%(duplicate_clean_name)s' conflicts with another field. Please "
+"change the label."
+msgstr ""
+"اسم الحقل '%(duplicate_clean_name)s' يتعارض مع حقل آخر. يرجى تغيير التسمية."
 
 msgid "Single line text"
 msgstr "نص ذو سطر واحد"
@@ -40,52 +55,58 @@ msgid "Multi-line text"
 msgstr "نص متعدد الأسطر"
 
 msgid "Email"
-msgstr "بريد إلكتروني "
+msgstr "بريد إلكتروني"
 
 msgid "Number"
-msgstr "عدد"
+msgstr "رقم"
 
 msgid "URL"
-msgstr "الرابط"
+msgstr "رابط"
 
 msgid "Checkbox"
-msgstr "خانة الاختيار"
+msgstr "خانة اختيار"
 
 msgid "Checkboxes"
-msgstr "خانات الاختيار"
+msgstr "خانات اختيار"
 
 msgid "Drop down"
-msgstr "اسقاط"
+msgstr "قائمة منسدلة"
 
 msgid "Multiple select"
-msgstr "اختيار متعددة"
+msgstr "اختيار متعدد"
 
 msgid "Radio buttons"
-msgstr "أزرار راديو"
+msgstr "أزرار اختيار"
 
 msgid "Date"
 msgstr "تاريخ"
 
 msgid "Date/time"
-msgstr "تاريخ وقت"
+msgstr "تاريخ/وقت"
 
 msgid "Hidden field"
 msgstr "حقل مخفي"
 
 msgid "submit time"
-msgstr "تاريخ النشر"
+msgstr "وقت التقديم"
 
 msgid "form submission"
-msgstr "نشر النموذج"
+msgstr "تقديم النموذج"
+
+msgid "form submissions"
+msgstr "تقديمات النماذج"
 
 msgid "name"
 msgstr "اسم"
 
+msgid "Safe name of the form field, the label converted to ascii_snake_case"
+msgstr "اسم آمن لحقل النموذج، تم تحويل التسمية إلى ascii_snake_case"
+
 msgid "label"
-msgstr "بطاقة"
+msgstr "تسمية"
 
 msgid "The label of the form field"
-msgstr "بظاقة حقل النوع"
+msgstr "تسمية حقل النموذج"
 
 msgid "field type"
 msgstr "نوع الحقل"
@@ -96,11 +117,24 @@ msgstr "مطلوب"
 msgid "choices"
 msgstr "خيارات"
 
+msgid ""
+"Comma or new line separated list of choices. Only applicable in checkboxes, "
+"radio and dropdown."
+msgstr ""
+"قائمة خيارات مفصولة بفواصل أو أسطر جديدة. تنطبق فقط على خانات الاختيار، "
+"أزرار الاختيار والقوائم المنسدلة."
+
 msgid "default value"
-msgstr "القيمة الإفتراضية"
+msgstr "القيمة الافتراضية"
+
+msgid ""
+"Default value. Comma or new line separated values supported for checkboxes."
+msgstr ""
+"القيمة الافتراضية. القيم المفصولة بفواصل أو أسطر جديدة مدعومة لخانات "
+"الاختيار."
 
 msgid "help text"
-msgstr "نص للمساعدة"
+msgstr "نص مساعدة"
 
 msgid "Submission date"
 msgstr "تاريخ التقديم"
@@ -109,7 +143,7 @@ msgid "Form"
 msgstr "نموذج"
 
 msgid "Landing page"
-msgstr "صفحة هبوط"
+msgstr "صفحة الهبوط"
 
 msgid "to address"
 msgstr "إلى العنوان"
@@ -118,8 +152,8 @@ msgid ""
 "Optional - form submissions will be emailed to these addresses. Separate "
 "multiple addresses by comma."
 msgstr ""
-"اختياري - سيتم إرسال رسائل عبر البريد الإلكتروني إلى هذه العناوين. افصل بين "
-"عدة عناوين بفاصلة."
+"اختياري - سيتم إرسال تقديمات النموذج إلى هذه العناوين عبر البريد الإلكتروني. "
+"افصل بين العناوين المتعددة بفاصلة."
 
 msgid "from address"
 msgstr "من العنوان"
@@ -129,30 +163,46 @@ msgstr "موضوع"
 
 #, python-format
 msgid "%(model_name)s submissions"
-msgstr "%(model_name)sالمقدمة "
+msgstr "تقديمات %(model_name)s"
 
 #, python-format
 msgid "Delete form data %(title)s"
-msgstr "حذف من بيانات%(title)s"
+msgstr "حذف بيانات النموذج %(title)s"
 
 msgid "Delete form data"
 msgstr "حذف بيانات النموذج"
 
+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] "هل أنت متأكد أنك تريد حذف هذا التقديم للنموذج؟"
+msgstr[1] "هل أنت متأكد أنك تريد حذف هذين التقديمين للنموذج؟"
+msgstr[2] "هل أنت متأكد أنك تريد حذف هذه التقديمات للنموذج؟"
+msgstr[3] "هل أنت متأكد أنك تريد حذف %d تقديمات للنموذج؟"
+msgstr[4] "هل أنت متأكد أنك تريد حذف %d تقديمًا للنموذج؟"
+msgstr[5] "هل أنت متأكد أنك تريد حذف %d تقديم للنموذج؟"
+
 msgid "Delete"
-msgstr "احذف"
+msgstr "حذف"
 
 msgid "Delete selected submissions"
 msgstr "حذف التقديمات المحددة"
 
 #, python-format
 msgid "There have been no submissions of the '%(title)s' form."
-msgstr "لم تكن هناك أي مساهمات من '%(title)s' النموذج."
+msgstr "لا توجد أي تقديمات لنموذج '%(title)s'."
 
 msgid "Total submissions"
-msgstr "مجموع التقديمات"
+msgstr "إجمالي التقديمات"
 
 msgid "Latest submission"
-msgstr "أحدث التقديم"
+msgstr "أحدث تقديم"
+
+#, python-format
+msgid "Submissions of %(form_title)s"
+msgstr "تقديمات %(form_title)s"
+
+msgid "Page type"
+msgstr "نوع الصفحة"
 
 msgid "Forms"
 msgstr "نماذج"
@@ -161,7 +211,20 @@ msgid "Title"
 msgstr "عنوان"
 
 msgid "Origin"
-msgstr "أصل"
+msgstr "المصدر"
 
 msgid "Pages"
 msgstr "صفحات"
+
+#, python-format
+msgid "One submission has been deleted."
+msgid_plural "%(count)d submissions have been deleted."
+msgstr[0] "تم حذف تقديم واحد."
+msgstr[1] "تم حذف تقديمين."
+msgstr[2] "تم حذف %(count)d تقديمات."
+msgstr[3] "تم حذف %(count)d تقديمًا."
+msgstr[4] "تم حذف %(count)d تقديمًا."
+msgstr[5] "تم حذف %(count)d تقديم."
+
+msgid "Form data"
+msgstr "بيانات النموذج"

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

@@ -16,7 +16,7 @@
 # Moritz Pfeiffer <moritz@alp-phone.ch>, 2016-2018
 # Oliver Engel <codeangel@posteo.de>, 2021
 # Patrick Hebner <hebner.tec@gmail.com>, 2020
-# Stefan Hammer <stefan@hammerworxx.com>, 2022
+# Stefan Hammer <stefan@hammerworxx.com>, 2022,2025
 # Stefan Hammer <stefan@hammerworxx.com>, 2022
 # Tammo van Lessen <tvanlessen@gmail.com>, 2015
 # Stefan Hammer <stefan@hammerworxx.com>, 2022
@@ -26,7 +26,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2014-09-11 15:42+0000\n"
-"Last-Translator: Stefan Hammer <stefan@hammerworxx.com>, 2022\n"
+"Last-Translator: Stefan Hammer <stefan@hammerworxx.com>, 2022,2025\n"
 "Language-Team: German (http://app.transifex.com/torchbox/wagtail/language/"
 "de/)\n"
 "MIME-Version: 1.0\n"
@@ -44,6 +44,23 @@ msgstr "Datum von"
 msgid "Date to"
 msgstr "Datum bis"
 
+#, python-format
+msgid ""
+"The name '%(duplicate_clean_name)s' is already assigned to this field and "
+"cannot be changed. Please enter a different label for the conflicting field."
+msgstr ""
+"Der Name „%(duplicate_clean_name)s“ ist diesem Feld bereits zugewiesen und "
+"kann nicht geändert werden. Geben Sie für das in Konflikt stehende Feld eine "
+"andere Bezeichnung ein."
+
+#, python-format
+msgid ""
+"Field name '%(duplicate_clean_name)s' conflicts with another field. Please "
+"change the label."
+msgstr ""
+"Der Feldname „%(duplicate_clean_name)s“ steht im Konflikt mit einem anderen "
+"Feld. Bitte ändern Sie die Bezeichnung."
+
 msgid "Single line text"
 msgstr "Einzeiliger Text"
 

wagtail/contrib/forms/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-25 23:08+0100\n"
+"POT-Creation-Date: 2025-07-24 16:20+0200\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"
@@ -22,22 +22,22 @@ msgstr ""
 msgid "Wagtail forms"
 msgstr ""
 
-#: forms.py:169
+#: forms.py:160
 msgid "Date from"
 msgstr ""
 
-#: forms.py:173
+#: forms.py:164
 msgid "Date to"
 msgstr ""
 
-#: forms.py:239
+#: forms.py:230
 #, python-format
 msgid ""
 "The name '%(duplicate_clean_name)s' is already assigned to this field and "
 "cannot be changed. Please enter a different label for the conflicting field."
 msgstr ""
 
-#: forms.py:252
+#: forms.py:243
 #, python-format
 msgid ""
 "Field name '%(duplicate_clean_name)s' conflicts with another field. Please "
@@ -155,7 +155,7 @@ msgstr ""
 msgid "help text"
 msgstr ""
 
-#: models.py:195 views.py:194
+#: models.py:195 views.py:198
 msgid "Submission date"
 msgstr ""
 
@@ -231,33 +231,33 @@ msgstr ""
 msgid "Submissions of %(form_title)s"
 msgstr ""
 
-#: views.py:54
+#: views.py:58
 msgid "Page type"
 msgstr ""
 
-#: views.py:81 views.py:311 wagtail_hooks.py:26
+#: views.py:85 views.py:315 wagtail_hooks.py:26
 msgid "Forms"
 msgstr ""
 
-#: views.py:97
+#: views.py:101
 msgid "Title"
 msgstr ""
 
-#: views.py:107
+#: views.py:111
 msgid "Origin"
 msgstr ""
 
-#: views.py:116
+#: views.py:120
 msgid "Pages"
 msgstr ""
 
-#: views.py:146
+#: views.py:150
 #, python-format
 msgid "One submission has been deleted."
 msgid_plural "%(count)d submissions have been deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:213
+#: views.py:217
 msgid "Form data"
 msgstr ""

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

@@ -43,6 +43,14 @@ msgstr "Date depuis le"
 msgid "Date to"
 msgstr "Date jusqu’au"
 
+#, python-format
+msgid ""
+"The name '%(duplicate_clean_name)s' is already assigned to this field and "
+"cannot be changed. Please enter a different label for the conflicting field."
+msgstr ""
+"Le nom '%(duplicate_clean_name)s' est déjà assigné à ce champ et ne peut "
+"être modifié. Veuillez saisir un libellé différent pour le champ en conflit."
+
 #, python-format
 msgid ""
 "Field name '%(duplicate_clean_name)s' conflicts with another field. Please "

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

@@ -4,14 +4,14 @@
 #
 # Translators:
 # Arnar Tumi Þorsteinsson <arnartumi@gmail.com>, 2015-2017
-# saevarom <saevar@saevar.is>, 2017-2018,2020,2022
+# saevarom <saevar@saevar.is>, 2017-2018,2020,2022,2025
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2014-09-11 15:42+0000\n"
-"Last-Translator: saevarom <saevar@saevar.is>, 2017-2018,2020,2022\n"
+"Last-Translator: saevarom <saevar@saevar.is>, 2017-2018,2020,2022,2025\n"
 "Language-Team: Icelandic (Iceland) (http://app.transifex.com/torchbox/"
 "wagtail/language/is_IS/)\n"
 "MIME-Version: 1.0\n"
@@ -29,6 +29,23 @@ msgstr "Dags frá"
 msgid "Date to"
 msgstr "Dags til"
 
+#, python-format
+msgid ""
+"The name '%(duplicate_clean_name)s' is already assigned to this field and "
+"cannot be changed. Please enter a different label for the conflicting field."
+msgstr ""
+"Heitið '%(duplicate_clean_name)s' hefur nú þegar verið sett á þennan reit "
+"áður og ekki hægt að breyta eftir á. Vinsamlegastu veldu annað heiti fyrir "
+"reitinn."
+
+#, python-format
+msgid ""
+"Field name '%(duplicate_clean_name)s' conflicts with another field. Please "
+"change the label."
+msgstr ""
+"Heitið '%(duplicate_clean_name)s' rekst á við annan reit. Vinsamlegast "
+"breyttu heitinu."
+
 msgid "Single line text"
 msgstr "Textastrengur"