diff --git a/CHANGELOG.txt b/CHANGELOG.txt index daf1773dc2..d6b4bc6198 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -37,6 +37,7 @@ Changelog * Add support for embedding Instagram reels (Luis Nell) * Use Django’s JavaScript catalog feature to manage translatable strings in JavaScript (Karl Hobley) * Add a `page_description` to the Page model, to provide help text for a given page type (Kalob Taulien, Thibaud Colas, Matt Westcott) + * Add `trimmed` attribute to all blocktrans tags, so spacing is more reliable in translated strings (Harris Lapiroff) * Fix: When using `simple_translations` ensure that the user is redirected to the page edit view when submitting for a single locale (Mitchel Cabuloy) * Fix: When previewing unsaved changes to `Form` pages, ensure that all added fields are correctly shown in the preview (Joshua Munn) * Fix: When Documents (e.g. PDFs) have been configured to be served inline via `WAGTAILDOCS_CONTENT_TYPES` & `WAGTAILDOCS_INLINE_CONTENT_TYPES` ensure that the filename is correctly set in the `Content-Disposition` header so that saving the files will use the correct filename (John-Scott Atlakson) diff --git a/docs/extending/custom_bulk_actions.rst b/docs/extending/custom_bulk_actions.rst index eaddc20186..adfe9eec09 100644 --- a/docs/extending/custom_bulk_actions.rst +++ b/docs/extending/custom_bulk_actions.rst @@ -48,7 +48,7 @@ An example for a confirmation template is as follows: {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %} {% load i18n wagtailadmin_tags %} - {% block titletag %}{% blocktrans count counter=items|length %}Delete 1 item{% plural %}Delete {{ counter }} items{% endblocktrans %}{% endblock %} + {% block titletag %}{% blocktrans trimmed count counter=items|length %}Delete 1 item{% plural %}Delete {{ counter }} items{% endblocktrans %}{% endblock %} {% block header %} {% trans "Delete" as del_str %} @@ -70,7 +70,7 @@ An example for a confirmation template is as follows: {% block items_with_no_access %} - {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to delete this item{% plural %}You don't have permission to delete these items{% endblocktrans %} + {% blocktrans trimmed asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to delete this item{% plural %}You don't have permission to delete these items{% endblocktrans %} {% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %} {% endblock items_with_no_access %} diff --git a/docs/releases/3.0.md b/docs/releases/3.0.md index 2c1856a1a3..17acd19771 100644 --- a/docs/releases/3.0.md +++ b/docs/releases/3.0.md @@ -67,7 +67,7 @@ class LandingPage(Page): * Split up linting / formatting tasks in Makefile into client and server components (Hitansh Shah) * Add support for embedding Instagram reels (Luis Nell) * Use Django’s JavaScript catalog feature to manage translatable strings in JavaScript (Karl Hobley) - + * Add `trimmed` attribute to all blocktrans tags, so spacing is more reliable in translated strings (Harris Lapiroff) ### Bug fixes diff --git a/wagtail/admin/templates/wagtailadmin/chooser/_search_results.html b/wagtail/admin/templates/wagtailadmin/chooser/_search_results.html index bf2bc9b2c2..3ed2b99ad3 100644 --- a/wagtail/admin/templates/wagtailadmin/chooser/_search_results.html +++ b/wagtail/admin/templates/wagtailadmin/chooser/_search_results.html @@ -1,7 +1,7 @@ {% load i18n wagtailadmin_tags %}

- {% blocktrans count counter=pages.paginator.count %} + {% blocktrans trimmed count counter=pages.paginator.count %} There is {{ counter }} match {% plural %} There are {{ counter }} matches diff --git a/wagtail/admin/templates/wagtailadmin/chooser/browse.html b/wagtail/admin/templates/wagtailadmin/chooser/browse.html index a4cbb90d82..b6b2e5da8b 100644 --- a/wagtail/admin/templates/wagtailadmin/chooser/browse.html +++ b/wagtail/admin/templates/wagtailadmin/chooser/browse.html @@ -13,7 +13,7 @@ {% if page_types_restricted %}

{% icon name='warning' %} - {% blocktrans with type=page_type_names|join:", " count counter=page_type_names|length %} + {% blocktrans trimmed with type=page_type_names|join:", " count counter=page_type_names|length %} Only pages of type "{{ type }}" may be chosen for this field. Search results will exclude pages of other types. {% plural %} Only the following page types may be chosen for this field: {{ type }}. Search results will exclude pages of other types. diff --git a/wagtail/admin/templates/wagtailadmin/chooser/confirm_external_to_internal.html b/wagtail/admin/templates/wagtailadmin/chooser/confirm_external_to_internal.html index 05f855f401..3d682f6fbb 100644 --- a/wagtail/admin/templates/wagtailadmin/chooser/confirm_external_to_internal.html +++ b/wagtail/admin/templates/wagtailadmin/chooser/confirm_external_to_internal.html @@ -4,14 +4,14 @@

- {% blocktrans %} + {% blocktrans trimmed %} The URL you entered, {{ submitted_url }}, looks like it matches the internal page {{ page }}, which has the URL {{ internal_url }}. {% endblocktrans %}

- {% blocktrans %} + {% blocktrans trimmed %} Converting this to an internal link to {{ page }} would make the link more robust. Would you like to do this? {% endblocktrans %} diff --git a/wagtail/admin/templates/wagtailadmin/collections/index.html b/wagtail/admin/templates/wagtailadmin/collections/index.html index 646e77a0e7..953484c87f 100644 --- a/wagtail/admin/templates/wagtailadmin/collections/index.html +++ b/wagtail/admin/templates/wagtailadmin/collections/index.html @@ -29,7 +29,7 @@ {% else %} {% url 'wagtailadmin_collections:add' as add_collection_url %} -

{% blocktrans %}No collections have been created. Why not add one?{% endblocktrans %}

+

{% blocktrans trimmed %}No collections have been created. Why not add one?{% endblocktrans %}

{% endif %}
{% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/home.html b/wagtail/admin/templates/wagtailadmin/home.html index 8da60d7f46..15a7b536b3 100644 --- a/wagtail/admin/templates/wagtailadmin/home.html +++ b/wagtail/admin/templates/wagtailadmin/home.html @@ -18,7 +18,7 @@
-

{% block branding_welcome %}{% blocktrans %}Welcome to the {{ site_name }} Wagtail CMS{% endblocktrans %}{% endblock %}

+

{% block branding_welcome %}{% blocktrans trimmed %}Welcome to the {{ site_name }} Wagtail CMS{% endblocktrans %}{% endblock %}

{{ user|user_display_name }}
diff --git a/wagtail/admin/templates/wagtailadmin/home/locked_pages.html b/wagtail/admin/templates/wagtailadmin/home/locked_pages.html index e710798e50..2049fcf8cc 100644 --- a/wagtail/admin/templates/wagtailadmin/home/locked_pages.html +++ b/wagtail/admin/templates/wagtailadmin/home/locked_pages.html @@ -49,7 +49,7 @@ {# Deliberately empty #} -
{% blocktrans with time_period=page.locked_at|timesince_simple %}{{ time_period }}{% endblocktrans %}
+
{% blocktrans trimmed with time_period=page.locked_at|timesince_simple %}{{ time_period }}{% endblocktrans %}
{% endfor %} diff --git a/wagtail/admin/templates/wagtailadmin/home/pages_for_moderation.html b/wagtail/admin/templates/wagtailadmin/home/pages_for_moderation.html index 46df57f2f6..cfb54b7034 100644 --- a/wagtail/admin/templates/wagtailadmin/home/pages_for_moderation.html +++ b/wagtail/admin/templates/wagtailadmin/home/pages_for_moderation.html @@ -66,7 +66,7 @@ {{ revision.page.content_type.model_class.get_verbose_name }} -
{% blocktrans with time_period=revision.created_at|timesince_simple %}{{ time_period }}{% endblocktrans %}
+
{% blocktrans trimmed with time_period=revision.created_at|timesince_simple %}{{ time_period }}{% endblocktrans %}
{% if revision.user %} by {{ revision.user|user_display_name }} {% endif %} diff --git a/wagtail/admin/templates/wagtailadmin/home/recent_edits.html b/wagtail/admin/templates/wagtailadmin/home/recent_edits.html index 03ed05d99a..ede196c0b5 100644 --- a/wagtail/admin/templates/wagtailadmin/home/recent_edits.html +++ b/wagtail/admin/templates/wagtailadmin/home/recent_edits.html @@ -46,7 +46,7 @@ {% include "wagtailadmin/shared/page_status_tag.html" with page=page %} -
{% blocktrans with time_period=revision.created_at|timesince_simple %}{{ time_period }}{% endblocktrans %}
+
{% blocktrans trimmed with time_period=revision.created_at|timesince_simple %}{{ time_period }}{% endblocktrans %}
{% endfor %} diff --git a/wagtail/admin/templates/wagtailadmin/home/site_summary_pages.html b/wagtail/admin/templates/wagtailadmin/home/site_summary_pages.html index b20243ac55..95df6c144a 100644 --- a/wagtail/admin/templates/wagtailadmin/home/site_summary_pages.html +++ b/wagtail/admin/templates/wagtailadmin/home/site_summary_pages.html @@ -3,7 +3,7 @@
  • {% icon name="doc-empty-inverse" %} - {% blocktrans count counter=total_pages with total_pages|intcomma as total %} + {% blocktrans trimmed count counter=total_pages with total_pages|intcomma as total %} {{ total }} Page created in {{ site_name }} {% plural %} {{ total }} Pages created in {{ site_name }} diff --git a/wagtail/admin/templates/wagtailadmin/home/user_pages_in_workflow_moderation.html b/wagtail/admin/templates/wagtailadmin/home/user_pages_in_workflow_moderation.html index 3ba2912848..15868599e1 100644 --- a/wagtail/admin/templates/wagtailadmin/home/user_pages_in_workflow_moderation.html +++ b/wagtail/admin/templates/wagtailadmin/home/user_pages_in_workflow_moderation.html @@ -46,7 +46,7 @@ {{ workflow_state.current_task_state.task.name }} -
    {% blocktrans with time_period=workflow_state.current_task_state.started_at|timesince_simple %}{{ time_period }}{% endblocktrans %}
    +
    {% blocktrans trimmed with time_period=workflow_state.current_task_state.started_at|timesince_simple %}{{ time_period }}{% endblocktrans %}
    {% endwith %} diff --git a/wagtail/admin/templates/wagtailadmin/home/workflow_pages_to_moderate.html b/wagtail/admin/templates/wagtailadmin/home/workflow_pages_to_moderate.html index e8f0e4fee4..1ff9655048 100644 --- a/wagtail/admin/templates/wagtailadmin/home/workflow_pages_to_moderate.html +++ b/wagtail/admin/templates/wagtailadmin/home/workflow_pages_to_moderate.html @@ -74,7 +74,7 @@ {% if revision.user %}{{ revision.user|user_display_name }}{% endif %} -
    {% blocktrans with time_period=task_state.started_at|timesince_simple %}{{ time_period }}{% endblocktrans %}
    +
    {% blocktrans trimmed with time_period=task_state.started_at|timesince_simple %}{{ time_period }}{% endblocktrans %}
    {% endwith %} diff --git a/wagtail/admin/templates/wagtailadmin/login.html b/wagtail/admin/templates/wagtailadmin/login.html index 580dd2f793..897d1a459e 100644 --- a/wagtail/admin/templates/wagtailadmin/login.html +++ b/wagtail/admin/templates/wagtailadmin/login.html @@ -15,7 +15,7 @@
      {% if form.errors %} -
    • {% blocktrans %}Your {{ username_field }} and password didn't match. Please try again.{% endblocktrans %}
      • +
    • {% blocktrans trimmed %}Your {{ username_field }} and password didn't match. Please try again.{% endblocktrans %}
      • {% endif %} {% for message in messages %}
    • {{ message }}
      • diff --git a/wagtail/admin/templates/wagtailadmin/notifications/approved.html b/wagtail/admin/templates/wagtailadmin/notifications/approved.html index 90f825c953..2f09b3aecc 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/approved.html +++ b/wagtail/admin/templates/wagtailadmin/notifications/approved.html @@ -2,6 +2,6 @@ {% load i18n %} {% block content %} -

      {% blocktrans with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been approved.{% endblocktrans %}

      +

      {% blocktrans trimmed with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been approved.{% endblocktrans %}

      {% trans "You can view the page here:" %} {{ revision.page.full_url }}

      {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/approved.txt b/wagtail/admin/templates/wagtailadmin/notifications/approved.txt index 64421c5159..a7ff078fc1 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/approved.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/approved.txt @@ -2,7 +2,7 @@ {% load i18n %} {% block content %} -{% blocktrans with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been approved.{% endblocktrans %} +{% blocktrans trimmed with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been approved.{% endblocktrans %} {% trans "You can view the page here:" %} {{ revision.page.full_url }} {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/approved_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/approved_subject.txt index 7cac0ae3e6..25b6706f18 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/approved_subject.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/approved_subject.txt @@ -1,3 +1,3 @@ {% load i18n %} -{% blocktrans with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been approved{% endblocktrans %} +{% blocktrans trimmed with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been approved{% endblocktrans %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/base.html b/wagtail/admin/templates/wagtailadmin/notifications/base.html index 7fddb80d25..32c6d42704 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/base.html +++ b/wagtail/admin/templates/wagtailadmin/notifications/base.html @@ -108,7 +108,7 @@ {% endblock %} {% block greeting %} -

      {% blocktrans with username=user.get_short_name|default:user.get_username %}Hello {{ username }},{% endblocktrans %}

      +

      {% blocktrans trimmed with username=user.get_short_name|default:user.get_username %}Hello {{ username }},{% endblocktrans %}

      {% endblock %} {% block content %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/base.txt b/wagtail/admin/templates/wagtailadmin/notifications/base.txt index f73384c6e1..784aa905dc 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/base.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/base.txt @@ -1,7 +1,7 @@ {% load i18n %} {% block greeting %} -{% blocktrans with username=user.get_short_name|default:user.get_username %}Hello {{ username }},{% endblocktrans %} +{% blocktrans trimmed with username=user.get_short_name|default:user.get_username %}Hello {{ username }},{% endblocktrans %} {% endblock %} {% block content %} {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/rejected.html b/wagtail/admin/templates/wagtailadmin/notifications/rejected.html index ca9ffc93e2..b6e575d7a6 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/rejected.html +++ b/wagtail/admin/templates/wagtailadmin/notifications/rejected.html @@ -2,6 +2,6 @@ {% load i18n %} {% block content %} -

      {% blocktrans with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been rejected.{% endblocktrans %}

      +

      {% blocktrans trimmed with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been rejected.{% endblocktrans %}

      {% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}

      {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/rejected.txt b/wagtail/admin/templates/wagtailadmin/notifications/rejected.txt index 7dc1e5556e..1c6bfd18f0 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/rejected.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/rejected.txt @@ -2,7 +2,7 @@ {% load i18n %} {% block content %} -{% blocktrans with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been rejected.{% endblocktrans %} +{% blocktrans trimmed with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been rejected.{% endblocktrans %} {% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %} {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/rejected_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/rejected_subject.txt index 575067c540..38ed992d0d 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/rejected_subject.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/rejected_subject.txt @@ -1,3 +1,3 @@ {% load i18n %} -{% blocktrans with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been rejected{% endblocktrans %} +{% blocktrans trimmed with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been rejected{% endblocktrans %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/submitted.html b/wagtail/admin/templates/wagtailadmin/notifications/submitted.html index 8ff34d9804..40392049f9 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/submitted.html +++ b/wagtail/admin/templates/wagtailadmin/notifications/submitted.html @@ -3,7 +3,7 @@ {% load wagtailadmin_tags i18n %} {% block content %} -

      {% blocktrans with page=revision.page|safe editor=revision.user|user_display_name %}The page "{{ page }}" has been submitted for moderation by {{ editor }}.{% endblocktrans %}

      +

      {% blocktrans trimmed with page=revision.page|safe editor=revision.user|user_display_name %}The page "{{ page }}" has been submitted for moderation by {{ editor }}.{% endblocktrans %}

      {% if revision.page.is_previewable %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/submitted.txt b/wagtail/admin/templates/wagtailadmin/notifications/submitted.txt index 0ede6d527d..735c2cf3d8 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/submitted.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/submitted.txt @@ -2,7 +2,7 @@ {% load wagtailadmin_tags i18n %} {% block content %} -{% blocktrans with page=revision.page|safe editor=revision.user|user_display_name %}The page "{{ page }}" has been submitted for moderation by {{ editor }}.{% endblocktrans %} +{% blocktrans trimmed with page=revision.page|safe editor=revision.user|user_display_name %}The page "{{ page }}" has been submitted for moderation by {{ editor }}.{% endblocktrans %} {% if revision.page.is_previewable %}{% trans "You can preview the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}{% endif %} {% trans "You can edit the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/submitted_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/submitted_subject.txt index d5fa7c5800..6f81936625 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/submitted_subject.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/submitted_subject.txt @@ -1,3 +1,3 @@ {% load i18n %} -{% blocktrans with page=revision.page|safe %}The page "{{ page }}" has been submitted for moderation{% endblocktrans %} +{% blocktrans trimmed with page=revision.page|safe %}The page "{{ page }}" has been submitted for moderation{% endblocktrans %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/task_state_approved.html b/wagtail/admin/templates/wagtailadmin/notifications/task_state_approved.html index 38d6485f4c..924d669b0a 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/task_state_approved.html +++ b/wagtail/admin/templates/wagtailadmin/notifications/task_state_approved.html @@ -2,6 +2,6 @@ {% load i18n %} {% block content %} -

      {% blocktrans with title=page.get_admin_display_title task=task.name %}The page "{{ title }}" has been approved in moderation stage "{{ task }}".{% endblocktrans %}

      +

      {% blocktrans trimmed with title=page.get_admin_display_title task=task.name %}The page "{{ title }}" has been approved in moderation stage "{{ task }}".{% endblocktrans %}

      {% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %}

      {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/task_state_approved.txt b/wagtail/admin/templates/wagtailadmin/notifications/task_state_approved.txt index edfa045dc5..67c226d355 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/task_state_approved.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/task_state_approved.txt @@ -2,6 +2,6 @@ {% load i18n %} {% block content %} -{% blocktrans with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been approved in moderation stage "{{ task }}".{% endblocktrans %} +{% blocktrans trimmed with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been approved in moderation stage "{{ task }}".{% endblocktrans %} {% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %} {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/task_state_approved_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/task_state_approved_subject.txt index 26e252695c..625b8a70c8 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/task_state_approved_subject.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/task_state_approved_subject.txt @@ -1,3 +1,3 @@ {% load i18n %} -{% blocktrans with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been approved in "{{ task }}".{% endblocktrans %} +{% blocktrans trimmed with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been approved in "{{ task }}".{% endblocktrans %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected.html b/wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected.html index 8cf202bb5e..d750165666 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected.html +++ b/wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected.html @@ -2,6 +2,6 @@ {% load i18n %} {% block content %} -

      {% blocktrans with title=page.get_admin_display_title task=task.name %}The page "{{ title }}" has been rejected in moderation stage "{{ task }}".{% endblocktrans %}

      +

      {% blocktrans trimmed with title=page.get_admin_display_title task=task.name %}The page "{{ title }}" has been rejected in moderation stage "{{ task }}".{% endblocktrans %}

      {% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %}

      {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected.txt b/wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected.txt index 2a12249290..0cee9250d1 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected.txt @@ -2,6 +2,6 @@ {% load i18n %} {% block content %} -{% blocktrans with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been rejected in moderation stage "{{ task }}".{% endblocktrans %} +{% blocktrans trimmed with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been rejected in moderation stage "{{ task }}".{% endblocktrans %} {% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %} {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected_subject.txt index d2f6178ffe..43b1d5c262 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected_subject.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected_subject.txt @@ -1,3 +1,3 @@ {% load i18n %} -{% blocktrans with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been rejected during "{{ task }}".{% endblocktrans %} +{% blocktrans trimmed with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been rejected during "{{ task }}".{% endblocktrans %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted.html b/wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted.html index faa7787131..76de5bd0c1 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted.html +++ b/wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted.html @@ -3,7 +3,7 @@ {% load i18n %} {% block content %} -

      {% blocktrans with task=task.name title=page.get_admin_display_title %}The page "{{ title }}" has been submitted for approval in moderation stage "{{ task }}".{% endblocktrans %}

      +

      {% blocktrans trimmed with task=task.name title=page.get_admin_display_title %}The page "{{ title }}" has been submitted for approval in moderation stage "{{ task }}".{% endblocktrans %}

      {% trans "You can preview the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:workflow_preview' page.id task.id %}
      diff --git a/wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted.txt b/wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted.txt index e2ef8f5387..86ddcd6f40 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted.txt @@ -3,7 +3,7 @@ {% load i18n %} {% block content %} -{% blocktrans with task=task.name|safe title=page.get_admin_display_title|safe %}The page "{{ title }}" has been submitted for approval to moderation stage "{{ task }}".{% endblocktrans %} +{% blocktrans trimmed with task=task.name|safe title=page.get_admin_display_title|safe %}The page "{{ title }}" has been submitted for approval to moderation stage "{{ task }}".{% endblocktrans %} {% trans "You can preview the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:workflow_preview' page.id task.id %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted_subject.txt index 88b5d8894b..2480c3a620 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted_subject.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted_subject.txt @@ -1,3 +1,3 @@ {% load i18n %} -{% blocktrans with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been submitted for approval in moderation stage "{{ task }}" {% endblocktrans %} +{% blocktrans trimmed with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been submitted for approval in moderation stage "{{ task }}" {% endblocktrans %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/updated_comments.html b/wagtail/admin/templates/wagtailadmin/notifications/updated_comments.html index ed771d4e53..3c55c8746c 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/updated_comments.html +++ b/wagtail/admin/templates/wagtailadmin/notifications/updated_comments.html @@ -3,7 +3,7 @@ {% block content %}

      - {% blocktrans with title=page.get_admin_display_title editor=editor|user_display_name %}{{ editor }} has updated comments on "{{ title }}".{% endblocktrans %} + {% blocktrans trimmed with title=page.get_admin_display_title editor=editor|user_display_name %}{{ editor }} has updated comments on "{{ title }}".{% endblocktrans %}

      {% if new_comments %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/updated_comments.txt b/wagtail/admin/templates/wagtailadmin/notifications/updated_comments.txt index b313bd32d3..cf0c9d7d5f 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/updated_comments.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/updated_comments.txt @@ -1,7 +1,7 @@ {% extends 'wagtailadmin/notifications/base.txt' %} {% load i18n wagtailadmin_tags %} -{% block content %}{% blocktrans with title=page.get_admin_display_title|safe editor=editor|user_display_name|safe %}{{ editor }} has updated comments on "{{ title }}".{% endblocktrans %} +{% block content %}{% blocktrans trimmed with title=page.get_admin_display_title|safe editor=editor|user_display_name|safe %}{{ editor }} has updated comments on "{{ title }}".{% endblocktrans %} {% spaceless %} {% endspaceless %}{% if new_comments %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/updated_comments_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/updated_comments_subject.txt index c51b63c1a2..4258e342b0 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/updated_comments_subject.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/updated_comments_subject.txt @@ -1,3 +1,3 @@ {% load i18n wagtailadmin_tags %} -{% blocktrans with title=page.get_admin_display_title|safe editor=editor|user_display_name|safe %}{{ editor }} has updated comments on "{{ title }}"{% endblocktrans %} +{% blocktrans trimmed with title=page.get_admin_display_title|safe editor=editor|user_display_name|safe %}{{ editor }} has updated comments on "{{ title }}"{% endblocktrans %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved.html b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved.html index 387d2bf8c1..311c1dab54 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved.html +++ b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved.html @@ -2,6 +2,6 @@ {% load i18n %} {% block content %} -

      {% blocktrans with title=page.get_admin_display_title workflow=workflow.name %}The page "{{ title }}" has been approved in workflow "{{ workflow }}".{% endblocktrans %}

      +

      {% blocktrans trimmed with title=page.get_admin_display_title workflow=workflow.name %}The page "{{ title }}" has been approved in workflow "{{ workflow }}".{% endblocktrans %}

      {% trans "You can view the page here:" %} {{ page.full_url }}

      {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved.txt b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved.txt index bd0c593c18..6e3237abad 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved.txt @@ -2,6 +2,6 @@ {% load i18n %} {% block content %} -{% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been approved in workflow "{{ workflow }}".{% endblocktrans %} +{% blocktrans trimmed with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been approved in workflow "{{ workflow }}".{% endblocktrans %} {% trans "You can view the page here:" %} {{ page.full_url }} {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved_subject.txt index c4b37378b2..dccc3d4225 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved_subject.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved_subject.txt @@ -1,3 +1,3 @@ {% load i18n %} -{% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been approved in "{{ workflow }}".{% endblocktrans %} +{% blocktrans trimmed with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been approved in "{{ workflow }}".{% endblocktrans %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected.html b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected.html index 61db962fe6..83878f5a8f 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected.html +++ b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected.html @@ -3,12 +3,12 @@ {% block content %} {% if task_state.finished_by %} -

      {% blocktrans with title=page.get_admin_display_title workflow=workflow.name task=task.name rejector=task_state.finished_by|user_display_name %}The page "{{ title }}" has been rejected during "{{ task }}" in workflow "{{ workflow }}" by {{ rejector }}.{% endblocktrans %}

      +

      {% blocktrans trimmed with title=page.get_admin_display_title workflow=workflow.name task=task.name rejector=task_state.finished_by|user_display_name %}The page "{{ title }}" has been rejected during "{{ task }}" in workflow "{{ workflow }}" by {{ rejector }}.{% endblocktrans %}

      {% else %} -

      {% blocktrans with title=page.get_admin_display_title workflow=workflow.name task=task.name %}The page "{{ title }}" has been rejected during "{{ task }}" in workflow "{{ workflow }}".{% endblocktrans %}

      +

      {% blocktrans trimmed with title=page.get_admin_display_title workflow=workflow.name task=task.name %}The page "{{ title }}" has been rejected during "{{ task }}" in workflow "{{ workflow }}".{% endblocktrans %}

      {% endif %} {% if comment %} -

      {% blocktrans %}The following comment was left: "{{ comment }}"{% endblocktrans %}

      +

      {% blocktrans trimmed %}The following comment was left: "{{ comment }}"{% endblocktrans %}

      {% endif %}

      {% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %}

      {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected.txt b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected.txt index 037dfaa80f..462390fdfa 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected.txt @@ -3,12 +3,12 @@ {% block content %} {% if task_state.finished_by %} - {% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name|safe task=task.name|safe rejector=task_state.finished_by|user_display_name %}The page "{{ title }}" has been rejected during "{{ task }}" in workflow "{{ workflow }}" by {{ rejector }}.{% endblocktrans %} + {% blocktrans trimmed with title=page.get_admin_display_title|safe workflow=workflow.name|safe task=task.name|safe rejector=task_state.finished_by|user_display_name %}The page "{{ title }}" has been rejected during "{{ task }}" in workflow "{{ workflow }}" by {{ rejector }}.{% endblocktrans %} {% else %} - {% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name|safe task=task.name|safe %}The page "{{ title }}" has been rejected during "{{ task }}" in workflow "{{ workflow }}".{% endblocktrans %} + {% blocktrans trimmed with title=page.get_admin_display_title|safe workflow=workflow.name|safe task=task.name|safe %}The page "{{ title }}" has been rejected during "{{ task }}" in workflow "{{ workflow }}".{% endblocktrans %} {% endif %} {% if comment %} - {% blocktrans with comment=comment|safe %}The following comment was left: "{{ comment }}"{% endblocktrans %}

      + {% blocktrans trimmed with comment=comment|safe %}The following comment was left: "{{ comment }}"{% endblocktrans %}

      {% endif %} {% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %} {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected_subject.txt index dc471a9554..67234a1a1f 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected_subject.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected_subject.txt @@ -1,3 +1,3 @@ {% load i18n %} -{% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been rejected during "{{ workflow }}".{% endblocktrans %} +{% blocktrans trimmed with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been rejected during "{{ workflow }}".{% endblocktrans %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted.html b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted.html index 20dea3ae54..976486185a 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted.html +++ b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted.html @@ -4,9 +4,9 @@ {% block content %} {% if requested_by %} -

      {% blocktrans with workflow=workflow.name title=page.get_admin_display_title requester=requested_by|user_display_name %}The page "{{ title }}" has been submitted for moderation to workflow "{{ workflow }}" by {{ requester }}.{% endblocktrans %}

      +

      {% blocktrans trimmed with workflow=workflow.name title=page.get_admin_display_title requester=requested_by|user_display_name %}The page "{{ title }}" has been submitted for moderation to workflow "{{ workflow }}" by {{ requester }}.{% endblocktrans %}

      {% else %} -

      {% blocktrans with workflow=workflow.name title=page.get_admin_display_title %}The page "{{ title }}" has been submitted for moderation to workflow "{{ workflow }}".{% endblocktrans %}

      +

      {% blocktrans trimmed with workflow=workflow.name title=page.get_admin_display_title %}The page "{{ title }}" has been submitted for moderation to workflow "{{ workflow }}".{% endblocktrans %}

      {% endif %}

      diff --git a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted.txt b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted.txt index 2d0a56f61c..b2c2c3bfc8 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted.txt @@ -3,8 +3,8 @@ {% load wagtailadmin_tags i18n %} {% block content %} -{% if requested_by %}{% blocktrans with workflow=workflow.name|safe title=page.get_admin_display_title|safe requester=requested_by|user_display_name|safe %}The page "{{ title }}" has been submitted for moderation to workflow "{{ workflow }}" by {{ requester }}.{% endblocktrans %} -{% else %}{% blocktrans with workflow=workflow.name|safe title=page.get_admin_display_title|safe %}The page "{{ title }}" has been submitted for moderation to workflow "{{ workflow }}".{% endblocktrans %} +{% if requested_by %}{% blocktrans trimmed with workflow=workflow.name|safe title=page.get_admin_display_title|safe requester=requested_by|user_display_name|safe %}The page "{{ title }}" has been submitted for moderation to workflow "{{ workflow }}" by {{ requester }}.{% endblocktrans %} +{% else %}{% blocktrans trimmed with workflow=workflow.name|safe title=page.get_admin_display_title|safe %}The page "{{ title }}" has been submitted for moderation to workflow "{{ workflow }}".{% endblocktrans %} {% endif %} {% trans "You can edit the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %} diff --git a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted_subject.txt b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted_subject.txt index 1132922025..84efb50282 100644 --- a/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted_subject.txt +++ b/wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted_subject.txt @@ -1,3 +1,3 @@ {% load i18n %} -{% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been submitted to workflow "{{ workflow }}" {% endblocktrans %} +{% blocktrans trimmed with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been submitted to workflow "{{ workflow }}" {% endblocktrans %} diff --git a/wagtail/admin/templates/wagtailadmin/pages/_unsaved_changes_warning.html b/wagtail/admin/templates/wagtailadmin/pages/_unsaved_changes_warning.html index 07181a188a..c64424863c 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/_unsaved_changes_warning.html +++ b/wagtail/admin/templates/wagtailadmin/pages/_unsaved_changes_warning.html @@ -2,9 +2,9 @@

    • diff --git a/wagtail/admin/templates/wagtailadmin/pages/add_subpage.html b/wagtail/admin/templates/wagtailadmin/pages/add_subpage.html index 6a38871774..18e360684a 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/add_subpage.html +++ b/wagtail/admin/templates/wagtailadmin/pages/add_subpage.html @@ -2,7 +2,7 @@ {% load i18n %} {% load wagtailadmin_tags %} -{% block titletag %}{% blocktrans with title=parent_page.get_admin_display_title %}Create a page in {{ title }}{% endblocktrans %}{% endblock %} +{% block titletag %}{% blocktrans trimmed with title=parent_page.get_admin_display_title %}Create a page in {{ title }}{% endblocktrans %}{% endblock %} {% block content %} {% trans "Create a page in" as create_str %} @@ -26,7 +26,7 @@
    - {% blocktrans with page_type=verbose_name %}Pages using {{ page_type }}{% endblocktrans %} + {% blocktrans trimmed with page_type=verbose_name %}Pages using {{ page_type }}{% endblocktrans %} diff --git a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_delete.html b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_delete.html index bbc200ea1c..ed67df9443 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_delete.html +++ b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_delete.html @@ -1,7 +1,7 @@ {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %} {% load i18n wagtailadmin_tags %} -{% block titletag %}{% blocktrans count counter=items|length %}Delete 1 page {% plural %}Delete {{ counter }} pages{% endblocktrans %}{% endblock %} +{% block titletag %}{% blocktrans trimmed count counter=items|length %}Delete 1 page {% plural %}Delete {{ counter }} pages{% endblocktrans %}{% endblock %} {% block header %} {% trans "Delete" as del_str %} @@ -17,7 +17,7 @@ {{ page.item.get_admin_display_title }} {% if page.descendant_count %}

    - {% blocktrans count counter=page.descendant_count %} + {% blocktrans trimmed count counter=page.descendant_count %} This will also delete one more subpage. {% plural %} This will also delete {{ counter }} more subpages. @@ -32,7 +32,7 @@ {% block items_with_no_access %} - {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to delete this page{% plural %}You don't have permission to delete these pages{% endblocktrans %} + {% blocktrans trimmed asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to delete this page{% plural %}You don't have permission to delete these pages{% endblocktrans %} {% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %} {% endblock items_with_no_access %} diff --git a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_move.html b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_move.html index 0168d8163d..b807e7a0d4 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_move.html +++ b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_move.html @@ -1,7 +1,7 @@ {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %} {% load i18n %} -{% block titletag %}{% blocktrans count counter=items|length %}Move 1 page{% plural %}Move {{ counter }} pages{% endblocktrans %} +{% block titletag %}{% blocktrans trimmed count counter=items|length %}Move 1 page{% plural %}Move {{ counter }} pages{% endblocktrans %} {% endblock %} {% block header %} @@ -18,7 +18,7 @@ {{ page.item.get_admin_display_title }} {% if not page.item.is_leaf %}

    - {% blocktrans count counter=page.child_pages %} + {% blocktrans trimmed count counter=page.child_pages %} This page has one child page {% plural %} This page has {{ counter }} child pages @@ -33,13 +33,13 @@ {% block items_with_no_access %} - {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to move this page{% plural %}You don't have permission to move these pages{% endblocktrans %} + {% blocktrans trimmed asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to move this page{% plural %}You don't have permission to move these pages{% endblocktrans %} {% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %} - {% blocktrans asvar no_access_msg with dest_title=destination.title count counter=items_with_no_access|length %}The following page cannot be moved to {{dest_title}} {% plural %}The following pages cannot be moved to {{dest_title}}{% endblocktrans %} + {% blocktrans trimmed asvar no_access_msg with dest_title=destination.title count counter=items_with_no_access|length %}The following page cannot be moved to {{dest_title}} {% plural %}The following pages cannot be moved to {{dest_title}}{% endblocktrans %} {% include './list_items_with_no_access.html' with items=pages_without_destination_access no_access_msg=no_access_msg %} - {% blocktrans asvar no_access_msg count counter=pages_with_duplicate_slugs|length %}The following page cannot be moved due to duplicate slug{% plural %}The following pages cannot be moved due to duplicate slugs{% endblocktrans %} + {% blocktrans trimmed asvar no_access_msg count counter=pages_with_duplicate_slugs|length %}The following page cannot be moved due to duplicate slug{% plural %}The following pages cannot be moved due to duplicate slugs{% endblocktrans %} {% include './list_items_with_no_access.html' with items=pages_with_duplicate_slugs no_access_msg=no_access_msg %} {% trans "There is no valid destination page for these pages" as no_access_msg %} diff --git a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html index a13584f8d0..7eeedc2e54 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html +++ b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html @@ -1,7 +1,7 @@ {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %} {% load i18n %} -{% block titletag %}{% blocktrans count counter=items|length %}Publish 1 page {% plural %}Publish {{ counter }} pages{% endblocktrans %}{% endblock %} +{% block titletag %}{% blocktrans trimmed count counter=items|length %}Publish 1 page {% plural %}Publish {{ counter }} pages{% endblocktrans %}{% endblock %} {% block header %} {% trans "Publish" as publish_str %} @@ -17,7 +17,7 @@ {{ page.item.get_admin_display_title }} {% if page.draft_descendant_count %}

    - {% blocktrans count counter=page.draft_descendant_count %} + {% blocktrans trimmed count counter=page.draft_descendant_count %} This page has one unpublished subpage {% plural %} This page has {{ counter }} unpublished subpages @@ -32,7 +32,7 @@ {% block items_with_no_access %} - {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to publish this page{% plural %}You don't have permission to publish these pages{% endblocktrans %} + {% blocktrans trimmed asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to publish this page{% plural %}You don't have permission to publish these pages{% endblocktrans %} {% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %} {% endblock items_with_no_access %} diff --git a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_unpublish.html b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_unpublish.html index e445eb058a..10d60666ee 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_unpublish.html +++ b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_unpublish.html @@ -1,7 +1,7 @@ {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %} {% load i18n %} -{% block titletag %}{% blocktrans count counter=items|length %}Unpublish 1 page {% plural %}Unpublish {{ counter }} pages{% endblocktrans %}{% endblock %} +{% block titletag %}{% blocktrans trimmed count counter=items|length %}Unpublish 1 page {% plural %}Unpublish {{ counter }} pages{% endblocktrans %}{% endblock %} {% block header %} {% trans "Unpublish" as unpublish_str %} @@ -17,7 +17,7 @@ {{ page.item.get_admin_display_title }}

    {% if page.live_descendant_count %} - {% blocktrans count counter=page.live_descendant_count %} + {% blocktrans trimmed count counter=page.live_descendant_count %} This page has one subpage {% plural %} This page has {{ counter }} subpages @@ -32,7 +32,7 @@ {% block items_with_no_access %} - {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to unpublish this page{% plural %}You don't have permission to unpublish these pages{% endblocktrans %} + {% blocktrans trimmed asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to unpublish this page{% plural %}You don't have permission to unpublish these pages{% endblocktrans %} {% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %} {% endblock items_with_no_access %} diff --git a/wagtail/admin/templates/wagtailadmin/pages/confirm_convert_alias.html b/wagtail/admin/templates/wagtailadmin/pages/confirm_convert_alias.html index 8e93411538..4ff7a0e63e 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/confirm_convert_alias.html +++ b/wagtail/admin/templates/wagtailadmin/pages/confirm_convert_alias.html @@ -1,6 +1,6 @@ {% extends "wagtailadmin/base.html" %} {% load i18n wagtailadmin_tags %} -{% block titletag %}{% blocktrans with title=page.get_admin_display_title %}Convert alias {{ title }}{% endblocktrans %}{% endblock %} +{% block titletag %}{% blocktrans trimmed with title=page.get_admin_display_title %}Convert alias {{ title }}{% endblocktrans %}{% endblock %} {% block content %} {% trans "Convert alias" as del_str %} diff --git a/wagtail/admin/templates/wagtailadmin/pages/confirm_delete.html b/wagtail/admin/templates/wagtailadmin/pages/confirm_delete.html index 1c5748fbc4..c5c3911728 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/confirm_delete.html +++ b/wagtail/admin/templates/wagtailadmin/pages/confirm_delete.html @@ -1,6 +1,6 @@ {% extends "wagtailadmin/base.html" %} {% load i18n wagtailadmin_tags %} -{% block titletag %}{% blocktrans with title=page.get_admin_display_title %}Delete {{ title }}{% endblocktrans %}{% endblock %} +{% block titletag %}{% blocktrans trimmed with title=page.get_admin_display_title %}Delete {{ title }}{% endblocktrans %}{% endblock %} {% block content %} {% trans "Delete" as del_str %} @@ -10,7 +10,7 @@

    {% trans 'Are you sure you want to delete this page?' %} {% if descendant_count %} - {% blocktrans count counter=descendant_count %} + {% blocktrans trimmed count counter=descendant_count %} This will also delete one more subpage. {% plural %} This will also delete {{ descendant_count }} more subpages. @@ -28,7 +28,7 @@ {% page_permissions page as page_perms %} {% if page_perms.can_unpublish %} {% url 'wagtailadmin_pages:unpublish' page.id as unpublish_url %} -

    {% blocktrans %}Alternatively you can unpublish the page. This removes the page from public view and you can edit or publish it again later.{% endblocktrans %}

    +

    {% blocktrans trimmed %}Alternatively you can unpublish the page. This removes the page from public view and you can edit or publish it again later.{% endblocktrans %}

    {% endif %} {% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/pages/confirm_move.html b/wagtail/admin/templates/wagtailadmin/pages/confirm_move.html index 114bb98d7a..f1d9529466 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/confirm_move.html +++ b/wagtail/admin/templates/wagtailadmin/pages/confirm_move.html @@ -1,15 +1,15 @@ {% extends "wagtailadmin/base.html" %} {% load i18n %} -{% block titletag %}{% blocktrans with title=page_to_move.get_admin_display_title %}Move {{ title }}{% endblocktrans %}{% endblock %} +{% block titletag %}{% blocktrans trimmed with title=page_to_move.get_admin_display_title %}Move {{ title }}{% endblocktrans %}{% endblock %} {% block content %} {% trans "Move" as move_str %} {% include "wagtailadmin/shared/header.html" with title=move_str subtitle=page_to_move.get_admin_display_title icon="doc-empty-inverse" %}
    {% if page_to_move.is_leaf %} -

    {% blocktrans with title=destination.get_admin_display_title %}Are you sure you want to move this page into '{{ title }}'?{% endblocktrans %}

    +

    {% blocktrans trimmed with title=destination.get_admin_display_title %}Are you sure you want to move this page into '{{ title }}'?{% endblocktrans %}

    {% else %} -

    {% blocktrans with title=destination.get_admin_display_title %}Are you sure you want to move this page and all of its children into '{{ title }}'?{% endblocktrans %}

    +

    {% blocktrans trimmed with title=destination.get_admin_display_title %}Are you sure you want to move this page and all of its children into '{{ title }}'?{% endblocktrans %}

    {% endif %}
    diff --git a/wagtail/admin/templates/wagtailadmin/pages/confirm_unpublish.html b/wagtail/admin/templates/wagtailadmin/pages/confirm_unpublish.html index ef3dd6f4b9..fb2a69a3ed 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/confirm_unpublish.html +++ b/wagtail/admin/templates/wagtailadmin/pages/confirm_unpublish.html @@ -1,6 +1,6 @@ {% extends "wagtailadmin/base.html" %} {% load i18n %} -{% block titletag %}{% blocktrans with title=page.get_admin_display_title %}Unpublish {{ title }}{% endblocktrans %}{% endblock %} +{% block titletag %}{% blocktrans trimmed with title=page.get_admin_display_title %}Unpublish {{ title }}{% endblocktrans %}{% endblock %} {% block content %} {% trans "Unpublish" as unpublish_str %} {% include "wagtailadmin/shared/header.html" with title=unpublish_str subtitle=page.get_admin_display_title icon="doc-empty-inverse" %} @@ -17,7 +17,7 @@
    -