Add locale labels in search results

jozo · Jan 13, 2022 · 85e5864 · 85e5864
1 parent 6f5fa46
commit 85e5864
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/wagtail/admin/templates/wagtailadmin/pages/search_results.html b/wagtail/admin/templates/wagtailadmin/pages/search_results.html
@@ -32,7 +32,7 @@ <h3 id="page-types-title" class="filter-title">{% trans "Page types" %}</h3>
             </nav>
         {% endif %}
 
-        {% include "wagtailadmin/pages/listing/_list_explore.html" with show_parent=1 sortable=1 sortable_by_type=0 show_bulk_actions=1 %}
+        {% include "wagtailadmin/pages/listing/_list_explore.html" with show_parent=1 sortable=1 sortable_by_type=0 show_bulk_actions=1 show_locale_labels=show_locale_labels %}
 
         {% url 'wagtailadmin_pages:search' as pagination_base_url %}
         {% paginate pages base_url=pagination_base_url %}

diff --git a/wagtail/admin/views/pages/search.py b/wagtail/admin/views/pages/search.py
@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.paginator import Paginator
 from django.http import Http404
@@ -41,6 +42,11 @@ def page_filter_search(q, pages, all_pages=None, ordering=None):
 @user_passes_test(user_has_any_page_permission)
 def search(request):
     pages = all_pages = Page.objects.all().prefetch_related('content_type').specific()
+    show_locale_labels = getattr(settings, 'WAGTAIL_I18N_ENABLED', False)
+    if show_locale_labels:
+        pages = pages.select_related('locale')
+        all_pages = all_pages.select_related('locale')
+
     q = MATCH_ALL
     content_types = []
     pagination_query_params = QueryDict({}, mutable=True)
@@ -113,6 +119,7 @@ def search(request):
             'selected_content_type': selected_content_type,
             'ordering': ordering,
             'pagination_query_params': pagination_query_params.urlencode(),
+            'show_locale_labels': show_locale_labels,
         })
     else:
         return TemplateResponse(request, "wagtailadmin/pages/search.html", {
@@ -124,4 +131,5 @@ def search(request):
             'selected_content_type': selected_content_type,
             'ordering': ordering,
             'pagination_query_params': pagination_query_params.urlencode(),
+            'show_locale_labels': show_locale_labels,
         })