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

wagtail/admin/templates/wagtailadmin/home/locked_pages.html

@@ -1,34 +1,46 @@
 {% load i18n wagtailadmin_tags %}
 {% load wagtailcore_tags %}
 {% if locked_pages %}
-    {% panel id="locked-pages" heading=_("Your locked pages") %}
-        <table class="listing listing-page">
+    {% panel id="locked-pages" heading=_("Your locked pages") classname="w-panel--dashboard" %}
+        <table class="listing listing--dashboard listing-page">
             <col />
-            <col width="30%"/>
-            <col width="15%"/>
-
-            <thead>
+            <col width="10%"/>
+            <col width="7%"/>
+            <col width="25%"/>
+            <col width="10%"/>
+            <col width="10%"/>
+            <thead class="w-sr-only">
                 <tr>
                     <th class="title">{% trans "Title" %}</th>
-                    <th aria-hidden="true">{% comment %} added for visual alignment only {% endcomment %}</th>
+                    <th>{% trans "Language" %}</th>
+                    <th>{% trans "Privacy and access" %}</th>
+                    <th>{% trans "Status" %}</th>
                     <th>{% trans "Locked at" %}</th>
+                    <th aria-hidden="true">{% comment %} added for visual alignment only {% endcomment %}</th>
                 </tr>
             </thead>
             <tbody>
                 {% for page in locked_pages %}
                     <tr>
-                        <td class="title" valign="top">
+                        <td class="title">
                             <div class="title-wrapper">
                                 <a href="{% url 'wagtailadmin_pages:edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.get_admin_display_title }}</a>
-
-                                {% i18n_enabled as show_locale_labels %}
-                                {% if show_locale_labels and page.locale_id %}
-                                    {% locale_label_from_id page.locale_id as locale_label %}
-                                    {% status locale_label classname="w-status--label" %}
-                                {% endif %}
-                                {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
-                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
                             </div>
+                        </td>
+                        <td>
+                            {% i18n_enabled as show_locale_labels %}
+                            {% if show_locale_labels and page.locale_id %}
+                                {% locale_label_from_id page.locale_id as locale_label %}
+                                {% status locale_label classname="w-status--label" %}
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
+                            {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
+                        </td>
+                        <td>{% include "wagtailadmin/shared/page_status_tag.html" with page=page %}</td>
+                        <td>{% human_readable_date page.locked_at %}</td>
+                        <td class="actions-container">
                             <ul class="actions">
                                 <li>
                                     {% dropdown toggle_icon="dots-horizontal" toggle_aria_label=_("Actions") %}
@@ -56,8 +68,6 @@
                                 </li>
                             </ul>
                         </td>
-                        <td>{# Deliberately empty #}</td>
-                        <td valign="top">{% human_readable_date page.locked_at %}</td>
                     </tr>
                 {% endfor %}
             </tbody>

wagtail/admin/templates/wagtailadmin/home/recent_edits.html

@@ -2,33 +2,48 @@
 {% load wagtailcore_tags %}
 {% load i18n wagtailadmin_tags %}
 {% if last_edits %}
-    {% panel id="recent-edits" heading=_("Your most recent edits") %}
-        <table class="listing listing-page">
+    {% panel id="recent-edits" heading=_("Your most recent edits")  classname="w-panel--dashboard" %}
+        <table class="listing listing--dashboard listing-page">
             <col />
-            <col width="30%"/>
-            <col width="15%"/>
+            <col width="10%"/>
+            <col width="7%"/>
+            <col width="25%"/>
+            <col width="10%"/>
+            <col width="10%"/>
             <thead class="w-sr-only">
                 <tr>
                     <th class="title">{% trans "Title" %}</th>
+                    <th>{% trans "Language" %}</th>
+                    <th>{% trans "Privacy and access" %}</th>
                     <th>{% trans "Status" %}</th>
                     <th>{% trans "Date" %}</th>
+                    <th aria-hidden="true">{% comment %} added for visual alignment only {% endcomment %}</th>
                 </tr>
             </thead>
             <tbody>
                 {% for last_edited_at, page in last_edits %}
                     <tr>
-                        <td class="title" valign="top">
+                        <td class="title">
                             <div class="title-wrapper">
                                 <a href="{% url 'wagtailadmin_pages:edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.get_admin_display_title }}</a>
-
-                                {% i18n_enabled as show_locale_labels %}
-                                {% if show_locale_labels and page.locale_id %}
-                                    {% locale_label_from_id page.locale_id as locale_label %}
-                                    {% status locale_label classname="w-status--label" %}
-                                {% endif %}
-                                {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
-                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
                             </div>
+                        </td>
+                        <td>
+                            {% i18n_enabled as show_locale_labels %}
+                            {% if show_locale_labels and page.locale_id %}
+                                {% locale_label_from_id page.locale_id as locale_label %}
+                                {% status locale_label classname="w-status--label" %}
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
+                            {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
+                        </td>
+                        <td>
+                            {% include "wagtailadmin/shared/page_status_tag.html" with page=page %}
+                        </td>
+                        <td>{% human_readable_date last_edited_at %}</td>
+                        <td class="actions-container">
                             <ul class="actions">
                                 <li>
                                     {% dropdown toggle_icon="dots-horizontal" toggle_aria_label=_("Actions") %}
@@ -46,10 +61,6 @@
                                 </li>
                             </ul>
                         </td>
-                        <td valign="top">
-                            {% include "wagtailadmin/shared/page_status_tag.html" with page=page %}
-                        </td>
-                        <td valign="top">{% human_readable_date last_edited_at %}</td>
                     </tr>
                 {% endfor %}
             </tbody>

wagtail/admin/templates/wagtailadmin/home/site_summary_pages.html

@@ -4,9 +4,9 @@
     {% icon name="doc-empty" %}
     <a href="{% url 'wagtailadmin_explore' root_page.pk %}">
         {% blocktrans trimmed count counter=total_pages with total_pages|intcomma as total %}
-            <span>{{ total }}</span> Page <span class="w-sr-only">created in {{ site_name }}</span>
+            {{ total }} Page <span class="w-sr-only">created in {{ site_name }}</span>
         {% plural %}
-            <span>{{ total }}</span> Pages <span class="w-sr-only">created in {{ site_name }}</span>
+            {{ total }} Pages <span class="w-sr-only">created in {{ site_name }}</span>
         {% endblocktrans %}
     </a>
 </li>

wagtail/admin/templates/wagtailadmin/home/upgrade_notification.html

@@ -1,17 +1,39 @@
 {% load i18n wagtailcore_tags wagtailadmin_tags %}
 {% wagtail_version as current_version %}
-<div
-    class="w-panel-upgrade panel w-hidden"
-    data-controller="w-upgrade"
-    data-w-upgrade-current-version-value="{{ current_version }}"
-    {% if lts_only %}data-w-upgrade-lts-only-value="true"{% endif %}
-    data-w-upgrade-hidden-class="w-hidden"
->
-    <div class="help-block help-warning">
-        {% icon name='warning' %}
-        {% blocktrans trimmed %}
-            Wagtail upgrade available. Your version: <strong>{{ current_version }}</strong>. New version: <strong data-w-upgrade-target="latestVersion"></strong>.
-        {% endblocktrans %}
-        <a href="" data-w-upgrade-target="link">{% trans "Read the release notes." %}</a>
+<div class="w-panel-upgrade w-flex w-mb-[-2rem] sm:w-mb-0 w-gap-5 w-items-center w-pl-slim-header w-pr-5 sm:w-px-[3.5rem] w-py-5 w-text-text-context w-bg-surface-info-panel w-border-b w-border-transparent"
+     data-controller="w-upgrade w-dismissible"
+     data-w-upgrade-current-version-value="{{ current_version }}"
+     {% if lts_only %}data-w-upgrade-lts-only-value="true"{% endif %}
+     data-w-dismissible-id-value="{{ dismissible_id }}"
+     data-w-dismissible-dismissed-class="w-hidden"
+     hidden>
+    {% icon name='info-circle' classname='w-w-5 w-h-5 w-shrink-0 w-text-text-link-info w-ml-5 sm:w-ml-0' %}
+    <div>
+        <p class="w-mb-1"><strong>{% trans "Wagtail upgrade available" %}</strong></p>
+        <p class="w-mb-0">
+            {% blocktrans trimmed %}
+                Your version: <strong>{{ current_version }}</strong>. New version: <strong data-w-upgrade-target="latestVersion"></strong>.
+            {% endblocktrans %}
+            <a href=""
+               data-w-upgrade-target="link"
+               class="w-text-text-link-info hover:w-text-text-link-info w-underline w-underline-offset-[3px]">{% trans "Read the release notes." %}</a>
+        </p>
     </div>
+
+    <button
+        type="button"
+        data-action="w-dismissible#toggle"
+        {% if dismissible_value %}data-w-dismissible-value-param="{{ dismissible_value }}"{% endif %}
+        data-w-upgrade-target="dismiss"
+        class="w-ml-auto w-flex w-items-center w-justify-center w-bg-transparent w-rounded-full w-p-0 w-w-8 w-h-8
+               w-text-current
+               w-border
+               w-border-transparent
+               hover:w-text-text-link-hover
+               more-contrast:w-border-border-interactive-more-contrast
+               hover:more-contrast:w-border-border-interactive-more-contrast-hover
+              "
+    >
+        {% icon name="cross" classname="w-w-4 w-h-4" %}
+    </button>
 </div>

wagtail/admin/templates/wagtailadmin/home/user_objects_in_workflow_moderation.html

@@ -2,16 +2,22 @@
 
 {% load i18n wagtailadmin_tags %}
 {% if workflow_states %}
-    {% panel id="objects-in-workflow" heading=_("Your pages and snippets in a workflow") %}
-        <table class="listing">
+    {% panel id="objects-in-workflow" heading=_("Your pages and snippets in a workflow") classname="w-panel--dashboard" %}
+        <table class="listing listing--dashboard">
             <col />
-            <col width="30%"/>
-            <col width="15%"/>
+            <col width="10%"/>
+            <col width="7%"/>
+            <col width="25%"/>
+            <col width="10%"/>
+            <col width="10%"/>
             <thead class="w-sr-only">
                 <tr>
                     <th class="title">{% trans "Title" %}</th>
+                    <th>{% trans "Language" %}</th>
+                    <th>{% trans "Privacy and access" %}</th>
                     <th>{% trans "Task" %}</th>
                     <th>{% trans "Task started" %}</th>
+                    <th aria-hidden="true">{% comment %} added for visual alignment only {% endcomment %}</th>
                 </tr>
             </thead>
             <tbody>
@@ -22,7 +28,7 @@
                             {% page_permissions obj as page_perms %}
                         {% endif %}
                         <tr>
-                            <td class="title" valign="top">
+                            <td class="title">
                                 <div class="title-wrapper">
                                     {% admin_edit_url obj as edit_url %}
                                     {% if page_perms.can_edit or not is_page and edit_url %}
@@ -30,28 +36,32 @@
                                     {% else %}
                                         {% latest_str obj %}
                                     {% endif %}
-
-                                    {% i18n_enabled as show_locale_labels %}
-                                    {% if show_locale_labels and obj.locale_id %}
-                                        {% locale_label_from_id obj.locale_id as locale_label %}
-                                        {% status locale_label classname="w-status--label" %}
-                                    {% endif %}
-                                    {% if is_page %}
-                                        {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=obj %}
-                                    {% endif %}
-                                    {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=obj %}
                                 </div>
                             </td>
-                            <td class="task" valign="top">
+                            <td>
+                                {% i18n_enabled as show_locale_labels %}
+                                {% if show_locale_labels and obj.locale_id %}
+                                    {% locale_label_from_id obj.locale_id as locale_label %}
+                                    {% status locale_label classname="w-status--label" %}
+                                {% endif %}
+                            </td>
+                            <td>
+                                {% if is_page %}
+                                    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=obj %}
+                                {% endif %}
+                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=obj %}
+                            </td>
+                            <td class="task">
                                 {% if workflow_state.current_task_state.status == 'rejected' %}
-                                    {% icon name="warning" classname="default" %}
+                                    {% icon name="warning" classname="w-h-4 w-w-4 w-align-text-top" %}
                                     {% trans "Changes requested at" %}
                                 {% elif workflow_state.current_task_state.status == 'in_progress' %}
                                     {% trans "Awaiting" %}
                                 {% endif %}
                                 {{ workflow_state.current_task_state.task.name }}
                             </td>
-                            <td valign="top">{% human_readable_date workflow_state.current_task_state.started_at %}</td>
+                            <td>{% human_readable_date workflow_state.current_task_state.started_at %}</td>
+                            <td>{# Deliberately empty #}</td>
                         </tr>
                     {% endwith %}
                 {% endfor %}

wagtail/admin/templates/wagtailadmin/home/workflow_objects_to_moderate.html

@@ -1,17 +1,23 @@
 {% load i18n wagtailadmin_tags %}
 {% if states %}
-    {% panel id="awaiting-review" heading=_("Awaiting your review") %}
-        <table class="listing">
+    {% panel id="awaiting-review" heading=_("Awaiting your review") classname="w-panel--dashboard" %}
+        <table class="listing listing--dashboard">
             <col />
+            <col width="10%"/>
+            <col width="7%"/>
+            <col width="10%"/>
             <col width="15%"/>
-            <col width="15%"/>
-            <col width="15%"/>
+            <col width="10%"/>
+            <col width="10%"/>
             <thead class="w-sr-only">
                 <tr>
                     <th class="title">{% trans "Title" %}</th>
+                    <th>{% trans "Language" %}</th>
+                    <th>{% trans "Privacy and access" %}</th>
                     <th>{% trans "Tasks" %}</th>
                     <th>{% trans "Task submitted by" %}</th>
                     <th>{% trans "Task started" %}</th>
+                    <th aria-hidden="true">{% comment %} added for visual alignment only {% endcomment %}</th>
                 </tr>
             </thead>
             <tbody>
@@ -22,7 +28,7 @@
                             {% page_permissions obj as page_perms %}
                         {% endif %}
                         <tr>
-                            <td class="title" valign="top">
+                            <td class="title">
                                 <div class="title-wrapper">
                                     {% admin_edit_url obj as edit_url %}
                                     {% if page_perms.can_edit or not is_page and edit_url %}
@@ -30,17 +36,39 @@
                                     {% else %}
                                         {% latest_str obj %}
                                     {% endif %}
-
-                                    {% i18n_enabled as show_locale_labels %}
-                                    {% if show_locale_labels and obj.locale_id %}
-                                        {% locale_label_from_id obj.locale_id as locale_label %}
-                                        {% status locale_label classname="w-status--label" %}
-                                    {% endif %}
-                                    {% if is_page %}
-                                        {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=obj %}
-                                    {% endif %}
-                                    {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=obj %}
                                 </div>
+                            </td>
+                            <td>
+                                {% i18n_enabled as show_locale_labels %}
+                                {% if show_locale_labels and obj.locale_id %}
+                                    {% locale_label_from_id obj.locale_id as locale_label %}
+                                    {% status locale_label classname="w-status--label" %}
+                                {% endif %}
+                            </td>
+                            <td>
+                                {% if is_page %}
+                                    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=obj %}
+                                {% endif %}
+                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=obj %}
+                            </td>
+                            <td class="tasks">
+                                {% for task in workflow_tasks %}
+                                    <span data-controller="w-tooltip" data-w-tooltip-content-value="{{ task.name }}: {{ task.status_display }}">
+                                        {% if task.status == 'approved' %}
+                                            {% icon "success" title=task.status_display classname="default" %}
+                                        {% elif task.status == 'rejected' %}
+                                            {% icon "error" title=task.status_display classname="default" %}
+                                        {% else %}
+                                            {% icon "radio-empty" title=status_display classname="default" %}
+                                        {% endif %}
+                                    </span>
+                                {% endfor %}
+                            </td>
+                            <td>
+                                {% if revision.user %}{{ revision.user|user_display_name }}{% endif %}
+                            </td>
+                            <td>{% human_readable_date task_state.started_at %}</td>
+                            <td class="actions-container">
                                 {% if actions %}
                                     <ul class="actions">
                                         <li>
@@ -65,23 +93,6 @@
                                     </ul>
                                 {% endif %}
                             </td>
-                            <td class="tasks" valign="top">
-                                {% for task in workflow_tasks %}
-                                    <span data-controller="w-tooltip" data-w-tooltip-content-value="{{ task.name }}: {{ task.status_display }}">
-                                        {% if task.status == 'approved' %}
-                                            {% icon "success" title=task.status_display classname="default" %}
-                                        {% elif task.status == 'rejected' %}
-                                            {% icon "error" title=task.status_display classname="default" %}
-                                        {% else %}
-                                            {% icon "radio-empty" title=status_display classname="default" %}
-                                        {% endif %}
-                                    </span>
-                                {% endfor %}
-                            </td>
-                            <td valign="top">
-                                {% if revision.user %}{{ revision.user|user_display_name }}{% endif %}
-                            </td>
-                            <td valign="top">{% human_readable_date task_state.started_at %}</td>
                         </tr>
                     {% endwith %}
                 {% endfor %}

wagtail/admin/templates/wagtailadmin/home.html

@@ -1,6 +1,5 @@
 {% extends "wagtailadmin/generic/base.html" %}
 {% load wagtailadmin_tags i18n %}
-{% block bodyclass %}homepage{% endblock %}
 
 {% block extra_css %}
     {{ block.super }}
@@ -9,14 +8,32 @@
 
 {% block content %}
     {% fragment as header_title %}
-        {% block branding_welcome %}{% blocktrans trimmed %}Welcome to the {{ site_name }} Wagtail CMS{% endblocktrans %}{% endblock %}
+        {% block branding_welcome %}{{ site_name|title }}{% endblock %}
     {% endfragment %}
 
+    {% component upgrade_notification %}
+    <div class="w-dashboard w-px-6 sm:w-px-[3.75rem] w-mt-16 sm:w-mt-10 lg:w-mt-[3.75rem]">
+        <header class="w-flex w-flex-col lg:w-flex-row">
+            <div class="lg:w-pr-20 lg:w-grow">
+                <h1 class="w-h1 w-mt-0">{{ header_title }}</h1>
+                {% component site_summary %}
 
-    <div class="nice-padding w-mt-14">
-        {% avatar_url user 70 as avatar %}
-        {% include "wagtailadmin/shared/header.html" with title=header_title description=user|user_display_name avatar=avatar merged=1 %}
+                <form
+                    class="w-mb-12"
+                    action="{% if root_page.pk %}{% url 'wagtailadmin_explore' root_page.pk %}{% else %}{% url 'wagtailadmin_explore_root' %}{% endif %}"
+                    method="get"
+                    novalidate
+                    role="search"
+                >
+                    {% for field in search_form %}
+                        {% formattedfield field=field sr_only_label=True icon="search" %}
+                    {% endfor %}
+                    <div class="submit w-sr-only"><input type="submit" value="Search" class="button" /></div>
+                </form>
 
+            </div>
+            {% include "wagtailadmin/home/account_summary.html" %}
+        </header>
         {% if panels %}
             {% for panel in panels %}
                 {% component panel fallback_render_method=True %}

wagtail/admin/templates/wagtailadmin/pages/_editor_js.html

@@ -7,6 +7,5 @@
 <script src="{% versioned_static 'wagtailadmin/js/comments.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/vendor/rangy-core.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/expanding-formset.js' %}"></script>
-<script src="{% versioned_static 'wagtailadmin/js/preview-panel.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/privacy-switch.js' %}"></script>
 {% hook_output 'insert_editor_js' %}

wagtail/admin/templates/wagtailadmin/pages/action_menu/menu.html

@@ -1,11 +1 @@
-{% load wagtailadmin_tags %}
-
-{% if show_menu %}
-    {% dropdown_button button=default_menu_item toggle_icon="arrow-up" keep_mounted=True %}
-        {% for item in rendered_menu_items %}
-            {{ item }}
-        {% endfor %}
-    {% enddropdown_button %}
-{% elif default_menu_item %}
-    {{ default_menu_item }}
-{% endif %}
+{% extends "wagtailadmin/shared/action_menu/menu.html" %}

wagtail/admin/templates/wagtailadmin/pages/action_menu/menu_item.html

@@ -1,6 +1 @@
-{% load wagtailadmin_tags %}
-{% if url %}
-    <a class="button{% if classname %} {{ classname }}{% endif %}" href="{{ url }}">{% if icon_name %}{% icon name=icon_name %}{% endif %}{{ label }}</a>
-{% else %}
-    <button type="submit" name="{{ name }}" value="{{ label }}" class="button{% if classname %} {{ classname }}{% endif %}">{% if icon_name %}{% icon name=icon_name %}{% endif %}{{ label }}</button>
-{% endif %}
+{% extends "wagtailadmin/shared/action_menu/menu_item.html" %}

wagtail/admin/templates/wagtailadmin/pages/action_menu/page_locked.html

@@ -1,5 +1,5 @@
 {% load i18n wagtailadmin_tags %}
-<button type="submit" class="button action-save {% if is_revision %}warning{% endif %}" disabled>
+<button type="submit" class="button action-save" disabled>
     {% if icon_name %}{% icon name=icon_name %}{% endif %}
     {% trans 'Page locked' %}
 </button>

wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html

@@ -3,7 +3,7 @@
     type="submit"
     name="action-publish"
     value="action-publish"
-    class="button button-longrunning {% if is_revision %}warning{% endif %}"
+    class="button button-longrunning"
     data-controller="w-progress"
     data-action="w-progress#activate"
     data-w-progress-active-value="{% trans 'Publishing…' %}"

wagtail/admin/templates/wagtailadmin/pages/action_menu/save_draft.html

@@ -1,7 +1,7 @@
 {% load i18n wagtailadmin_tags %}
 <button
     type="submit"
-    class="button action-save button-longrunning {% if is_revision %}warning{% endif %}"
+    class="button action-save button-longrunning"
     data-controller="w-progress w-kbd"
     data-action="w-progress#activate"
     data-w-kbd-key-value="mod+s"

wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_delete.html

@@ -1,7 +1,11 @@
 {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %}
 {% load i18n wagtailadmin_tags %}
 
-{% block titletag %}{% blocktrans trimmed count counter=items|length %}Delete 1 page {% plural %}Delete {{ counter }} pages{% endblocktrans %}{% endblock %}
+{% block titletag %}
+    {% with counter_val=items|length %}
+        {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}Delete 1 page {% plural %}Delete {{ counter }} pages{% endblocktrans %}
+    {% endwith %}
+{% endblock %}
 
 {% block header %}
     {% include "wagtailadmin/shared/header.html" with title=_("Delete") icon="doc-empty-inverse" %}
@@ -16,11 +20,13 @@
                     <a href="{% url 'wagtailadmin_pages:edit' page.item.id %}" target="_blank" rel="noreferrer">{{ page.item.get_admin_display_title }}</a>
                     {% if page.descendant_count %}
                         <p>
-                            {% blocktrans trimmed count counter=page.descendant_count %}
-                                This will also delete one more subpage.
-                            {% plural %}
-                                This will also delete {{ counter }} more subpages.
-                            {% endblocktrans %}
+                            {% with counter_val=page.descendant_count %}
+                                {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}
+                                    This will also delete one more subpage.
+                                {% plural %}
+                                    This will also delete {{ counter }} more subpages.
+                                {% endblocktrans %}
+                            {% endwith %}
                         </p>
                     {% endif %}
                 </li>

wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_move.html

@@ -1,7 +1,10 @@
 {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %}
-{% load i18n %}
+{% load i18n wagtailadmin_tags %}
 
-{% block titletag %}{% blocktrans trimmed count counter=items|length %}Move 1 page{% plural %}Move {{ counter }} pages{% endblocktrans %}
+{% block titletag %}
+    {% with counter_val=items|length %}
+        {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}Move 1 page{% plural %}Move {{ counter }} pages{% endblocktrans %}
+    {% endwith %}
 {% endblock %}
 
 {% block header %}
@@ -17,11 +20,13 @@
                     <a href="{% url 'wagtailadmin_pages:edit' page.item.id %}" target="_blank" rel="noreferrer">{{ page.item.get_admin_display_title }}</a>
                     {% if not page.item.is_leaf %}
                         <p>
-                            {% blocktrans trimmed count counter=page.child_pages %}
-                                This page has one child page
-                            {% plural %}
-                                This page has {{ counter }} child pages
-                            {% endblocktrans %}
+                            {% with counter_val=page.child_pages %}
+                                {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}
+                                    This page has one child page
+                                {% plural %}
+                                    This page has {{ counter }} child pages
+                                {% endblocktrans %}
+                            {% endwith %}
                         </p>
                     {% endif %}
                 </li>

wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html

@@ -1,7 +1,11 @@
 {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %}
-{% load i18n %}
+{% load i18n wagtailadmin_tags %}
 
-{% block titletag %}{% blocktrans trimmed count counter=items|length %}Publish 1 page {% plural %}Publish {{ counter }} pages{% endblocktrans %}{% endblock %}
+{% block titletag %}
+    {% with counter_val=items|length %}
+        {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}Publish 1 page {% plural %}Publish {{ counter }} pages{% endblocktrans %}
+    {% endwith %}
+{% endblock %}
 
 {% block header %}
     {% include "wagtailadmin/shared/header.html" with title=_("Publish") icon="doc-empty-inverse" %}
@@ -14,15 +18,17 @@
             {% for page in items %}
                 <li>
                     <a href="{% url 'wagtailadmin_pages:edit' page.item.id %}" target="_blank" rel="noreferrer">{{ page.item.get_admin_display_title }}</a>
-                    {% if page.draft_descendant_count %}
-                        <p>
-                            {% blocktrans trimmed count counter=page.draft_descendant_count %}
-                                This page has one unpublished subpage
-                            {% plural %}
-                                This page has {{ counter }} unpublished subpages
-                            {% endblocktrans %}
-                        </p>
-                    {% endif %}
+                    {% with draft_descendant_count=page.draft_descendant_count %}
+                        {% if draft_descendant_count %}
+                            <p>
+                                {% blocktrans trimmed with counter=draft_descendant_count|intcomma count counter_val=draft_descendant_count %}
+                                    This page has one unpublished subpage
+                                {% plural %}
+                                    This page has {{ counter }} unpublished subpages
+                                {% endblocktrans %}
+                            </p>
+                        {% endif %}
+                    {% endwith %}
                 </li>
             {% endfor %}
         </ul>