#191, Django 2 compatibility

wagtail_modeltranslation/patch_wagtailadmin.py

@@ -5,7 +5,10 @@ import types
 
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 from django.db import transaction, connection
 from django.db.models import Q, Value
 from django.db.models.functions import Concat, Substr

wagtail_modeltranslation/templatetags/wagtail_modeltranslation.py

@@ -6,9 +6,9 @@ from django import template
 from django.utils.translation import activate, get_language
 
 try:
-    from django.core.urlresolvers import resolve
-except ImportError:
     from django.urls import resolve
+except ImportError:
+    from django.core.urlresolvers import resolve
 
 from six import iteritems
 

wagtail_modeltranslation/tests/models.py

@@ -74,7 +74,8 @@ class FieldPanelSnippet(models.Model):
 @register_snippet
 class ImageChooserPanelSnippet(models.Model):
     image = models.ForeignKey(
-        'wagtailimages.Image'
+        'wagtailimages.Image',
+        on_delete=models.CASCADE,
     )
 
     panels = [
@@ -122,7 +123,10 @@ class MultiFieldPanelSnippet(FieldPanelSnippet, ImageChooserPanelSnippet, FieldR
 class BaseInlineModel(MultiFieldPanelSnippet):
     field_name = models.CharField(max_length=10)
 
-    image_chooser = models.ForeignKey('wagtailimages.Image')
+    image_chooser = models.ForeignKey(
+        'wagtailimages.Image',
+        on_delete=models.CASCADE,
+    )
 
     fieldrow_name = models.CharField(max_length=10)
 
@@ -158,7 +162,8 @@ class FieldPanelPage(WagtailPage):
 
 class ImageChooserPanelPage(WagtailPage):
     image = models.ForeignKey(
-        'wagtailimages.Image'
+        'wagtailimages.Image',
+        on_delete=models.CASCADE,
     )
 
     content_panels = [

wagtail_modeltranslation/tests/tests.py

@@ -99,15 +99,14 @@ class WagtailModeltranslationTransactionTestBase(TransactionTestCase):
 
                 # 5. makemigrations
                 from django.db import connections, DEFAULT_DB_ALIAS
-                call_command('makemigrations', verbosity=2, interactive=False,
-                             database=connections[DEFAULT_DB_ALIAS].alias)
+                call_command('makemigrations', verbosity=2, interactive=False)
 
                 # 6. Syncdb
-                call_command('migrate', verbosity=0, migrate=False, interactive=False, run_syncdb=True,
-                             database=connections[DEFAULT_DB_ALIAS].alias, load_initial_data=False)
+                call_command('migrate', verbosity=0, interactive=False, run_syncdb=True,
+                             database=connections[DEFAULT_DB_ALIAS].alias)
 
                 # 7. Make sure Page translation fields are created
-                call_command('sync_page_translation_fields', interactive=False, verbosity=0, database=connections[DEFAULT_DB_ALIAS].alias)
+                call_command('sync_page_translation_fields', interactive=False, verbosity=0)
 
                 # 8. patch wagtail models
                 from wagtail_modeltranslation.patch_wagtailadmin import patch_wagtail_models