From aaa723a14d54b82ea9a9af9ba59b70a528ce55fb Mon Sep 17 00:00:00 2001 From: Sage Abdullah Date: Thu, 16 Feb 2023 14:41:16 +0000 Subject: [PATCH] Change 'used' -> 'referenced' --- .../shared/side_panels/includes/status/usage.html | 6 +++++- wagtail/admin/tests/pages/test_edit_page.py | 4 ++-- wagtail/admin/ui/side_panels.py | 15 +++++++++++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/wagtail/admin/templates/wagtailadmin/shared/side_panels/includes/status/usage.html b/wagtail/admin/templates/wagtailadmin/shared/side_panels/includes/status/usage.html index 1b59646b4a..64298d1072 100644 --- a/wagtail/admin/templates/wagtailadmin/shared/side_panels/includes/status/usage.html +++ b/wagtail/admin/templates/wagtailadmin/shared/side_panels/includes/status/usage.html @@ -10,7 +10,11 @@ - {% blocktrans trimmed count usage_count=usage_count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %} + {% if usage_url_text %} + {{ usage_url_text }} + {% else %} + {% blocktrans trimmed count usage_count=usage_count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %} + {% endif %} diff --git a/wagtail/admin/tests/pages/test_edit_page.py b/wagtail/admin/tests/pages/test_edit_page.py index 53bd911872..501d8b3591 100644 --- a/wagtail/admin/tests/pages/test_edit_page.py +++ b/wagtail/admin/tests/pages/test_edit_page.py @@ -158,7 +158,7 @@ class TestPageEdit(WagtailTestUtils, TestCase): self.assertNotContains(response, "data-form-side-explorer") # test that usage info is shown - self.assertContains(response, "Used 0 times") + self.assertContains(response, "Referenced 0 times") self.assertContains( response, reverse("wagtailadmin_pages:usage", args=(self.event_page.id,)) ) @@ -177,7 +177,7 @@ class TestPageEdit(WagtailTestUtils, TestCase): ) # test that usage info is shown - self.assertContains(response, "Used 1 time") + self.assertContains(response, "Referenced 1 time") self.assertContains( response, reverse("wagtailadmin_pages:usage", args=(self.event_page.id,)) ) diff --git a/wagtail/admin/ui/side_panels.py b/wagtail/admin/ui/side_panels.py index ebfc9032d7..6898d63bad 100644 --- a/wagtail/admin/ui/side_panels.py +++ b/wagtail/admin/ui/side_panels.py @@ -3,7 +3,7 @@ from django.forms import Media from django.urls import reverse from django.utils.functional import cached_property from django.utils.text import capfirst -from django.utils.translation import gettext_lazy +from django.utils.translation import gettext_lazy, ngettext from wagtail.admin.ui.components import Component from wagtail.locks import BasicLock @@ -192,6 +192,18 @@ class PageStatusSidePanel(BaseStatusSidePanel): ) return templates + def get_usage_context(self): + context = super().get_usage_context() + context["usage_url"] = reverse( + "wagtailadmin_pages:usage", args=(self.object.id,) + ) + context["usage_url_text"] = ngettext( + "Referenced %(count)s time", + "Referenced %(count)s times", + context["usage_count"], + ) % {"count": context["usage_count"]} + return context + def get_context_data(self, parent_context): context = super().get_context_data(parent_context) user_perms = UserPagePermissionsProxy(self.request.user) @@ -209,7 +221,6 @@ class PageStatusSidePanel(BaseStatusSidePanel): "workflow_history_url": reverse( "wagtailadmin_pages:workflow_history", args=(page.id,) ), - "usage_url": reverse("wagtailadmin_pages:usage", args=(page.id,)), "revisions_compare_url_name": "wagtailadmin_pages:revisions_compare", "lock_url": reverse("wagtailadmin_pages:lock", args=(page.id,)), "unlock_url": reverse("wagtailadmin_pages:unlock", args=(page.id,)),