wagtail 6.1.2__py3-none-any.whl → 6.2rc1__py3-none-any.whl

wagtail/admin/locale/tr_TR/LC_MESSAGES/django.po

@@ -365,11 +365,11 @@ msgstr "Bu kolleksiyon silinemedi çünkü boş değil ve şunları içeriyor:"
 
 #, python-format
 msgid ""
-"No collections have been created. Why not <a href=\"%(add_collection_url)s"
-"\">add one</a>?"
+"No collections have been created. Why not <a "
+"href=\"%(add_collection_url)s\">add one</a>?"
 msgstr ""
-"Hiç koleksiyon oluşturulmadı. Neden bir adet <a href=\"%(add_collection_url)s"
-"\">eklemiyorsun</a>?"
+"Hiç koleksiyon oluşturulmadı. Neden bir adet <a "
+"href=\"%(add_collection_url)s\">eklemiyorsun</a>?"
 
 msgid "Yes, delete"
 msgstr "Evet, sil"

wagtail/admin/locale/uk/LC_MESSAGES/django.po

@@ -582,11 +582,11 @@ msgstr ""
 
 #, python-format
 msgid ""
-"No collections have been created. Why not <a href=\"%(add_collection_url)s"
-"\">add one</a>?"
+"No collections have been created. Why not <a "
+"href=\"%(add_collection_url)s\">add one</a>?"
 msgstr ""
-"Жодної колекції не створено. Чому б не <a href=\"%(add_collection_url)s"
-"\">створити одну</a>?"
+"Жодної колекції не створено. Чому б не <a "
+"href=\"%(add_collection_url)s\">створити одну</a>?"
 
 #, python-format
 msgid "Sorry, there are no matches for \"<em>%(search_query)s</em>\""
@@ -1237,8 +1237,8 @@ msgid "Choose when this page should go live and/or expire"
 msgstr "Встановіть час автоматичної публікації / чи зняття з публікації"
 
 msgid ""
-"This publishing schedule will only take effect after you select the \"Publish"
-"\" option"
+"This publishing schedule will only take effect after you select the "
+"\"Publish\" option"
 msgstr ""
 "Графік публікації почне працювати лише після того, як ви натиснете кнопку "
 "\"Опублікувати\""
@@ -1532,8 +1532,9 @@ msgstr "Створити"
 #, python-format
 msgid ""
 "Workflows apply to child pages too. If you select a parent page here, its "
-"child pages will also use this workflow. See <a href=\"%(workflow_pages_url)s"
-"\">the list of the pages</a> your workflow applies to."
+"child pages will also use this workflow. See <a "
+"href=\"%(workflow_pages_url)s\">the list of the pages</a> your workflow "
+"applies to."
 msgstr ""
 "Робочі процеси також застосовуються до дочірніх сторінок. Якщо тут вибрати "
 "батьківську сторінку, її дочірні сторінки також використовуватимуть цей "
@@ -1574,8 +1575,8 @@ msgstr "Крок %(step_number)s"
 msgid ""
 "No workflows have been created. Why not <a href=\"%(add_url)s\">add one</a>?"
 msgstr ""
-"Жодного робочого процесу не створено. Чому б не <a href=\"%(add_url)s"
-"\">додати один</a>?"
+"Жодного робочого процесу не створено. Чому б не <a "
+"href=\"%(add_url)s\">додати один</a>?"
 
 #, python-format
 msgid ""

wagtail/admin/locale/zh_Hans/LC_MESSAGES/django.po

@@ -21,6 +21,7 @@
 # Vincent Zhao <zhaopu2008@gmail.com>, 2017-2018
 # yi huang <yi.codeplayer@gmail.com>, 2018
 # Yin Guanhao <sopium@mysterious.site>, 2020-2021
+# Yu Cheng, 2024
 # 祝沙军 <zhushajun@gmail.com>, 2017,2020
 # 汇民 王 <whuim@qq.com>, 2017-2021
 # 祝沙军 <zhushajun@gmail.com>, 2017,2020
@@ -32,7 +33,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-05-02 10:04+0100\n"
 "PO-Revision-Date: 2014-02-21 15:50+0000\n"
-"Last-Translator: 蚂蚁先生 <pzf_karl@hotmail.com>, 2023\n"
+"Last-Translator: Yu Cheng, 2024\n"
 "Language-Team: Chinese (China) (http://app.transifex.com/torchbox/wagtail/"
 "language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -104,6 +105,9 @@ msgstr "集合"
 msgid "Tag"
 msgstr "标签"
 
+msgid "Filter by up to ten most popular tags."
+msgstr "按十个最流行的标签进行过滤。"
+
 msgid "Preferred language"
 msgstr "首选语言"
 
@@ -256,6 +260,18 @@ msgstr "为此页选择一个新的父页面"
 msgid "Parent page"
 msgstr "上一级页面"
 
+#, python-format
+msgid "You do not have permission to create a page under \"%(page_title)s\"."
+msgstr "您无权在“%(page_title)s”下创建页面。"
+
+#, python-format
+msgid ""
+"You cannot create a page of type \"%(page_type)s\" under \"%(page_title)s\"."
+msgstr "您无法在“%(page_title)s”下创建“%(page_type)s”类型页面。"
+
+msgid "Search…"
+msgstr "搜索…"
+
 #, python-format
 msgid "Tag(s) %(value_too_long)s are over %(max_tag_length)d characters"
 msgstr "标签长度 %(value_too_long)s 超过 %(max_tag_length)d 个字符"
@@ -538,15 +554,15 @@ msgstr "转换为内部链接"
 
 #, python-format
 msgid ""
-"The URL you entered, <a target=\"_blank\" rel=\"noreferrer\" href="
-"\"%(submitted_url)s\">%(submitted_url)s</a>, looks like it matches the "
-"internal page %(page)s, which has the URL <a target=\"_blank\" rel="
-"\"noreferrer\" href=\"%(internal_url)s\">%(internal_url)s</a>."
+"The URL you entered, <a target=\"_blank\" rel=\"noreferrer\" "
+"href=\"%(submitted_url)s\">%(submitted_url)s</a>, looks like it matches the "
+"internal page %(page)s, which has the URL <a target=\"_blank\" "
+"rel=\"noreferrer\" href=\"%(internal_url)s\">%(internal_url)s</a>."
 msgstr ""
-"您输入的URL，<a target=\"_blank\" rel=\"noreferrer\" href=\"%(submitted_url)s"
-"\">%(submitted_url)s</a>，看起来与内部页面%(page)s匹配，该页面的URL为<a "
-"target=\"_blank\" rel=\"noreferrer\" href=\"%(internal_url)s\">"
-"%(internal_url)s</a>。"
+"您输入的URL，<a target=\"_blank\" rel=\"noreferrer\" "
+"href=\"%(submitted_url)s\">%(submitted_url)s</a>，看起来与内部页面%(page)s匹"
+"配，该页面的URL为<a target=\"_blank\" rel=\"noreferrer\" "
+"href=\"%(internal_url)s\">%(internal_url)s</a>。"
 
 #, python-format
 msgid ""
@@ -623,8 +639,8 @@ msgstr "集合非空，不能删除，它包含有："
 
 #, python-format
 msgid ""
-"No collections have been created. Why not <a href=\"%(add_collection_url)s"
-"\">add one</a>?"
+"No collections have been created. Why not <a "
+"href=\"%(add_collection_url)s\">add one</a>?"
 msgstr ""
 "没有创建任何集合，为何不<a href=\"%(add_collection_url)s\">创建一个</a>"
 
@@ -667,6 +683,10 @@ msgstr ""
 "您提交审核的%(model_name)s被工作流<strong>%(workflow)s</strong>中的任务"
 "<strong>%(task)s</strong>标记为需要更改。"
 
+#, python-format
+msgid "Would you still like to publish this %(model_name)s?"
+msgstr "您还想发布这个 %(model_name)s 吗？"
+
 msgid "Cancel"
 msgstr "取消"
 
@@ -676,6 +696,10 @@ msgstr "评论"
 msgid "Actions"
 msgstr "动作"
 
+#, python-format
+msgid "There are no %(model_name)s to display."
+msgstr "没有可显示的 %(model_name)s。"
+
 msgid "Update"
 msgstr "更新"
 
@@ -1210,6 +1234,9 @@ msgstr "排序"
 msgid "Enable ordering of child pages"
 msgstr "启用子页面排序"
 
+msgid "Search the whole site"
+msgstr "搜索整个网站"
+
 msgid "Sites menu"
 msgstr "站点菜单"
 
@@ -1284,9 +1311,21 @@ msgstr "没有页面符合此报告的条件。"
 msgid "Updated"
 msgstr "已更新"
 
+msgid "App"
+msgstr "应用"
+
 msgid "Pages"
 msgstr "页面"
 
+msgid "Last edited page"
+msgstr "最后编辑的页面"
+
+msgid "Last edit"
+msgstr "最后编辑"
+
+msgid "No page types found."
+msgstr "未找到页面类型。"
+
 msgid "Locking status"
 msgstr "锁定状态"
 
@@ -1336,12 +1375,18 @@ msgstr "开始于"
 msgid "Incomplete task"
 msgstr "未完成的任务"
 
+msgid "No pages/snippets have been submitted for moderation yet"
+msgstr "尚未提交任何页面/片段进行审核"
+
 msgid "By Workflow"
 msgstr "按工作流"
 
 msgid "Completed at"
 msgstr "完成于"
 
+msgid "Clear"
+msgstr "清除"
+
 #, python-format
 msgid "Page %(page_num)s of %(total_pages)s."
 msgstr "第 %(page_num)s 页，共 %(total_pages)s 页。"
@@ -1370,12 +1415,27 @@ msgstr "应用过滤器"
 msgid "Add comment"
 msgstr "添加评论"
 
+msgid "Show filters"
+msgstr "显示过滤器"
+
+msgid "Filter by"
+msgstr "过滤"
+
 msgid "Back"
 msgstr "返回"
 
 msgid "History"
 msgstr "历史"
 
+msgid "Keyboard shortcuts"
+msgstr "键盘快捷键"
+
+msgid "All keyboard shortcuts"
+msgstr "所有键盘快捷键"
+
+msgid "Keyboard shortcut"
+msgstr "快捷键"
+
 msgid "Current page status:"
 msgstr "当前页面状态："
 
@@ -1413,6 +1473,9 @@ msgstr "否，不取消发布计划"
 msgid "Other searches"
 msgstr "其它搜索"
 
+msgid "Minimap"
+msgstr "小地图"
+
 msgid "Side panels"
 msgstr "边栏"
 
@@ -1449,6 +1512,9 @@ msgstr "页面可见性: "
 msgid "Once live anyone can view"
 msgstr "一旦发布，任何人可看"
 
+msgid "Not visible to the public"
+msgstr "对外不可见"
+
 msgid "Privacy changes apply to all children of this page too."
 msgstr "私有设置也会应用到此页面的所有子页面。"
 
@@ -1592,8 +1658,9 @@ msgstr "创建"
 #, python-format
 msgid ""
 "Workflows apply to child pages too. If you select a parent page here, its "
-"child pages will also use this workflow. See <a href=\"%(workflow_pages_url)s"
-"\">the list of the pages</a> your workflow applies to."
+"child pages will also use this workflow. See <a "
+"href=\"%(workflow_pages_url)s\">the list of the pages</a> your workflow "
+"applies to."
 msgstr ""
 "工作流也应用于子页面。如果在此处选择父页面，则其子页面也将使用此工作流。请参"
 "见您的工作流应用的<a href=\"%(workflow_pages_url)s\">页面列表</a>。"
@@ -1864,6 +1931,10 @@ msgstr "检查"
 msgid "Delete '%(title)s'"
 msgstr "删除“%(title)s”"
 
+#, python-format
+msgid "More options for '%(title)s'"
+msgstr "“%(title)s”的更多选项"
+
 msgid "Editing"
 msgstr "正在编辑"
 

wagtail/admin/locale/zh_Hant/LC_MESSAGES/django.po

@@ -509,8 +509,8 @@ msgstr "集合非空，不能刪除，它包含有："
 
 #, python-format
 msgid ""
-"No collections have been created. Why not <a href=\"%(add_collection_url)s"
-"\">add one</a>?"
+"No collections have been created. Why not <a "
+"href=\"%(add_collection_url)s\">add one</a>?"
 msgstr ""
 "沒有創建任何集合，為何不<a href=\"%(add_collection_url)s\">創建一個</a>"
 

wagtail/admin/menu.py

@@ -228,7 +228,7 @@ class WagtailMenuRegisterable:
             url=self.menu_url,
             name=self.menu_name,
             icon_name=self.menu_icon,
-            order=order or self.menu_order,
+            order=order if order is not None else self.menu_order,
         )
 
     @cached_property
@@ -286,7 +286,7 @@ class WagtailMenuRegisterableGroup(WagtailMenuRegisterable):
             menu=Menu(items=self.get_submenu_items()),
             name=self.menu_name,
             icon_name=self.menu_icon,
-            order=order or self.menu_order,
+            order=order if order is not None else self.menu_order,
         )
 
 

wagtail/admin/migrations/0004_editingsession.py

@@ -0,0 +1,57 @@
+# Generated by Django 5.1a1 on 2024-07-01 16:13
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("contenttypes", "0002_remove_content_type_name"),
+        ("wagtailadmin", "0003_admin_managed"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="EditingSession",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("object_id", models.CharField(max_length=255)),
+                ("last_seen_at", models.DateTimeField()),
+                (
+                    "content_type",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="+",
+                        to="contenttypes.contenttype",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="editing_sessions",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "indexes": [
+                    models.Index(
+                        fields=["content_type", "object_id"],
+                        name="wagtailadmi_content_717955_idx",
+                    )
+                ],
+            },
+        ),
+    ]

wagtail/admin/migrations/0005_editingsession_is_editing.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1a1 on 2024-07-03 19:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("wagtailadmin", "0004_editingsession"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="editingsession",
+            name="is_editing",
+            field=models.BooleanField(default=False),
+        ),
+    ]

wagtail/admin/models.py

@@ -1,5 +1,10 @@
+from django.contrib.auth import get_user_model
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import Count, Model
+from django.db import models
+from django.db.models import Count
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
 from modelcluster.fields import ParentalKey
 from taggit.models import Tag
 
@@ -14,11 +19,11 @@ from wagtail.models import Page
 # A dummy model that exists purely to attach the access_admin permission type to, so that it
 # doesn't get identified as a stale content type and removed by the remove_stale_contenttypes
 # management command.
-class Admin(Model):
+class Admin(models.Model):
     class Meta:
         default_permissions = []  # don't create the default add / change / delete / view perms
         permissions = [
-            ("access_admin", "Can access Wagtail admin"),
+            ("access_admin", _("Can access Wagtail admin")),
         ]
 
 
@@ -67,3 +72,31 @@ def popular_tags_for_model(model, count=10):
         .annotate(item_count=Count("taggit_taggeditem_items"))
         .order_by("-item_count")[:count]
     )
+
+
+class EditingSession(models.Model):
+    user = models.ForeignKey(
+        get_user_model(),
+        on_delete=models.CASCADE,
+        related_name="editing_sessions",
+    )
+    content_type = models.ForeignKey(
+        ContentType, on_delete=models.CASCADE, related_name="+"
+    )
+    object_id = models.CharField(max_length=255)
+    content_object = GenericForeignKey(
+        "content_type", "object_id", for_concrete_model=False
+    )
+    last_seen_at = models.DateTimeField()
+    is_editing = models.BooleanField(default=False)
+
+    @staticmethod
+    def cleanup():
+        EditingSession.objects.filter(
+            last_seen_at__lt=timezone.now() - timezone.timedelta(hours=1)
+        ).delete()
+
+    class Meta:
+        indexes = [
+            models.Index(fields=["content_type", "object_id"]),
+        ]

wagtail/admin/rich_text/editors/draftail/__init__.py

@@ -1,10 +1,9 @@
 import json
 import warnings
 
+from django.core.serializers.json import DjangoJSONEncoder
 from django.forms import Media, widgets
-from django.urls import reverse_lazy
 from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy
 
 from wagtail.admin.rich_text.converters.contentstate import ContentstateConverter
 from wagtail.admin.staticfiles import versioned_static
@@ -13,23 +12,6 @@ from wagtail.telepath import register
 from wagtail.widget_adapters import WidgetAdapter
 
 
-class LazyStringEncoder(json.JSONEncoder):
-    """
-    Add support for lazy strings to the JSON encoder so that URLs and
-    translations can be resolved when rendering the widget only.
-    """
-
-    # The string "Edit" here is arbitrary, chosen because it exists elsewhere in the
-    # translations dictionary and is likely to remain in the future.
-    lazy_string_types = [type(reverse_lazy("Edit")), type(gettext_lazy("Edit"))]
-
-    def default(self, obj):
-        if type(obj) in self.lazy_string_types:
-            return str(obj)
-
-        return json.JSONEncoder.default(self, obj)
-
-
 class DraftailRichTextArea(widgets.HiddenInput):
     template_name = "wagtailadmin/widgets/draftail_rich_text_area.html"
     is_hidden = False
@@ -90,7 +72,7 @@ class DraftailRichTextArea(widgets.HiddenInput):
         context = super().get_context(name, value, attrs)
         context["widget"]["attrs"]["data-w-init-detail-value"] = json.dumps(
             self.options,
-            cls=LazyStringEncoder,
+            cls=DjangoJSONEncoder,
         )
         return context