diff --git a/bakerydemo/base/migrations/0005_auto_20190314_1747.py b/bakerydemo/base/migrations/0005_wagtail_i18n_1.py similarity index 70% rename from bakerydemo/base/migrations/0005_auto_20190314_1747.py rename to bakerydemo/base/migrations/0005_wagtail_i18n_1.py index 554e960..acb9c55 100644 --- a/bakerydemo/base/migrations/0005_auto_20190314_1747.py +++ b/bakerydemo/base/migrations/0005_wagtail_i18n_1.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.7 on 2019-03-14 17:47 +# Generated by Django 2.1.7 on 2019-03-27 11:09 from django.db import migrations, models import django.db.models.deletion @@ -8,7 +8,7 @@ import wagtail_i18n.models class Migration(migrations.Migration): dependencies = [ - ('wagtail_i18n', '0001_initial'), + ('wagtail_i18n', '0008_region_ordering'), ('base', '0004_auto_20180522_1856'), ] @@ -19,8 +19,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='footertext', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='footertext', @@ -29,8 +29,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='formfield', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='formfield', @@ -39,8 +39,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='formpage', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='formpage', @@ -49,8 +49,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='gallerypage', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='gallerypage', @@ -59,8 +59,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='homepage', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='homepage', @@ -69,8 +69,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='people', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='people', @@ -79,8 +79,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='standardpage', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='standardpage', diff --git a/bakerydemo/base/migrations/0006_auto_20190325_1758.py b/bakerydemo/base/migrations/0006_wagtail_i18n_2.py similarity index 84% rename from bakerydemo/base/migrations/0006_auto_20190325_1758.py rename to bakerydemo/base/migrations/0006_wagtail_i18n_2.py index e119deb..e8bc57b 100644 --- a/bakerydemo/base/migrations/0006_auto_20190325_1758.py +++ b/bakerydemo/base/migrations/0006_wagtail_i18n_2.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.7 on 2019-03-25 17:58 +# Generated by Django 2.1.7 on 2019-03-27 11:10 from django.db import migrations from wagtail_i18n.bootstrap import BootstrapTranslatableModel @@ -7,7 +7,7 @@ from wagtail_i18n.bootstrap import BootstrapTranslatableModel class Migration(migrations.Migration): dependencies = [ - ('base', '0005_auto_20190314_1747'), + ('base', '0005_wagtail_i18n_1'), ] operations = [ diff --git a/bakerydemo/base/migrations/0007_auto_20190325_2055.py b/bakerydemo/base/migrations/0007_auto_20190325_2055.py deleted file mode 100644 index 2fb2bde..0000000 --- a/bakerydemo/base/migrations/0007_auto_20190325_2055.py +++ /dev/null @@ -1,135 +0,0 @@ -# Generated by Django 2.1.7 on 2019-03-25 20:55 - -from django.db import migrations, models -import django.db.models.deletion -import uuid -import wagtail_i18n.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('wagtail_i18n', '0004_locale'), - ('base', '0006_auto_20190325_1758'), - ] - - operations = [ - migrations.RemoveField( - model_name='footertext', - name='language', - ), - migrations.RemoveField( - model_name='people', - name='language', - ), - migrations.AddField( - model_name='footertext', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='formfield', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='formpage', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='gallerypage', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='homepage', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='people', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='standardpage', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AlterField( - model_name='footertext', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='formfield', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='formpage', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='gallerypage', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='homepage', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='people', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='standardpage', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.RemoveField( - model_name='formfield', - name='language', - ), - migrations.AlterUniqueTogether( - name='formfield', - unique_together={('translation_key', 'locale')}, - ), - migrations.RemoveField( - model_name='formpage', - name='language', - ), - migrations.AlterUniqueTogether( - name='formpage', - unique_together={('translation_key', 'locale')}, - ), - migrations.RemoveField( - model_name='gallerypage', - name='language', - ), - migrations.AlterUniqueTogether( - name='gallerypage', - unique_together={('translation_key', 'locale')}, - ), - migrations.RemoveField( - model_name='homepage', - name='language', - ), - migrations.AlterUniqueTogether( - name='homepage', - unique_together={('translation_key', 'locale')}, - ), - migrations.RemoveField( - model_name='standardpage', - name='language', - ), - migrations.AlterUniqueTogether( - name='standardpage', - unique_together={('translation_key', 'locale')}, - ), - ] diff --git a/bakerydemo/base/migrations/0007_wagtail_i18n_3.py b/bakerydemo/base/migrations/0007_wagtail_i18n_3.py new file mode 100644 index 0000000..3f8489e --- /dev/null +++ b/bakerydemo/base/migrations/0007_wagtail_i18n_3.py @@ -0,0 +1,70 @@ +# Generated by Django 2.1.7 on 2019-03-27 11:14 + +from django.db import migrations, models +import uuid + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtail_i18n', '0008_region_ordering'), + ('base', '0006_wagtail_i18n_2'), + ] + + operations = [ + migrations.AlterField( + model_name='footertext', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='formfield', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='formpage', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='gallerypage', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='homepage', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='people', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='standardpage', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterUniqueTogether( + name='formfield', + unique_together={('translation_key', 'locale')}, + ), + migrations.AlterUniqueTogether( + name='formpage', + unique_together={('translation_key', 'locale')}, + ), + migrations.AlterUniqueTogether( + name='gallerypage', + unique_together={('translation_key', 'locale')}, + ), + migrations.AlterUniqueTogether( + name='homepage', + unique_together={('translation_key', 'locale')}, + ), + migrations.AlterUniqueTogether( + name='standardpage', + unique_together={('translation_key', 'locale')}, + ), + ] diff --git a/bakerydemo/blog/migrations/0004_auto_20190314_1747.py b/bakerydemo/blog/migrations/0004_wagtail_i18n_1.py similarity index 70% rename from bakerydemo/blog/migrations/0004_auto_20190314_1747.py rename to bakerydemo/blog/migrations/0004_wagtail_i18n_1.py index 01c07b4..4f0d6d6 100644 --- a/bakerydemo/blog/migrations/0004_auto_20190314_1747.py +++ b/bakerydemo/blog/migrations/0004_wagtail_i18n_1.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.7 on 2019-03-14 17:47 +# Generated by Django 2.1.7 on 2019-03-27 11:09 from django.db import migrations, models import django.db.models.deletion @@ -8,15 +8,15 @@ import wagtail_i18n.models class Migration(migrations.Migration): dependencies = [ - ('wagtail_i18n', '0001_initial'), + ('wagtail_i18n', '0008_region_ordering'), ('blog', '0003_auto_20170329_0055'), ] operations = [ migrations.AddField( model_name='blogindexpage', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='blogindexpage', @@ -25,8 +25,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='blogpage', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='blogpage', @@ -35,8 +35,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='blogpeoplerelationship', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='blogpeoplerelationship', diff --git a/bakerydemo/blog/migrations/0005_auto_20190325_1757.py b/bakerydemo/blog/migrations/0005_wagtail_i18n_2.py similarity index 79% rename from bakerydemo/blog/migrations/0005_auto_20190325_1757.py rename to bakerydemo/blog/migrations/0005_wagtail_i18n_2.py index 7eb5b5c..c4953c4 100644 --- a/bakerydemo/blog/migrations/0005_auto_20190325_1757.py +++ b/bakerydemo/blog/migrations/0005_wagtail_i18n_2.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.7 on 2019-03-25 17:57 +# Generated by Django 2.1.7 on 2019-03-27 11:10 from django.db import migrations from wagtail_i18n.bootstrap import BootstrapTranslatableModel @@ -7,7 +7,7 @@ from wagtail_i18n.bootstrap import BootstrapTranslatableModel class Migration(migrations.Migration): dependencies = [ - ('blog', '0004_auto_20190314_1747'), + ('blog', '0004_wagtail_i18n_1'), ] operations = [ diff --git a/bakerydemo/blog/migrations/0006_auto_20190325_2055.py b/bakerydemo/blog/migrations/0006_auto_20190325_2055.py deleted file mode 100644 index 47cbfd2..0000000 --- a/bakerydemo/blog/migrations/0006_auto_20190325_2055.py +++ /dev/null @@ -1,67 +0,0 @@ -# Generated by Django 2.1.7 on 2019-03-25 20:55 - -from django.db import migrations, models -import django.db.models.deletion -import uuid -import wagtail_i18n.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('wagtail_i18n', '0004_locale'), - ('blog', '0005_auto_20190325_1757'), - ] - - operations = [ - migrations.RemoveField( - model_name='blogpeoplerelationship', - name='language', - ), - migrations.AddField( - model_name='blogindexpage', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='blogpage', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='blogpeoplerelationship', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AlterField( - model_name='blogindexpage', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='blogpage', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='blogpeoplerelationship', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.RemoveField( - model_name='blogindexpage', - name='language', - ), - migrations.AlterUniqueTogether( - name='blogindexpage', - unique_together={('translation_key', 'locale')}, - ), - migrations.RemoveField( - model_name='blogpage', - name='language', - ), - migrations.AlterUniqueTogether( - name='blogpage', - unique_together={('translation_key', 'locale')}, - ), - ] diff --git a/bakerydemo/blog/migrations/0006_wagtail_i18n_3.py b/bakerydemo/blog/migrations/0006_wagtail_i18n_3.py new file mode 100644 index 0000000..c3b558f --- /dev/null +++ b/bakerydemo/blog/migrations/0006_wagtail_i18n_3.py @@ -0,0 +1,38 @@ +# Generated by Django 2.1.7 on 2019-03-27 11:14 + +from django.db import migrations, models +import uuid + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtail_i18n', '0008_region_ordering'), + ('blog', '0005_wagtail_i18n_2'), + ] + + operations = [ + migrations.AlterField( + model_name='blogindexpage', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='blogpage', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='blogpeoplerelationship', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterUniqueTogether( + name='blogindexpage', + unique_together={('translation_key', 'locale')}, + ), + migrations.AlterUniqueTogether( + name='blogpage', + unique_together={('translation_key', 'locale')}, + ), + ] diff --git a/bakerydemo/breads/migrations/0004_auto_20190314_1747.py b/bakerydemo/breads/migrations/0004_wagtail_i18n_1.py similarity index 69% rename from bakerydemo/breads/migrations/0004_auto_20190314_1747.py rename to bakerydemo/breads/migrations/0004_wagtail_i18n_1.py index 2c8a6d3..374fa68 100644 --- a/bakerydemo/breads/migrations/0004_auto_20190314_1747.py +++ b/bakerydemo/breads/migrations/0004_wagtail_i18n_1.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.7 on 2019-03-14 17:47 +# Generated by Django 2.1.7 on 2019-03-27 11:09 from django.db import migrations, models import django.db.models.deletion @@ -8,15 +8,15 @@ import wagtail_i18n.models class Migration(migrations.Migration): dependencies = [ - ('wagtail_i18n', '0001_initial'), + ('wagtail_i18n', '0008_region_ordering'), ('breads', '0003_auto_20170329_0055'), ] operations = [ migrations.AddField( model_name='breadingredient', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='breadingredient', @@ -25,8 +25,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='breadpage', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='breadpage', @@ -35,8 +35,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='breadsindexpage', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='breadsindexpage', @@ -45,8 +45,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='breadtype', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='breadtype', @@ -55,8 +55,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='country', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='country', diff --git a/bakerydemo/breads/migrations/0005_auto_20190325_1800.py b/bakerydemo/breads/migrations/0005_wagtail_i18n_2.py similarity index 83% rename from bakerydemo/breads/migrations/0005_auto_20190325_1800.py rename to bakerydemo/breads/migrations/0005_wagtail_i18n_2.py index 4139606..a398f17 100644 --- a/bakerydemo/breads/migrations/0005_auto_20190325_1800.py +++ b/bakerydemo/breads/migrations/0005_wagtail_i18n_2.py @@ -1,14 +1,13 @@ -# Generated by Django 2.1.7 on 2019-03-25 18:00 +# Generated by Django 2.1.7 on 2019-03-27 11:10 from django.db import migrations - from wagtail_i18n.bootstrap import BootstrapTranslatableModel class Migration(migrations.Migration): dependencies = [ - ('breads', '0004_auto_20190314_1747'), + ('breads', '0004_wagtail_i18n_1'), ] operations = [ diff --git a/bakerydemo/breads/migrations/0006_auto_20190325_2055.py b/bakerydemo/breads/migrations/0006_auto_20190325_2055.py deleted file mode 100644 index 2707e08..0000000 --- a/bakerydemo/breads/migrations/0006_auto_20190325_2055.py +++ /dev/null @@ -1,95 +0,0 @@ -# Generated by Django 2.1.7 on 2019-03-25 20:55 - -from django.db import migrations, models -import django.db.models.deletion -import uuid -import wagtail_i18n.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('wagtail_i18n', '0004_locale'), - ('breads', '0005_auto_20190325_1800'), - ] - - operations = [ - migrations.RemoveField( - model_name='breadingredient', - name='language', - ), - migrations.RemoveField( - model_name='breadtype', - name='language', - ), - migrations.RemoveField( - model_name='country', - name='language', - ), - migrations.AddField( - model_name='breadingredient', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='breadpage', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='breadsindexpage', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='breadtype', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='country', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AlterField( - model_name='breadingredient', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='breadpage', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='breadsindexpage', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='breadtype', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='country', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.RemoveField( - model_name='breadpage', - name='language', - ), - migrations.AlterUniqueTogether( - name='breadpage', - unique_together={('translation_key', 'locale')}, - ), - migrations.RemoveField( - model_name='breadsindexpage', - name='language', - ), - migrations.AlterUniqueTogether( - name='breadsindexpage', - unique_together={('translation_key', 'locale')}, - ), - ] diff --git a/bakerydemo/breads/migrations/0006_wagtail_i18n_3.py b/bakerydemo/breads/migrations/0006_wagtail_i18n_3.py new file mode 100644 index 0000000..03ddd42 --- /dev/null +++ b/bakerydemo/breads/migrations/0006_wagtail_i18n_3.py @@ -0,0 +1,48 @@ +# Generated by Django 2.1.7 on 2019-03-27 11:14 + +from django.db import migrations, models +import uuid + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtail_i18n', '0008_region_ordering'), + ('breads', '0005_wagtail_i18n_2'), + ] + + operations = [ + migrations.AlterField( + model_name='breadingredient', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='breadpage', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='breadsindexpage', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='breadtype', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='country', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterUniqueTogether( + name='breadpage', + unique_together={('translation_key', 'locale')}, + ), + migrations.AlterUniqueTogether( + name='breadsindexpage', + unique_together={('translation_key', 'locale')}, + ), + ] diff --git a/bakerydemo/locations/migrations/0004_auto_20190314_1747.py b/bakerydemo/locations/migrations/0004_wagtail_i18n_1.py similarity index 75% rename from bakerydemo/locations/migrations/0004_auto_20190314_1747.py rename to bakerydemo/locations/migrations/0004_wagtail_i18n_1.py index 84eedb4..122acb6 100644 --- a/bakerydemo/locations/migrations/0004_auto_20190314_1747.py +++ b/bakerydemo/locations/migrations/0004_wagtail_i18n_1.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.7 on 2019-03-14 17:47 +# Generated by Django 2.1.7 on 2019-03-27 11:09 from django.db import migrations, models import django.db.models.deletion @@ -8,15 +8,15 @@ import wagtail_i18n.models class Migration(migrations.Migration): dependencies = [ - ('wagtail_i18n', '0001_initial'), + ('wagtail_i18n', '0008_region_ordering'), ('locations', '0003_auto_20170329_0055'), ] operations = [ migrations.AddField( model_name='locationpage', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='locationpage', @@ -25,8 +25,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='locationsindexpage', - name='language', - field=models.ForeignKey(default=wagtail_i18n.models.Language.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Language'), + name='locale', + field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), ), migrations.AddField( model_name='locationsindexpage', diff --git a/bakerydemo/locations/migrations/0005_auto_20190325_1802.py b/bakerydemo/locations/migrations/0005_wagtail_i18n_2.py similarity index 76% rename from bakerydemo/locations/migrations/0005_auto_20190325_1802.py rename to bakerydemo/locations/migrations/0005_wagtail_i18n_2.py index 38e1385..71534d3 100644 --- a/bakerydemo/locations/migrations/0005_auto_20190325_1802.py +++ b/bakerydemo/locations/migrations/0005_wagtail_i18n_2.py @@ -1,14 +1,13 @@ -# Generated by Django 2.1.7 on 2019-03-25 18:02 +# Generated by Django 2.1.7 on 2019-03-27 11:10 from django.db import migrations - from wagtail_i18n.bootstrap import BootstrapTranslatableModel class Migration(migrations.Migration): dependencies = [ - ('locations', '0004_auto_20190314_1747'), + ('locations', '0004_wagtail_i18n_1'), ] operations = [ diff --git a/bakerydemo/locations/migrations/0006_auto_20190325_2055.py b/bakerydemo/locations/migrations/0006_auto_20190325_2055.py deleted file mode 100644 index 85609a6..0000000 --- a/bakerydemo/locations/migrations/0006_auto_20190325_2055.py +++ /dev/null @@ -1,53 +0,0 @@ -# Generated by Django 2.1.7 on 2019-03-25 20:55 - -from django.db import migrations, models -import django.db.models.deletion -import uuid -import wagtail_i18n.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('wagtail_i18n', '0004_locale'), - ('locations', '0005_auto_20190325_1802'), - ] - - operations = [ - migrations.AddField( - model_name='locationpage', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AddField( - model_name='locationsindexpage', - name='locale', - field=models.ForeignKey(default=wagtail_i18n.models.Locale.default_id, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtail_i18n.Locale'), - ), - migrations.AlterField( - model_name='locationpage', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AlterField( - model_name='locationsindexpage', - name='translation_key', - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.RemoveField( - model_name='locationpage', - name='language', - ), - migrations.AlterUniqueTogether( - name='locationpage', - unique_together={('translation_key', 'locale')}, - ), - migrations.RemoveField( - model_name='locationsindexpage', - name='language', - ), - migrations.AlterUniqueTogether( - name='locationsindexpage', - unique_together={('translation_key', 'locale')}, - ), - ] diff --git a/bakerydemo/locations/migrations/0006_wagtail_i18n_3.py b/bakerydemo/locations/migrations/0006_wagtail_i18n_3.py new file mode 100644 index 0000000..a6ca49b --- /dev/null +++ b/bakerydemo/locations/migrations/0006_wagtail_i18n_3.py @@ -0,0 +1,33 @@ +# Generated by Django 2.1.7 on 2019-03-27 11:14 + +from django.db import migrations, models +import uuid + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtail_i18n', '0008_region_ordering'), + ('locations', '0005_wagtail_i18n_2'), + ] + + operations = [ + migrations.AlterField( + model_name='locationpage', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterField( + model_name='locationsindexpage', + name='translation_key', + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AlterUniqueTogether( + name='locationpage', + unique_together={('translation_key', 'locale')}, + ), + migrations.AlterUniqueTogether( + name='locationsindexpage', + unique_together={('translation_key', 'locale')}, + ), + ]