diff --git a/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/list.html b/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/list.html index 4a1c557105..6c241b5838 100644 --- a/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/list.html +++ b/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/list.html @@ -99,11 +99,11 @@ {% if sessions.0.revision_id %} <template data-controller="w-teleport" data-w-teleport-target-value="#title-text-w-overwrite-changes-dialog" data-w-teleport-reset-value="true"> {% if current_session.user == sessions.0.user %} - {% blocktranslate trimmed with model_name=_("page") asvar someone_has_saved_message %} + {% blocktranslate trimmed with model_name=content_type.name asvar someone_has_saved_message %} You have saved a newer version of this {{ model_name }} in another session {% endblocktranslate %} {% else %} - {% blocktranslate trimmed with user_name=sessions.0.user|user_display_name|default:_("system") model_name=_("page") asvar someone_has_saved_message %} + {% blocktranslate trimmed with user_name=sessions.0.user|user_display_name|default:_("system") model_name=content_type.name asvar someone_has_saved_message %} {{ user_name }} has saved a newer version of this {{ model_name }} {% endblocktranslate %} {% endif %} diff --git a/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/module.html b/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/module.html index 615c706a15..30125b7171 100644 --- a/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/module.html +++ b/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/module.html @@ -7,7 +7,7 @@ </div> {% enddialog %} -{% blocktranslate trimmed with user_name=_("system") model_name=_("page") asvar someone_has_saved_message %} +{% blocktranslate trimmed with user_name=_("system") model_name=content_type.name asvar someone_has_saved_message %} {{ user_name }} has saved a newer version of this {{ model_name }} {% endblocktranslate %} diff --git a/wagtail/admin/ui/editing_sessions.py b/wagtail/admin/ui/editing_sessions.py index a6e026f882..90047495c2 100644 --- a/wagtail/admin/ui/editing_sessions.py +++ b/wagtail/admin/ui/editing_sessions.py @@ -10,12 +10,16 @@ class EditingSessionsModule(Component): ping_url, release_url, other_sessions, + content_type, revision_id=None, ): self.current_session = current_session self.ping_url = ping_url self.release_url = release_url - self.sessions_list = EditingSessionsList(current_session, other_sessions) + self.sessions_list = EditingSessionsList( + current_session, other_sessions, content_type + ) + self.content_type = content_type self.revision_id = revision_id def get_context_data(self, parent_context): @@ -24,6 +28,7 @@ class EditingSessionsModule(Component): "ping_url": self.ping_url, "release_url": self.release_url, "sessions_list": self.sessions_list, + "content_type": self.content_type, "revision_id": self.revision_id, } @@ -31,9 +36,14 @@ class EditingSessionsModule(Component): class EditingSessionsList(Component): template_name = "wagtailadmin/shared/editing_sessions/list.html" - def __init__(self, current_session, other_sessions): + def __init__(self, current_session, other_sessions, content_type): self.current_session = current_session self.sessions = other_sessions + self.content_type = content_type def get_context_data(self, parent_context): - return {"current_session": self.current_session, "sessions": self.sessions} + return { + "current_session": self.current_session, + "sessions": self.sessions, + "content_type": self.content_type, + } diff --git a/wagtail/admin/views/editing_sessions.py b/wagtail/admin/views/editing_sessions.py index 93eeefb4f0..8a02e1491e 100644 --- a/wagtail/admin/views/editing_sessions.py +++ b/wagtail/admin/views/editing_sessions.py @@ -180,7 +180,9 @@ def ping(request, app_label, model_name, object_id, session_id): } for other_session in other_sessions ], - "html": EditingSessionsList(session, other_sessions).render_html(), + "html": EditingSessionsList( + session, other_sessions, content_type + ).render_html(), } ) diff --git a/wagtail/admin/views/generic/mixins.py b/wagtail/admin/views/generic/mixins.py index 3013b012e4..2d5f7a5796 100644 --- a/wagtail/admin/views/generic/mixins.py +++ b/wagtail/admin/views/generic/mixins.py @@ -713,6 +713,7 @@ class CreateEditViewOptionalFeaturesMixin: args=(session.id,), ), [], + content_type, revision_id, ) diff --git a/wagtail/admin/views/pages/edit.py b/wagtail/admin/views/pages/edit.py index 98e6dafda8..9dd9f0274d 100644 --- a/wagtail/admin/views/pages/edit.py +++ b/wagtail/admin/views/pages/edit.py @@ -901,6 +901,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View): args=(session.id,), ), [], + content_type, self.page.latest_revision_id, )