Merge pull request #4 from TwigWorld/SP-200-django-2.2-upgrade

SP-200: Django 2.X upgrade

aldryn_grid_foundation/__init__.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.2.2'
+__version__ = '0.2.3'

aldryn_grid_foundation/migrations/0001_initial.py

@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='GridColumnFoundation',
             fields=[
-                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, related_name='aldryn_grid_foundation_gridcolumnfoundation', auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
+                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, related_name='aldryn_grid_foundation_gridcolumnfoundation', auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin', on_delete=models.deletion.CASCADE)),
                 ('size_small', models.IntegerField(default=0, null=True, verbose_name='size (mobile)', blank=True, choices=[(1, '1 columns'), (2, '2 columns'), (3, '3 columns'), (4, '4 columns'), (5, '5 columns'), (6, '6 columns'), (7, '7 columns'), (8, '8 columns'), (9, '9 columns'), (10, '10 columns'), (11, '11 columns'), (12, '12 columns'), (13, '13 columns'), (14, '14 columns'), (15, '15 columns'), (16, '16 columns'), (17, '17 columns'), (18, '18 columns'), (19, '19 columns'), (20, '20 columns'), (21, '21 columns'), (22, '22 columns'), (23, '23 columns'), (24, '24 columns')])),
                 ('size_medium', models.IntegerField(default=0, null=True, verbose_name='size (tablet)', blank=True, choices=[(1, '1 columns'), (2, '2 columns'), (3, '3 columns'), (4, '4 columns'), (5, '5 columns'), (6, '6 columns'), (7, '7 columns'), (8, '8 columns'), (9, '9 columns'), (10, '10 columns'), (11, '11 columns'), (12, '12 columns'), (13, '13 columns'), (14, '14 columns'), (15, '15 columns'), (16, '16 columns'), (17, '17 columns'), (18, '18 columns'), (19, '19 columns'), (20, '20 columns'), (21, '21 columns'), (22, '22 columns'), (23, '23 columns'), (24, '24 columns')])),
                 ('size_large', models.IntegerField(default=0, null=True, verbose_name='size (desktop)', blank=True, choices=[(1, '1 columns'), (2, '2 columns'), (3, '3 columns'), (4, '4 columns'), (5, '5 columns'), (6, '6 columns'), (7, '7 columns'), (8, '8 columns'), (9, '9 columns'), (10, '10 columns'), (11, '11 columns'), (12, '12 columns'), (13, '13 columns'), (14, '14 columns'), (15, '15 columns'), (16, '16 columns'), (17, '17 columns'), (18, '18 columns'), (19, '19 columns'), (20, '20 columns'), (21, '21 columns'), (22, '22 columns'), (23, '23 columns'), (24, '24 columns')])),
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='GridFoundation',
             fields=[
-                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, related_name='aldryn_grid_foundation_gridfoundation', auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
+                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, related_name='aldryn_grid_foundation_gridfoundation', auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin', on_delete=models.deletion.CASCADE)),
                 ('custom_classes', models.CharField(max_length=200, verbose_name='custom classes', blank=True)),
             ],
             options={

aldryn_grid_foundation/models.py

@@ -2,7 +2,8 @@
 from functools import partial
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _, string_concat
+from django.utils.text import format_lazy
+from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 
 from cms.models import CMSPlugin
@@ -13,7 +14,7 @@
 
 
 ALDRYN_GRID_FOUNDATION_CHOICES = [
-    (i, string_concat(str(i), ' ', _('columns'))) for i in range(1, GRID_CONFIG['COLUMNS']+1)
+    (i, format_lazy(str(i), ' ', _('columns'))) for i in range(1, GRID_CONFIG['COLUMNS']+1)
 ]
 
 ColumnSizeField = partial(