From cd0cec99a59320d55ab1c130e7c3af524e386758 Mon Sep 17 00:00:00 2001 From: Mike Dingjan Date: Wed, 13 Mar 2019 17:13:07 +0100 Subject: [PATCH 1/2] Remove WAGTAILTRANS_LANGUAGES_PER_SITE setting from codebase For the edge case users are depending on this setting in other code (copied or not) display a warning when this gets called. --- src/wagtailtrans/conf.py | 7 ++- src/wagtailtrans/managers.py | 6 +-- src/wagtailtrans/middleware.py | 6 ++- src/wagtailtrans/models.py | 83 +++++++------------------------ src/wagtailtrans/permissions.py | 9 ++-- src/wagtailtrans/signals.py | 30 ++++------- src/wagtailtrans/sites.py | 12 ++--- src/wagtailtrans/wagtail_hooks.py | 15 +++--- 8 files changed, 55 insertions(+), 113 deletions(-) diff --git a/src/wagtailtrans/conf.py b/src/wagtailtrans/conf.py index 8d205884..c493f088 100644 --- a/src/wagtailtrans/conf.py +++ b/src/wagtailtrans/conf.py @@ -1,11 +1,16 @@ +import logging + from django.conf import settings +logger = logging.getLogger(__name__) + DEFAULT_SETTINGS = { 'SYNC_TREE': True, - 'LANGUAGES_PER_SITE': False, 'HIDE_TRANSLATION_TREES': False, } def get_wagtailtrans_setting(name): + if name == "LANGUAGES_PER_SITE": + logger.warning("WAGTAILTRANS_LANGUAGES_PER_SITE is removed, please update your code.") return getattr(settings, 'WAGTAILTRANS_{}'.format(name), DEFAULT_SETTINGS[name]) diff --git a/src/wagtailtrans/managers.py b/src/wagtailtrans/managers.py index 39967262..07059ac5 100644 --- a/src/wagtailtrans/managers.py +++ b/src/wagtailtrans/managers.py @@ -1,7 +1,5 @@ from django.db import models -from .conf import get_wagtailtrans_setting - class LanguageManager(models.Manager): """Custom manager for the `Language` model.""" @@ -16,6 +14,4 @@ def default(self): def default_for_site(self, site): """Return default language for site""" - if get_wagtailtrans_setting('LANGUAGES_PER_SITE'): - return self.filter(site_default_language__site=site).first() - return self.default() + return self.filter(site_default_language__site=site).first() diff --git a/src/wagtailtrans/middleware.py b/src/wagtailtrans/middleware.py index fb6f9e3a..cffbc7a8 100644 --- a/src/wagtailtrans/middleware.py +++ b/src/wagtailtrans/middleware.py @@ -1,8 +1,10 @@ from django.conf import settings from django.utils import translation from django.utils.deprecation import MiddlewareMixin -from django.utils.translation import LANGUAGE_SESSION_KEY, check_for_language, get_language_from_path -from django.utils.translation.trans_real import get_languages, get_supported_language_variant +from django.utils.translation import (LANGUAGE_SESSION_KEY, check_for_language, + get_language_from_path) +from django.utils.translation.trans_real import (get_languages, + get_supported_language_variant) from .models import Language from .sites import get_languages_for_site diff --git a/src/wagtailtrans/models.py b/src/wagtailtrans/models.py index 69d7a232..ddfd783b 100644 --- a/src/wagtailtrans/models.py +++ b/src/wagtailtrans/models.py @@ -11,7 +11,6 @@ from django.utils.functional import cached_property from django.utils.translation import activate from django.utils.translation import ugettext_lazy as _ - from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel, PageChooserPanel from wagtail.admin.forms import WagtailAdminModelForm, WagtailAdminPageForm from wagtail.contrib.settings.models import BaseSetting @@ -37,7 +36,6 @@ class WagtailAdminLanguageForm(WagtailAdminModelForm): class Meta: fields = [ 'code', - 'is_default', 'position', 'live', ] @@ -48,42 +46,6 @@ def __init__(self, *args, **kwargs): sorted_choices = sorted(self.fields['code'].choices, key=itemgetter(1)) self.fields['code'].choices = sorted_choices - def clean_is_default(self): - is_default = self.cleaned_data['is_default'] - - if self.initial.get('is_default') and not is_default: - raise ValidationError(_( - "You can not remove is_default from a language. To change the " - "default language, select is_default on a different language")) - - return is_default - - def save(self, commit=True): - is_default = self.cleaned_data.get('is_default', False) - if ( - not self.initial.get('is_default') == is_default and - is_default and - not get_wagtailtrans_setting('LANGUAGES_PER_SITE') - ): - from wagtailtrans.utils.language_switch import change_default_language # noqa - change_default_language(self.instance) - return super().save(commit=commit) - - -def get_language_panels(): - children = [ - FieldPanel('code'), - FieldPanel('position'), - FieldPanel('live'), - ] - - if not get_wagtailtrans_setting('LANGUAGES_PER_SITE'): - children.insert(1, FieldPanel('is_default')) - - return [ - MultiFieldPanel(heading=_("Language details"), children=children), - ] - class Language(models.Model): """User defined language.""" @@ -100,7 +62,13 @@ class Language(models.Model): objects = LanguageManager() base_form_class = WagtailAdminLanguageForm - panels = get_language_panels() + panels = [ + MultiFieldPanel(heading=_("Language details"), children=[ + FieldPanel('code'), + FieldPanel('position'), + FieldPanel('live'), + ]) + ] class Meta: ordering = ['position'] @@ -110,9 +78,6 @@ class Meta: def __str__(self): return force_text(dict(settings.LANGUAGES).get(self.code)) - def has_pages_in_site(self, site): - return self.pages.filter(path__startswith=site.root_page.path).exists() - class AdminTranslatablePageForm(WagtailAdminPageForm): """Form to be used in the wagtail admin.""" @@ -183,12 +148,9 @@ def move(self, target, pos=None, suppress_sync=False): """ super().move(target, pos) - if get_wagtailtrans_setting('LANGUAGES_PER_SITE'): - site = self.get_site() - lang_settings = SiteLanguages.for_site(site) - is_default = lang_settings.default_language == self.language - else: - is_default = self.language.is_default + site = self.get_site() + lang_settings = SiteLanguages.for_site(site) + is_default = lang_settings.default_language == self.language if not suppress_sync and get_wagtailtrans_setting('SYNC_TREE') and is_default: self.move_translated_pages(canonical_target=target, pos=pos) @@ -247,15 +209,15 @@ def has_translation(self, language): def get_translation_parent(self, language): site = self.get_site() - if not language.has_pages_in_site(site): - return site.root_page - translation_parent = ( TranslatablePage.objects - .filter(canonical_page=self.get_parent(), language=language, path__startswith=site.root_page.path) + .in_site(site) + .filter(canonical_page=self.get_parent(), language=language) + .order_by('path') .first() ) - return translation_parent + + return translation_parent or site.root_page def create_translation(self, language, copy_fields=False, parent=None): """Create a translation for this page. If tree syncing is enabled the @@ -354,9 +316,8 @@ def serve(self, request, *args, **kwargs): def page_permissions_for_user(self, user): """Patch for the page permissions adding our custom proxy - Note: Since wagtail doesn't call this method on the - specific page we need to patch the default page - implementation for this. + Note: Since wagtail doesn't call this method on the specific page we need to patch + the default page implementation for this. :param user: User instance :return: user permissions for page @@ -389,15 +350,7 @@ def save(self, commit=True): return super().save(commit=commit) -def register_site_languages(): - def decorate(func): - if get_wagtailtrans_setting('LANGUAGES_PER_SITE'): - return register_setting(func) - return func - return decorate - - -@register_site_languages() +@register_setting() class SiteLanguages(BaseSetting): """Site specific settings are stored in the database""" default_language = models.ForeignKey( diff --git a/src/wagtailtrans/permissions.py b/src/wagtailtrans/permissions.py index 34dfa48a..8e9d9b60 100644 --- a/src/wagtailtrans/permissions.py +++ b/src/wagtailtrans/permissions.py @@ -1,7 +1,7 @@ from django.contrib.auth.models import Group, Permission -from wagtail.core.models import ( - Collection, GroupCollectionPermission, GroupPagePermission, - PagePermissionTester, UserPagePermissionsProxy) +from wagtail.core.models import (Collection, GroupCollectionPermission, + GroupPagePermission, PagePermissionTester, + UserPagePermissionsProxy) from wagtailtrans.conf import get_wagtailtrans_setting @@ -31,8 +31,7 @@ def create_group_permissions(group, language): 'access_admin', 'wagtailadmin', 'admin' )) - collection = Collection.objects.filter( - name='collection-%s' % language.code).first() + collection = Collection.objects.filter(name='collection-%s' % language.code).first() if not collection: root = Collection.objects.first().get_root() collection = root.add_child(name='collection-%s' % language.code) diff --git a/src/wagtailtrans/signals.py b/src/wagtailtrans/signals.py index 8c8ae961..36476fe0 100644 --- a/src/wagtailtrans/signals.py +++ b/src/wagtailtrans/signals.py @@ -3,9 +3,9 @@ from django.core.exceptions import ObjectDoesNotExist from django.db.models.signals import m2m_changed, post_save, pre_delete - from wagtail.admin.signals import init_new_page from wagtail.core.models import Site, get_page_models + from wagtailtrans.conf import get_wagtailtrans_setting from wagtailtrans.models import Language, SiteLanguages, TranslatablePage from wagtailtrans.permissions import create_group_permissions, get_or_create_language_group @@ -38,13 +38,9 @@ def synchronize_trees(sender, instance, **kwargs): except ObjectDoesNotExist: return - if get_wagtailtrans_setting('LANGUAGES_PER_SITE'): - site_default = site.sitelanguages.default_language - is_default_language = instance.language == site_default - other_languages = site.sitelanguages.other_languages.all() - else: - is_default_language = instance.language.is_default - other_languages = Language.objects.filter(is_default=False) + site_default = site.sitelanguages.default_language + is_default_language = instance.language == site_default + other_languages = site.sitelanguages.other_languages.all() if not kwargs.get('created') or not getattr(instance, 'language', False) or not is_default_language: return @@ -75,15 +71,13 @@ def create_new_language_tree_for_site(site, language): :param language: The language in which the tree wil be created """ site_pages = site.root_page.get_children().values_list('pk', flat=True) - default_language = ( - site.sitelanguages.default_language - if get_wagtailtrans_setting('LANGUAGES_PER_SITE') - else Language.objects.default() - ) + default_language = site.sitelanguages.default_language + canonical_home_page = TranslatablePage.objects.filter(pk__in=site_pages, language=default_language).first() if not canonical_home_page: # no pages created yet. return + descendants = canonical_home_page.get_descendants(inclusive=True) for child_page in descendants: child_page = child_page.specific @@ -157,11 +151,11 @@ def force_parent_language(**kwargs): #: For now we assume there isn't more than 1 site rooted at the parent. if hasattr(parent, 'language'): page.language = parent.language - elif get_wagtailtrans_setting('LANGUAGES_PER_SITE'): + else: site = parent.sites_rooted_here.first() if site: lang_settings = SiteLanguages.for_site(site) - page.language = lang_settings.default_language or Language.objects.default() + page.language = lang_settings.default_language def register_signal_handlers(): @@ -173,11 +167,9 @@ def register_signal_handlers(): """ post_save.connect(create_language_permissions_and_group, sender=Language) init_new_page.connect(force_parent_language) + if get_wagtailtrans_setting('SYNC_TREE'): - if get_wagtailtrans_setting('LANGUAGES_PER_SITE'): - m2m_changed.connect(update_language_trees_for_site, sender=SiteLanguages.other_languages.through) - else: - post_save.connect(create_new_language_tree, sender=Language) + m2m_changed.connect(update_language_trees_for_site, sender=SiteLanguages.other_languages.through) for model in get_page_models(): if hasattr(model, 'create_translation'): diff --git a/src/wagtailtrans/sites.py b/src/wagtailtrans/sites.py index 0518aad9..ef877823 100644 --- a/src/wagtailtrans/sites.py +++ b/src/wagtailtrans/sites.py @@ -1,13 +1,9 @@ -from .conf import get_wagtailtrans_setting -from .models import Language, SiteLanguages +from .models import SiteLanguages def get_languages_for_site(site): - """Utility to retrieve available languages for provided site.""" - if get_wagtailtrans_setting('LANGUAGES_PER_SITE'): - site_languages = SiteLanguages.for_site(site) - languages = [site_languages.default_language] + list(site_languages.other_languages.all()) - else: - languages = list(Language.objects.live().order_by('position')) + """Utility to retrieve all available languages for site.""" + site_languages = SiteLanguages.for_site(site) + languages = [site_languages.default_language] + list(site_languages.other_languages.all()) return languages diff --git a/src/wagtailtrans/wagtail_hooks.py b/src/wagtailtrans/wagtail_hooks.py index e29fab73..5a0a351d 100644 --- a/src/wagtailtrans/wagtail_hooks.py +++ b/src/wagtailtrans/wagtail_hooks.py @@ -4,10 +4,10 @@ from django.utils.encoding import force_text from django.utils.html import format_html from django.utils.translation import ugettext_lazy as _ - from wagtail.admin import widgets from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register from wagtail.core import hooks + from wagtailtrans.conf import get_wagtailtrans_setting from wagtailtrans.models import Language, TranslatablePage from wagtailtrans.urls import translations @@ -33,13 +33,12 @@ def register_admin_urls(): ] -if get_wagtailtrans_setting('LANGUAGES_PER_SITE'): - @hooks.register('insert_global_admin_js') - def global_admin_js(): - return format_html( - ''.format( - path=static('wagtailtrans/js/site_languages_editor.js')) - ) +@hooks.register('insert_global_admin_js') +def global_admin_js(): + return format_html( + ''.format( + path=static('wagtailtrans/js/site_languages_editor.js')) + ) if not get_wagtailtrans_setting('SYNC_TREE'): From e74d33240937e31a0a98158dfae9dfa3222979a3 Mon Sep 17 00:00:00 2001 From: Mike Dingjan Date: Wed, 13 Mar 2019 17:15:31 +0100 Subject: [PATCH 2/2] wip --- docs/source/settings.rst | 2 +- tests/factories/sites.py | 9 +++++--- tests/unit/test_forms.py | 10 ++++----- tests/unit/test_middleware.py | 40 ++++++++++++--------------------- tests/unit/test_models.py | 22 +++--------------- tests/unit/test_signals.py | 10 ++++----- tests/unit/test_sites.py | 8 +++---- tests/unit/test_templatetags.py | 6 ++--- tests/unit/utils/test_conf.py | 3 +-- 9 files changed, 39 insertions(+), 71 deletions(-) diff --git a/docs/source/settings.rst b/docs/source/settings.rst index be15d542..a2bac939 100644 --- a/docs/source/settings.rst +++ b/docs/source/settings.rst @@ -24,7 +24,7 @@ If set to ``False`` wagtailtrans will work with ``Freeform`` trees. .. seealso:: The documentation about :ref:`freeform_trees` - +# TODO: Update this for the loaddata env var ``WAGTAILTRANS_LANGUAGES_PER_SITE`` ----------------------------------- diff --git a/tests/factories/sites.py b/tests/factories/sites.py index 41ed3ae5..1af4b855 100644 --- a/tests/factories/sites.py +++ b/tests/factories/sites.py @@ -1,11 +1,9 @@ import factory - from wagtail.core.models import Site -from wagtailtrans import models - from tests.factories.language import LanguageFactory from tests.factories.pages import HomePageFactory, TranslatableSiteRootFactory +from wagtailtrans import models class SiteFactory(factory.DjangoModelFactory): @@ -19,6 +17,11 @@ class Meta: model = Site django_get_or_create = ['hostname'] + @factory.post_generation + def sitelanguages(self, create, extracted, **kwargs): + if create: + self.sitelanguages = SiteLanguagesFactory(site=self) + def create_site_tree(language, site=None, *items, **homepage_kwargs): if not items: diff --git a/tests/unit/test_forms.py b/tests/unit/test_forms.py index 39a01e9d..c40a4dbd 100644 --- a/tests/unit/test_forms.py +++ b/tests/unit/test_forms.py @@ -1,11 +1,10 @@ +import pytest from django.forms.widgets import Select from django.test import override_settings +from wagtail.contrib.settings.views import get_setting_edit_handler -import pytest from tests.factories import sites -from wagtail.contrib.settings.views import get_setting_edit_handler -from wagtailtrans.models import (Language, SiteLanguages, - register_site_languages) +from wagtailtrans.models import Language, SiteLanguages @pytest.mark.django_db @@ -14,8 +13,7 @@ class TestSiteLanguagesAdminForm: def setup(self): # use a context manager to ensure these settings are # only used here - with override_settings(WAGTAILTRANS_SYNC_TREE=True, WAGTAILTRANS_LANGUAGES_PER_SITE=True): - register_site_languages()(SiteLanguages) + with override_settings(WAGTAILTRANS_SYNC_TREE=True): self.site = sites.SiteFactory() SiteLanguages.for_site(self.site) self.default_language = Language.objects.get(code='en') diff --git a/tests/unit/test_middleware.py b/tests/unit/test_middleware.py index c3356b34..14ff0f90 100644 --- a/tests/unit/test_middleware.py +++ b/tests/unit/test_middleware.py @@ -1,8 +1,8 @@ +import pytest from django.conf import settings from django.http import HttpResponse from django.test import override_settings -import pytest from tests.factories.language import LanguageFactory from tests.factories.sites import SiteFactory, SiteLanguagesFactory from wagtailtrans.middleware import TranslationMiddleware @@ -19,27 +19,23 @@ def test_request_from_path(self, rf): assert request.LANGUAGE_CODE == 'nl' def test_request_default_language(self, rf): - LanguageFactory(code='en', is_default=True, live=True) - LanguageFactory(code='fr', is_default=False, live=True) - - request = rf.get('/home/') - TranslationMiddleware().process_request(request) - assert request.LANGUAGE_CODE == 'en' - - def test_request_site_language(self, rf): - SiteLanguagesFactory(default_language__code='fr') + site = SiteFactory() + SiteLanguagesFactory(default_language__code='fr', site=site) request = rf.get('/random/page/') - request.site = SiteFactory() - with override_settings(WAGTAILTRANS_LANGUAGES_PER_SITE=True): - TranslationMiddleware().process_request(request) + request.site = site + TranslationMiddleware().process_request(request) - assert request.LANGUAGE_CODE == 'fr' + assert request.LANGUAGE_CODE == site.sitelanguages.default_language.code def test_settings_fallback(self, rf): - Language.objects.all().delete() + site = SiteFactory() + site.sitelanguages.default_language = None + site.sitelanguages.save() request = rf.get('/random/page/') + request.site = site + with override_settings(LANGUAGE_CODE='en-us'): TranslationMiddleware().process_request(request) @@ -86,24 +82,16 @@ def test_request_language_from_header_multiple_first_unavailable(self, rf): assert request.LANGUAGE_CODE == 'es' - def test_request_no_languages(self, rf): - Language.objects.all().delete() - request = rf.get('/') - - with override_settings(LANGUAGE_CODE='en'): - TranslationMiddleware().process_request(request) - - assert request.LANGUAGE_CODE == 'en' - def test_response(self, rf): request = rf.get('/nl/random/page/') - TranslationMiddleware().process_request(request) + request.LANGUAGE_CODE = 'nl' response = TranslationMiddleware().process_response(request, HttpResponse()) + assert response['Content-Language'] == 'nl' def test_set_cookie_in_response(self, rf): request = rf.get('/nl/random/page/') - TranslationMiddleware().process_request(request) + request.LANGUAGE_CODE = 'nl' response = TranslationMiddleware().process_response(request, HttpResponse()) assert response.cookies.get(settings.LANGUAGE_COOKIE_NAME).value == 'nl' diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py index 6033ff90..3d834a35 100644 --- a/tests/unit/test_models.py +++ b/tests/unit/test_models.py @@ -6,9 +6,8 @@ from tests.factories.language import LanguageFactory from tests.factories.pages import TranslatablePageFactory -from tests.factories.sites import SiteFactory, create_site_tree, SiteLanguagesFactory +from tests.factories.sites import SiteFactory, SiteLanguagesFactory, create_site_tree from tests.factories.users import UserFactory - from wagtailtrans import models @@ -80,20 +79,6 @@ def test_str(self): def test_default(self, languages): assert models.Language.objects.default().code == 'en' - def test_has_pages_in_site(self): - language = LanguageFactory() - - site_one = SiteFactory(hostname='remotehost', site_name='RemoteSite', root_page__title='site_1') - site_two = SiteFactory(hostname='losthost', site_name='LostSite', root_page__title='site_2') - - create_site_tree(language, site=site_one, subtitle='hophop flepflep') - create_site_tree(language, site=site_two, subtitle='hophop flepflep') - - language.refresh_from_db() - - assert language.has_pages_in_site(site_one) - assert language.has_pages_in_site(site_two) - @pytest.mark.django_db class TestTranslatablePage: @@ -315,6 +300,5 @@ def test_get_user_language(self, rf): lang = models.get_user_language(request) assert lang.code == 'en' - with override_settings(WAGTAILTRANS_LANGUAGES_PER_SITE=True): - lang = models.get_user_language(request) - assert lang == sitelanguages.default_language + lang = models.get_user_language(request) + assert lang == sitelanguages.default_language diff --git a/tests/unit/test_signals.py b/tests/unit/test_signals.py index 49b4cf15..76f26099 100644 --- a/tests/unit/test_signals.py +++ b/tests/unit/test_signals.py @@ -1,13 +1,12 @@ import pytest from django.test import override_settings +from tests.factories import language, sites +from tests.factories.pages import HomePageFactory, WagtailPageFactory from wagtailtrans import signals from wagtailtrans.models import Language, SiteLanguages, TranslatablePage from wagtailtrans.signals import register_signal_handlers -from tests.factories import language, sites -from tests.factories.pages import HomePageFactory, WagtailPageFactory - @pytest.mark.django_db class TestSignals: @@ -46,7 +45,7 @@ class TestSignalsLanguagesPerSite: def setup(self): # use a context manager to ensure these settings are # only used here - with override_settings(WAGTAILTRANS_SYNC_TREE=True, WAGTAILTRANS_LANGUAGES_PER_SITE=True): + with override_settings(WAGTAILTRANS_SYNC_TREE=True): register_signal_handlers() self.site = sites.SiteFactory() SiteLanguages.for_site(self.site) @@ -56,7 +55,7 @@ def setup(self): self.last_page = pages[-1] def test_add_language_to_site(self): - with override_settings(WAGTAILTRANS_SYNC_TREE=True, WAGTAILTRANS_LANGUAGES_PER_SITE=True): + with override_settings(WAGTAILTRANS_SYNC_TREE=True): lang = language.LanguageFactory(is_default=False, code='fr', position=2) assert not TranslatablePage.objects.filter(language=lang, canonical_page=self.last_page).exists() self.site.sitelanguages.other_languages.add(lang) @@ -74,7 +73,6 @@ def test_parent_language(self): signals.force_parent_language(page=new_page, parent=parent_page) assert new_page.language == parent_page.language - @override_settings(WAGTAILTRANS_LANGUAGES_PER_SITE=True) def test_site_languages(self): site = sites.SiteFactory() SiteLanguages.for_site(site) # Initialize sitelanguages diff --git a/tests/unit/test_sites.py b/tests/unit/test_sites.py index 2ebaa4d9..22a32a14 100644 --- a/tests/unit/test_sites.py +++ b/tests/unit/test_sites.py @@ -1,9 +1,8 @@ import pytest from django.test import override_settings -from wagtailtrans import sites - from tests.factories.sites import SiteFactory, SiteLanguagesFactory +from wagtailtrans import sites @pytest.mark.django_db @@ -17,6 +16,5 @@ def test_get_languages_for_site(languages): site_lang = SiteLanguagesFactory(site=site, default_language=languages[0]) site_lang.other_languages.add(languages[1], languages[2]) - with override_settings(WAGTAILTRANS_LANGUAGES_PER_SITE=True): - language_codes = [l.code for l in sites.get_languages_for_site(site)] - assert language_codes == ['en', 'es', 'fr'] + language_codes = [l.code for l in sites.get_languages_for_site(site)] + assert language_codes == ['en', 'es', 'fr'] diff --git a/tests/unit/test_templatetags.py b/tests/unit/test_templatetags.py index 961da348..07220383 100644 --- a/tests/unit/test_templatetags.py +++ b/tests/unit/test_templatetags.py @@ -1,10 +1,10 @@ import pytest from django.test import override_settings -from tests.factories.pages import TranslatablePageFactory, WagtailPageFactory +from tests.factories.pages import WagtailPageFactory from tests.factories.sites import SiteFactory, create_site_tree -from wagtailtrans.templatetags import ( - translations_wagtail_admin, wagtailtrans_tags) +from wagtailtrans.templatetags import (translations_wagtail_admin, + wagtailtrans_tags) @pytest.mark.django_db diff --git a/tests/unit/utils/test_conf.py b/tests/unit/utils/test_conf.py index 54e209a3..9f650194 100644 --- a/tests/unit/utils/test_conf.py +++ b/tests/unit/utils/test_conf.py @@ -9,6 +9,5 @@ def test_get_wagtailtrans_setting_defaults(): def test_get_wagtailtrans_setting_override(): - with override_settings(WAGTAILTRANS_SYNC_TREE=False, WAGTAILTRANS_LANGUAGES_PER_SITE=True): + with override_settings(WAGTAILTRANS_SYNC_TREE=False): assert not conf.get_wagtailtrans_setting('SYNC_TREE') - assert conf.get_wagtailtrans_setting('LANGUAGES_PER_SITE')