From b08d4dd83a03633b769054647f6717b46c7ce9c8 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 17 Nov 2017 11:35:23 +0000 Subject: [PATCH] Renamed wagtail.wagtailsites to wagtail.sites Conflicts: docs/advanced_topics/settings.rst docs/getting_started/integrating_into_django.rst wagtail/project_template/project_name/settings/base.py wagtail/sites/views.py wagtail/tests/settings.py --- .tx/config | 4 ++-- docs/advanced_topics/settings.rst | 4 ++-- docs/getting_started/integrating_into_django.rst | 2 +- .../project_template/project_name/settings/base.py | 2 +- wagtail/{wagtailsites => sites}/__init__.py | 0 wagtail/{wagtailsites => sites}/forms.py | 0 .../locale/ar/LC_MESSAGES/django.mo | Bin .../locale/ar/LC_MESSAGES/django.po | 0 .../locale/ca/LC_MESSAGES/django.mo | Bin .../locale/ca/LC_MESSAGES/django.po | 0 .../locale/cs/LC_MESSAGES/django.mo | Bin .../locale/cs/LC_MESSAGES/django.po | 0 .../locale/de/LC_MESSAGES/django.mo | Bin .../locale/de/LC_MESSAGES/django.po | 0 .../locale/el/LC_MESSAGES/django.mo | Bin .../locale/el/LC_MESSAGES/django.po | 0 .../locale/en/LC_MESSAGES/django.mo | Bin .../locale/en/LC_MESSAGES/django.po | 0 .../locale/es/LC_MESSAGES/django.mo | Bin .../locale/es/LC_MESSAGES/django.po | 0 .../locale/fa/LC_MESSAGES/django.mo | Bin .../locale/fa/LC_MESSAGES/django.po | 0 .../locale/fi/LC_MESSAGES/django.mo | Bin .../locale/fi/LC_MESSAGES/django.po | 0 .../locale/fr/LC_MESSAGES/django.mo | Bin .../locale/fr/LC_MESSAGES/django.po | 0 .../locale/gl/LC_MESSAGES/django.mo | Bin .../locale/gl/LC_MESSAGES/django.po | 0 .../locale/he_IL/LC_MESSAGES/django.mo | Bin .../locale/he_IL/LC_MESSAGES/django.po | 0 .../locale/hu/LC_MESSAGES/django.mo | Bin .../locale/hu/LC_MESSAGES/django.po | 0 .../locale/id_ID/LC_MESSAGES/django.mo | Bin .../locale/id_ID/LC_MESSAGES/django.po | 0 .../locale/is_IS/LC_MESSAGES/django.mo | Bin .../locale/is_IS/LC_MESSAGES/django.po | 0 .../locale/it/LC_MESSAGES/django.mo | Bin .../locale/it/LC_MESSAGES/django.po | 0 .../locale/ja/LC_MESSAGES/django.mo | Bin .../locale/ja/LC_MESSAGES/django.po | 0 .../locale/ka/LC_MESSAGES/django.mo | Bin .../locale/ka/LC_MESSAGES/django.po | 0 .../locale/ko/LC_MESSAGES/django.mo | Bin .../locale/ko/LC_MESSAGES/django.po | 0 .../locale/lt/LC_MESSAGES/django.mo | Bin .../locale/lt/LC_MESSAGES/django.po | 0 .../locale/lv/LC_MESSAGES/django.mo | Bin .../locale/lv/LC_MESSAGES/django.po | 0 .../locale/nb/LC_MESSAGES/django.mo | Bin .../locale/nb/LC_MESSAGES/django.po | 0 .../locale/nl/LC_MESSAGES/django.mo | Bin .../locale/nl/LC_MESSAGES/django.po | 0 .../locale/nl_NL/LC_MESSAGES/django.mo | Bin .../locale/nl_NL/LC_MESSAGES/django.po | 0 .../locale/pl/LC_MESSAGES/django.mo | Bin .../locale/pl/LC_MESSAGES/django.po | 0 .../locale/pt_BR/LC_MESSAGES/django.mo | Bin .../locale/pt_BR/LC_MESSAGES/django.po | 0 .../locale/pt_PT/LC_MESSAGES/django.mo | Bin .../locale/pt_PT/LC_MESSAGES/django.po | 0 .../locale/ro/LC_MESSAGES/django.mo | Bin .../locale/ro/LC_MESSAGES/django.po | 0 .../locale/ru/LC_MESSAGES/django.mo | Bin .../locale/ru/LC_MESSAGES/django.po | 0 .../locale/sk_SK/LC_MESSAGES/django.mo | Bin .../locale/sk_SK/LC_MESSAGES/django.po | 0 .../locale/sl/LC_MESSAGES/django.mo | Bin .../locale/sl/LC_MESSAGES/django.po | 0 .../locale/sv/LC_MESSAGES/django.mo | Bin .../locale/sv/LC_MESSAGES/django.po | 0 .../locale/tr/LC_MESSAGES/django.mo | Bin .../locale/tr/LC_MESSAGES/django.po | 0 .../locale/zh_CN/LC_MESSAGES/django.mo | Bin .../locale/zh_CN/LC_MESSAGES/django.po | 0 .../templates/wagtailsites/create.html | 0 .../templates/wagtailsites/edit.html | 0 .../templates/wagtailsites/index.html | 0 wagtail/{wagtailsites => sites}/tests.py | 0 wagtail/{wagtailsites => sites}/views.py | 2 +- wagtail/{wagtailsites => sites}/wagtail_hooks.py | 0 wagtail/tests/settings.py | 2 +- 81 files changed, 8 insertions(+), 8 deletions(-) rename wagtail/{wagtailsites => sites}/__init__.py (100%) rename wagtail/{wagtailsites => sites}/forms.py (100%) rename wagtail/{wagtailsites => sites}/locale/ar/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/ar/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/ca/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/ca/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/cs/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/cs/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/de/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/de/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/el/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/el/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/en/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/en/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/es/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/es/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/fa/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/fa/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/fi/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/fi/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/fr/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/fr/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/gl/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/gl/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/he_IL/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/he_IL/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/hu/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/hu/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/id_ID/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/id_ID/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/is_IS/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/is_IS/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/it/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/it/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/ja/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/ja/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/ka/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/ka/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/ko/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/ko/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/lt/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/lt/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/lv/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/lv/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/nb/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/nb/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/nl/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/nl/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/nl_NL/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/nl_NL/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/pl/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/pl/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/pt_BR/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/pt_BR/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/pt_PT/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/pt_PT/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/ro/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/ro/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/ru/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/ru/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/sk_SK/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/sk_SK/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/sl/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/sl/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/sv/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/sv/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/tr/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/tr/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/locale/zh_CN/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailsites => sites}/locale/zh_CN/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailsites => sites}/templates/wagtailsites/create.html (100%) rename wagtail/{wagtailsites => sites}/templates/wagtailsites/edit.html (100%) rename wagtail/{wagtailsites => sites}/templates/wagtailsites/index.html (100%) rename wagtail/{wagtailsites => sites}/tests.py (100%) rename wagtail/{wagtailsites => sites}/views.py (97%) rename wagtail/{wagtailsites => sites}/wagtail_hooks.py (100%) diff --git a/.tx/config b/.tx/config index 5b098dc84a..537a992d07 100644 --- a/.tx/config +++ b/.tx/config @@ -62,8 +62,8 @@ source_lang = en type = PO [wagtail.wagtailsites] -file_filter = wagtail/wagtailsites/locale//LC_MESSAGES/django.po -source_file = wagtail/wagtailsites/locale/en/LC_MESSAGES/django.po +file_filter = wagtail/sites/locale//LC_MESSAGES/django.po +source_file = wagtail/sites/locale/en/LC_MESSAGES/django.po source_lang = en type = PO diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst index 248b177e45..9ccb47fe30 100644 --- a/docs/advanced_topics/settings.rst +++ b/docs/advanced_topics/settings.rst @@ -63,7 +63,7 @@ Apps (``settings.py``) 'wagtail.wagtailforms', 'wagtail.wagtailredirects', 'wagtail.embeds', - 'wagtail.wagtailsites', + 'wagtail.sites', 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', 'wagtail.documents', @@ -505,7 +505,7 @@ These two files should reside in your project directory (``myproject/myproject/` 'wagtail.wagtailforms', 'wagtail.wagtailredirects', 'wagtail.embeds', - 'wagtail.wagtailsites', + 'wagtail.sites', 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', 'wagtail.documents', diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index 852185fcd5..941a52e231 100644 --- a/docs/getting_started/integrating_into_django.rst +++ b/docs/getting_started/integrating_into_django.rst @@ -23,7 +23,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``: 'wagtail.wagtailforms', 'wagtail.wagtailredirects', 'wagtail.embeds', - 'wagtail.wagtailsites', + 'wagtail.sites', 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', 'wagtail.documents', diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py index b235837a38..3e42521fd6 100644 --- a/wagtail/project_template/project_name/settings/base.py +++ b/wagtail/project_template/project_name/settings/base.py @@ -32,7 +32,7 @@ INSTALLED_APPS = [ 'wagtail.wagtailforms', 'wagtail.wagtailredirects', 'wagtail.embeds', - 'wagtail.wagtailsites', + 'wagtail.sites', 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', 'wagtail.documents', diff --git a/wagtail/wagtailsites/__init__.py b/wagtail/sites/__init__.py similarity index 100% rename from wagtail/wagtailsites/__init__.py rename to wagtail/sites/__init__.py diff --git a/wagtail/wagtailsites/forms.py b/wagtail/sites/forms.py similarity index 100% rename from wagtail/wagtailsites/forms.py rename to wagtail/sites/forms.py diff --git a/wagtail/wagtailsites/locale/ar/LC_MESSAGES/django.mo b/wagtail/sites/locale/ar/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/ar/LC_MESSAGES/django.mo rename to wagtail/sites/locale/ar/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/ar/LC_MESSAGES/django.po b/wagtail/sites/locale/ar/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/ar/LC_MESSAGES/django.po rename to wagtail/sites/locale/ar/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/ca/LC_MESSAGES/django.mo b/wagtail/sites/locale/ca/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/ca/LC_MESSAGES/django.mo rename to wagtail/sites/locale/ca/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/ca/LC_MESSAGES/django.po b/wagtail/sites/locale/ca/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/ca/LC_MESSAGES/django.po rename to wagtail/sites/locale/ca/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/cs/LC_MESSAGES/django.mo b/wagtail/sites/locale/cs/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/cs/LC_MESSAGES/django.mo rename to wagtail/sites/locale/cs/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/cs/LC_MESSAGES/django.po b/wagtail/sites/locale/cs/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/cs/LC_MESSAGES/django.po rename to wagtail/sites/locale/cs/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/de/LC_MESSAGES/django.mo b/wagtail/sites/locale/de/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/de/LC_MESSAGES/django.mo rename to wagtail/sites/locale/de/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/de/LC_MESSAGES/django.po b/wagtail/sites/locale/de/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/de/LC_MESSAGES/django.po rename to wagtail/sites/locale/de/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/el/LC_MESSAGES/django.mo b/wagtail/sites/locale/el/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/el/LC_MESSAGES/django.mo rename to wagtail/sites/locale/el/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/el/LC_MESSAGES/django.po b/wagtail/sites/locale/el/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/el/LC_MESSAGES/django.po rename to wagtail/sites/locale/el/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/en/LC_MESSAGES/django.mo b/wagtail/sites/locale/en/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/en/LC_MESSAGES/django.mo rename to wagtail/sites/locale/en/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/en/LC_MESSAGES/django.po b/wagtail/sites/locale/en/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/en/LC_MESSAGES/django.po rename to wagtail/sites/locale/en/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/es/LC_MESSAGES/django.mo b/wagtail/sites/locale/es/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/es/LC_MESSAGES/django.mo rename to wagtail/sites/locale/es/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/es/LC_MESSAGES/django.po b/wagtail/sites/locale/es/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/es/LC_MESSAGES/django.po rename to wagtail/sites/locale/es/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/fa/LC_MESSAGES/django.mo b/wagtail/sites/locale/fa/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/fa/LC_MESSAGES/django.mo rename to wagtail/sites/locale/fa/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/fa/LC_MESSAGES/django.po b/wagtail/sites/locale/fa/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/fa/LC_MESSAGES/django.po rename to wagtail/sites/locale/fa/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/fi/LC_MESSAGES/django.mo b/wagtail/sites/locale/fi/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/fi/LC_MESSAGES/django.mo rename to wagtail/sites/locale/fi/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/fi/LC_MESSAGES/django.po b/wagtail/sites/locale/fi/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/fi/LC_MESSAGES/django.po rename to wagtail/sites/locale/fi/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/fr/LC_MESSAGES/django.mo b/wagtail/sites/locale/fr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/fr/LC_MESSAGES/django.mo rename to wagtail/sites/locale/fr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/fr/LC_MESSAGES/django.po b/wagtail/sites/locale/fr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/fr/LC_MESSAGES/django.po rename to wagtail/sites/locale/fr/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/gl/LC_MESSAGES/django.mo b/wagtail/sites/locale/gl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/gl/LC_MESSAGES/django.mo rename to wagtail/sites/locale/gl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/gl/LC_MESSAGES/django.po b/wagtail/sites/locale/gl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/gl/LC_MESSAGES/django.po rename to wagtail/sites/locale/gl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/he_IL/LC_MESSAGES/django.mo b/wagtail/sites/locale/he_IL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/he_IL/LC_MESSAGES/django.mo rename to wagtail/sites/locale/he_IL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/he_IL/LC_MESSAGES/django.po b/wagtail/sites/locale/he_IL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/he_IL/LC_MESSAGES/django.po rename to wagtail/sites/locale/he_IL/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/hu/LC_MESSAGES/django.mo b/wagtail/sites/locale/hu/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/hu/LC_MESSAGES/django.mo rename to wagtail/sites/locale/hu/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/hu/LC_MESSAGES/django.po b/wagtail/sites/locale/hu/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/hu/LC_MESSAGES/django.po rename to wagtail/sites/locale/hu/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/id_ID/LC_MESSAGES/django.mo b/wagtail/sites/locale/id_ID/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/id_ID/LC_MESSAGES/django.mo rename to wagtail/sites/locale/id_ID/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/id_ID/LC_MESSAGES/django.po b/wagtail/sites/locale/id_ID/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/id_ID/LC_MESSAGES/django.po rename to wagtail/sites/locale/id_ID/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/is_IS/LC_MESSAGES/django.mo b/wagtail/sites/locale/is_IS/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/is_IS/LC_MESSAGES/django.mo rename to wagtail/sites/locale/is_IS/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/is_IS/LC_MESSAGES/django.po b/wagtail/sites/locale/is_IS/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/is_IS/LC_MESSAGES/django.po rename to wagtail/sites/locale/is_IS/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/it/LC_MESSAGES/django.mo b/wagtail/sites/locale/it/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/it/LC_MESSAGES/django.mo rename to wagtail/sites/locale/it/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/it/LC_MESSAGES/django.po b/wagtail/sites/locale/it/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/it/LC_MESSAGES/django.po rename to wagtail/sites/locale/it/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/ja/LC_MESSAGES/django.mo b/wagtail/sites/locale/ja/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/ja/LC_MESSAGES/django.mo rename to wagtail/sites/locale/ja/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/ja/LC_MESSAGES/django.po b/wagtail/sites/locale/ja/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/ja/LC_MESSAGES/django.po rename to wagtail/sites/locale/ja/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/ka/LC_MESSAGES/django.mo b/wagtail/sites/locale/ka/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/ka/LC_MESSAGES/django.mo rename to wagtail/sites/locale/ka/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/ka/LC_MESSAGES/django.po b/wagtail/sites/locale/ka/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/ka/LC_MESSAGES/django.po rename to wagtail/sites/locale/ka/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/ko/LC_MESSAGES/django.mo b/wagtail/sites/locale/ko/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/ko/LC_MESSAGES/django.mo rename to wagtail/sites/locale/ko/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/ko/LC_MESSAGES/django.po b/wagtail/sites/locale/ko/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/ko/LC_MESSAGES/django.po rename to wagtail/sites/locale/ko/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/lt/LC_MESSAGES/django.mo b/wagtail/sites/locale/lt/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/lt/LC_MESSAGES/django.mo rename to wagtail/sites/locale/lt/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/lt/LC_MESSAGES/django.po b/wagtail/sites/locale/lt/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/lt/LC_MESSAGES/django.po rename to wagtail/sites/locale/lt/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/lv/LC_MESSAGES/django.mo b/wagtail/sites/locale/lv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/lv/LC_MESSAGES/django.mo rename to wagtail/sites/locale/lv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/lv/LC_MESSAGES/django.po b/wagtail/sites/locale/lv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/lv/LC_MESSAGES/django.po rename to wagtail/sites/locale/lv/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/nb/LC_MESSAGES/django.mo b/wagtail/sites/locale/nb/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/nb/LC_MESSAGES/django.mo rename to wagtail/sites/locale/nb/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/nb/LC_MESSAGES/django.po b/wagtail/sites/locale/nb/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/nb/LC_MESSAGES/django.po rename to wagtail/sites/locale/nb/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/nl/LC_MESSAGES/django.mo b/wagtail/sites/locale/nl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/nl/LC_MESSAGES/django.mo rename to wagtail/sites/locale/nl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/nl/LC_MESSAGES/django.po b/wagtail/sites/locale/nl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/nl/LC_MESSAGES/django.po rename to wagtail/sites/locale/nl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/nl_NL/LC_MESSAGES/django.mo b/wagtail/sites/locale/nl_NL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/nl_NL/LC_MESSAGES/django.mo rename to wagtail/sites/locale/nl_NL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/nl_NL/LC_MESSAGES/django.po b/wagtail/sites/locale/nl_NL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/nl_NL/LC_MESSAGES/django.po rename to wagtail/sites/locale/nl_NL/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/pl/LC_MESSAGES/django.mo b/wagtail/sites/locale/pl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/pl/LC_MESSAGES/django.mo rename to wagtail/sites/locale/pl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/pl/LC_MESSAGES/django.po b/wagtail/sites/locale/pl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/pl/LC_MESSAGES/django.po rename to wagtail/sites/locale/pl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/pt_BR/LC_MESSAGES/django.mo b/wagtail/sites/locale/pt_BR/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/pt_BR/LC_MESSAGES/django.mo rename to wagtail/sites/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/pt_BR/LC_MESSAGES/django.po b/wagtail/sites/locale/pt_BR/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/pt_BR/LC_MESSAGES/django.po rename to wagtail/sites/locale/pt_BR/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/pt_PT/LC_MESSAGES/django.mo b/wagtail/sites/locale/pt_PT/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/pt_PT/LC_MESSAGES/django.mo rename to wagtail/sites/locale/pt_PT/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/pt_PT/LC_MESSAGES/django.po b/wagtail/sites/locale/pt_PT/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/pt_PT/LC_MESSAGES/django.po rename to wagtail/sites/locale/pt_PT/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/ro/LC_MESSAGES/django.mo b/wagtail/sites/locale/ro/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/ro/LC_MESSAGES/django.mo rename to wagtail/sites/locale/ro/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/ro/LC_MESSAGES/django.po b/wagtail/sites/locale/ro/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/ro/LC_MESSAGES/django.po rename to wagtail/sites/locale/ro/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/ru/LC_MESSAGES/django.mo b/wagtail/sites/locale/ru/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/ru/LC_MESSAGES/django.mo rename to wagtail/sites/locale/ru/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/ru/LC_MESSAGES/django.po b/wagtail/sites/locale/ru/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/ru/LC_MESSAGES/django.po rename to wagtail/sites/locale/ru/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/sk_SK/LC_MESSAGES/django.mo b/wagtail/sites/locale/sk_SK/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/sk_SK/LC_MESSAGES/django.mo rename to wagtail/sites/locale/sk_SK/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/sk_SK/LC_MESSAGES/django.po b/wagtail/sites/locale/sk_SK/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/sk_SK/LC_MESSAGES/django.po rename to wagtail/sites/locale/sk_SK/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/sl/LC_MESSAGES/django.mo b/wagtail/sites/locale/sl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/sl/LC_MESSAGES/django.mo rename to wagtail/sites/locale/sl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/sl/LC_MESSAGES/django.po b/wagtail/sites/locale/sl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/sl/LC_MESSAGES/django.po rename to wagtail/sites/locale/sl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/sv/LC_MESSAGES/django.mo b/wagtail/sites/locale/sv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/sv/LC_MESSAGES/django.mo rename to wagtail/sites/locale/sv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/sv/LC_MESSAGES/django.po b/wagtail/sites/locale/sv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/sv/LC_MESSAGES/django.po rename to wagtail/sites/locale/sv/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/tr/LC_MESSAGES/django.mo b/wagtail/sites/locale/tr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/tr/LC_MESSAGES/django.mo rename to wagtail/sites/locale/tr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/tr/LC_MESSAGES/django.po b/wagtail/sites/locale/tr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/tr/LC_MESSAGES/django.po rename to wagtail/sites/locale/tr/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/locale/zh_CN/LC_MESSAGES/django.mo b/wagtail/sites/locale/zh_CN/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsites/locale/zh_CN/LC_MESSAGES/django.mo rename to wagtail/sites/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsites/locale/zh_CN/LC_MESSAGES/django.po b/wagtail/sites/locale/zh_CN/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsites/locale/zh_CN/LC_MESSAGES/django.po rename to wagtail/sites/locale/zh_CN/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsites/templates/wagtailsites/create.html b/wagtail/sites/templates/wagtailsites/create.html similarity index 100% rename from wagtail/wagtailsites/templates/wagtailsites/create.html rename to wagtail/sites/templates/wagtailsites/create.html diff --git a/wagtail/wagtailsites/templates/wagtailsites/edit.html b/wagtail/sites/templates/wagtailsites/edit.html similarity index 100% rename from wagtail/wagtailsites/templates/wagtailsites/edit.html rename to wagtail/sites/templates/wagtailsites/edit.html diff --git a/wagtail/wagtailsites/templates/wagtailsites/index.html b/wagtail/sites/templates/wagtailsites/index.html similarity index 100% rename from wagtail/wagtailsites/templates/wagtailsites/index.html rename to wagtail/sites/templates/wagtailsites/index.html diff --git a/wagtail/wagtailsites/tests.py b/wagtail/sites/tests.py similarity index 100% rename from wagtail/wagtailsites/tests.py rename to wagtail/sites/tests.py diff --git a/wagtail/wagtailsites/views.py b/wagtail/sites/views.py similarity index 97% rename from wagtail/wagtailsites/views.py rename to wagtail/sites/views.py index a8ee55fc90..b2bbf784eb 100644 --- a/wagtail/wagtailsites/views.py +++ b/wagtail/sites/views.py @@ -6,7 +6,7 @@ from wagtail.admin.views import generic from wagtail.admin.viewsets.model import ModelViewSet from wagtail.core.models import Site from wagtail.core.permissions import site_permission_policy -from wagtail.wagtailsites.forms import SiteForm +from wagtail.sites.forms import SiteForm class IndexView(generic.IndexView): diff --git a/wagtail/wagtailsites/wagtail_hooks.py b/wagtail/sites/wagtail_hooks.py similarity index 100% rename from wagtail/wagtailsites/wagtail_hooks.py rename to wagtail/sites/wagtail_hooks.py diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index 6cfa288464..8a28824b22 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -122,7 +122,7 @@ INSTALLED_APPS = ( 'wagtail.search', 'wagtail.embeds', 'wagtail.images', - 'wagtail.wagtailsites', + 'wagtail.sites', 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', 'wagtail.documents',