Renamed wagtail.contrib.wagtailsearchpromotions to

wagtail.contrib.search_promotions

Conflicts:
	wagtail/contrib/search_promotions/forms.py
	wagtail/contrib/search_promotions/templatetags/wagtailsearchpromotions_tags.py
	wagtail/contrib/search_promotions/wagtail_hooks.py

.tx/config

@@ -68,8 +68,8 @@ source_lang = en
 type = PO
 
 [wagtail.wagtailsearchpromotions]
-file_filter = wagtail/contrib/wagtailsearchpromotions/locale/<lang>/LC_MESSAGES/django.po
-source_file = wagtail/contrib/wagtailsearchpromotions/locale/en/LC_MESSAGES/django.po
+file_filter = wagtail/contrib/search_promotions/locale/<lang>/LC_MESSAGES/django.po
+source_file = wagtail/contrib/search_promotions/locale/en/LC_MESSAGES/django.po
 source_lang = en
 type = PO
 

docs/editor_manual/administrator_tasks/promoted_search_results.rst

@@ -2,7 +2,7 @@ Promoted search results
 =======================
 
 .. Note::
-    Promoted search results are an optional Wagtail feature. For details of how to enable them on a Wagtail installation, see :mod:`~wagtail.contrib.wagtailsearchpromotions`
+    Promoted search results are an optional Wagtail feature. For details of how to enable them on a Wagtail installation, see :mod:`~wagtail.contrib.search_promotions`
 
 
 Wagtail allows you to promote certain search results dependant on the keyword or phrase entered by the user when searching. This can be particularly useful when users commonly refer to parts of your organisation via an acronym that isn't in official use, or if you want to direct users to a page that when they enter a certain term related to the page but not included in the text of the page itself.

docs/reference/contrib/searchpromotions.rst

@@ -4,7 +4,7 @@
 Promoted search results
 =======================
 
-.. module:: wagtail.contrib.wagtailsearchpromotions
+.. module:: wagtail.contrib.search_promotions
 
 .. versionchanged:: 1.1
 
@@ -18,7 +18,7 @@ The ``searchpromotions`` module provides the models and user interface for manag
 Installation
 ============
 
-The ``searchpromotions`` module is not enabled by default. To install it, add ``wagtail.contrib.wagtailsearchpromotions`` to ``INSTALLED_APPS`` in your project's Django settings file.
+The ``searchpromotions`` module is not enabled by default. To install it, add ``wagtail.contrib.search_promotions`` to ``INSTALLED_APPS`` in your project's Django settings file.
 
 
 .. code-block:: python
@@ -26,7 +26,7 @@ The ``searchpromotions`` module is not enabled by default. To install it, add ``
     INSTALLED_APPS = [
         ...
 
-        'wagtail.contrib.wagtailsearchpromotions',
+        'wagtail.contrib.search_promotions',
     ]
 
 This app contains migrations so make sure you run the ``migrate`` django-admin command after installing.

docs/topics/search/searching.rst

@@ -267,4 +267,4 @@ Promoted search results
 
 "Promoted search results" allow editors to explicitly link relevant content to search terms, so results pages can contain curated content in addition to results from the search engine.
 
-This functionality is provided by the :mod:`~wagtail.contrib.wagtailsearchpromotions` contrib module.
+This functionality is provided by the :mod:`~wagtail.contrib.search_promotions` contrib module.

wagtail/contrib/search_promotions/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'wagtail.contrib.search_promotions.apps.WagtailSearchPromotionsAppConfig'

wagtail/contrib/search_promotions/admin_urls.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.conf.urls import url
 
-from wagtail.contrib.wagtailsearchpromotions import views
+from wagtail.contrib.search_promotions import views
 
 app_name = 'wagtailsearchpromotions'
 urlpatterns = [

wagtail/contrib/search_promotions/apps.py

@@ -4,6 +4,6 @@ from django.apps import AppConfig
 
 
 class WagtailSearchPromotionsAppConfig(AppConfig):
-    name = 'wagtail.contrib.wagtailsearchpromotions'
+    name = 'wagtail.contrib.search_promotions'
     label = 'wagtailsearchpromotions'
     verbose_name = "Wagtail search promotions"

wagtail/contrib/search_promotions/forms.py

@@ -4,7 +4,7 @@ from django import forms
 from django.forms.models import inlineformset_factory
 from django.utils.translation import ugettext_lazy as _
 
-from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion
+from wagtail.contrib.search_promotions.models import SearchPromotion
 from wagtail.admin.widgets import AdminPageChooser
 from wagtail.search.models import Query
 

wagtail/contrib/search_promotions/templatetags/wagtailsearchpromotions_tags.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django import template
 
-from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion
+from wagtail.contrib.search_promotions.models import SearchPromotion
 from wagtail.search.models import Query
 
 register = template.Library()

wagtail/contrib/search_promotions/tests.py

@@ -3,8 +3,8 @@ from __future__ import absolute_import, unicode_literals
 from django.test import TestCase
 from django.urls import reverse
 
-from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion
-from wagtail.contrib.wagtailsearchpromotions.templatetags.wagtailsearchpromotions_tags import \
+from wagtail.contrib.search_promotions.models import SearchPromotion
+from wagtail.contrib.search_promotions.templatetags.wagtailsearchpromotions_tags import \
     get_search_promotions
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.search.models import Query

wagtail/contrib/search_promotions/views.py

@@ -5,7 +5,7 @@ from django.urls import reverse
 from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
 
-from wagtail.contrib.wagtailsearchpromotions import forms
+from wagtail.contrib.search_promotions import forms
 from wagtail.utils.pagination import paginate
 from wagtail.admin import messages
 from wagtail.admin.forms import SearchForm

wagtail/contrib/search_promotions/wagtail_hooks.py

@@ -5,7 +5,7 @@ from django.contrib.auth.models import Permission
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
-from wagtail.contrib.wagtailsearchpromotions import admin_urls
+from wagtail.contrib.search_promotions import admin_urls
 from wagtail.admin.menu import MenuItem
 from wagtail.core import hooks
 

wagtail/contrib/wagtailsearchpromotions/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'wagtail.contrib.wagtailsearchpromotions.apps.WagtailSearchPromotionsAppConfig'

wagtail/search/tests/test_queries.py

@@ -6,7 +6,7 @@ from io import StringIO
 from django.core import management
 from django.test import SimpleTestCase, TestCase
 
-from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion
+from wagtail.contrib.search_promotions.models import SearchPromotion
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.search import models
 from wagtail.search.utils import normalise_query_string, separate_filters_from_query