Updated wagtail-localize

2019-10-07 11:28:02 +01:00 · 2019-10-07 11:28:02 +01:00 · ef1e857b77
commit ef1e857b77
--- a/bakerydemo/base/migrations/0008_auto_20191004_1512.py
+++ b/bakerydemo/base/migrations/0008_auto_20191004_1512.py
@ -0,0 +1,48 @@
+# Generated by Django 2.1.12 on 2019-10-04 15:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0007_wagtail_localize_3'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='footertext',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='formfield',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='formpage',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='gallerypage',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='homepage',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='people',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='standardpage',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+    ]
--- a/bakerydemo/base/models.py
+++ b/bakerydemo/base/models.py
@ -19,6 +19,7 @@ from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField
 from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.search import index
 from wagtail.snippets.models import register_snippet
+from wagtail_localize.fields import TranslatableField, SynchronizedField
 from wagtail_localize.models import TranslatableMixin, TranslatablePageMixin, TranslatablePageRoutingMixin

 from .blocks import BaseStreamBlock
@ -67,7 +68,10 @@ class People(index.Indexed, TranslatableMixin, ClusterableModel):
    ]

    translatable_fields = [
-        'job_title',
+        SynchronizedField('first_name'),
+        SynchronizedField('last_name'),
+        TranslatableField('job_title'),
+        SynchronizedField('image'),
    ]

    @property
@ -102,7 +106,7 @@ class FooterText(TranslatableMixin, models.Model):
    ]

    translatable_fields = [
-        'body',
+        TranslatableField('body'),
    ]

    def __str__(self):
@ -140,12 +144,13 @@ class StandardPage(TranslatablePageMixin, Page):
    ]

    translatable_fields = [
-        'title',
-        'slug',
-        'seo_title',
-        'search_description',
-        'introduction',
-        'body',
+        TranslatableField('title'),
+        TranslatableField('slug'),
+        TranslatableField('seo_title'),
+        TranslatableField('search_description'),
+        TranslatableField('introduction'),
+        SynchronizedField('image'),
+        TranslatableField('body'),
    ]


@ -302,18 +307,23 @@ class HomePage(TranslatablePageMixin, TranslatablePageRoutingMixin, Page):
    ]

    translatable_fields = [
-        'title',
-        'slug',
-        'seo_title',
-        'search_description',
-        'hero_text',
-        'hero_cta',
-        'body',
-        'promo_title',
-        'promo_text',
-        'featured_section_1_title',
-        'featured_section_2_title',
-        'featured_section_3_title',
+        TranslatableField('title'),
+        TranslatableField('slug'),
+        TranslatableField('seo_title'),
+        TranslatableField('search_description'),
+        TranslatableField('hero_text'),
+        TranslatableField('hero_cta'),
+        SynchronizedField('hero_cta_link'),
+        TranslatableField('body'),
+        SynchronizedField('promo_image'),
+        TranslatableField('promo_title'),
+        TranslatableField('promo_text'),
+        TranslatableField('featured_section_1_title'),
+        SynchronizedField('featured_section_1'),
+        TranslatableField('featured_section_2_title'),
+        SynchronizedField('featured_section_2'),
+        TranslatableField('featured_section_3_title'),
+        SynchronizedField('featured_section_3'),
    ]

    def __str__(self):
@ -364,12 +374,14 @@ class GalleryPage(TranslatablePageMixin, Page):
    subpage_types = []

    translatable_fields = [
-        'title',
-        'slug',
-        'seo_title',
-        'search_description',
-        'introduction',
-        'body',
+        TranslatableField('title'),
+        TranslatableField('slug'),
+        TranslatableField('seo_title'),
+        TranslatableField('search_description'),
+        TranslatableField('introduction'),
+        SynchronizedField('image'),
+        TranslatableField('body'),
+        SynchronizedField('collection'),
    ]


@ -384,7 +396,14 @@ class FormField(TranslatableMixin, AbstractFormField):
    """
    page = ParentalKey('FormPage', related_name='form_fields', on_delete=models.CASCADE)

-    translatable_fields = ['label', 'help_text']
+    translatable_fields = [
+        TranslatableField('label'),
+        SynchronizedField('field_type'),
+        SynchronizedField('required'),
+        TranslatableField('choices'),
+        TranslatableField('default_value'),
+        TranslatableField('help_text'),
+    ]


 class FormPage(TranslatablePageMixin, AbstractEmailForm):
@ -415,11 +434,12 @@ class FormPage(TranslatablePageMixin, AbstractEmailForm):
    ]

    translatable_fields = [
-        'title',
-        'slug',
-        'seo_title',
-        'search_description',
-        'body',
-        'thank_you_text',
-        'form_fields',
+        TranslatableField('title'),
+        TranslatableField('slug'),
+        TranslatableField('seo_title'),
+        TranslatableField('search_description'),
+        SynchronizedField('image'),
+        TranslatableField('body'),
+        TranslatableField('thank_you_text'),
+        TranslatableField('form_fields'),
    ]
--- a/bakerydemo/blog/migrations/0007_auto_20191004_1512.py
+++ b/bakerydemo/blog/migrations/0007_auto_20191004_1512.py
@ -0,0 +1,28 @@
+# Generated by Django 2.1.12 on 2019-10-04 15:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0006_wagtail_localize_3'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='blogindexpage',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='blogpage',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='blogpeoplerelationship',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+    ]
--- a/bakerydemo/blog/models.py
+++ b/bakerydemo/blog/models.py
@ -17,6 +17,7 @@ from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.search import index
 from wagtail.snippets.edit_handlers import SnippetChooserPanel
 from wagtail_localize.models import TranslatableMixin, TranslatablePageMixin
+from wagtail_localize.fields import TranslatableField, SynchronizedField

 from bakerydemo.base.blocks import BaseStreamBlock

@ -40,7 +41,7 @@ class BlogPeopleRelationship(Orderable, TranslatableMixin, models.Model):
    ]

    translatable_fields = [
-        'people',
+        TranslatableField('people'),
    ]


@ -98,13 +99,16 @@ class BlogPage(TranslatablePageMixin, Page):
    ]

    translatable_fields = [
-        'title',
-        'slug',
-        'seo_title',
-        'search_description',
-        'subtitle',
-        'introduction',
-        'body',
+        TranslatableField('title'),
+        TranslatableField('slug'),
+        TranslatableField('seo_title'),
+        TranslatableField('search_description'),
+        TranslatableField('subtitle'),
+        TranslatableField('introduction'),
+        SynchronizedField('image'),
+        TranslatableField('body'),
+        #SynchronizedField('tags'),
+        SynchronizedField('date_published'),
    ]

    def authors(self):
@ -172,11 +176,12 @@ class BlogIndexPage(RoutablePageMixin, TranslatablePageMixin, Page):
    ]

    translatable_fields = [
-        'title',
-        'slug',
-        'seo_title',
-        'search_description',
-        'introduction',
+        TranslatableField('title'),
+        TranslatableField('slug'),
+        TranslatableField('seo_title'),
+        TranslatableField('search_description'),
+        TranslatableField('introduction'),
+        SynchronizedField('image'),
    ]

    # Speficies that only BlogPage objects can live under this index page
--- a/bakerydemo/breads/migrations/0007_auto_20191004_1512.py
+++ b/bakerydemo/breads/migrations/0007_auto_20191004_1512.py
@ -0,0 +1,38 @@
+# Generated by Django 2.1.12 on 2019-10-04 15:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('breads', '0006_wagtail_localize_3'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='breadingredient',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='breadpage',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='breadsindexpage',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='breadtype',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='country',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+    ]
--- a/bakerydemo/breads/models.py
+++ b/bakerydemo/breads/models.py
@ -12,6 +12,7 @@ from wagtail.core.models import Page
 from wagtail.search import index
 from wagtail.snippets.models import register_snippet
 from wagtail.images.edit_handlers import ImageChooserPanel
+from wagtail_localize.fields import TranslatableField, SynchronizedField
 from wagtail_localize.models import TranslatableMixin, TranslatablePageMixin

 from bakerydemo.base.blocks import BaseStreamBlock
@ -32,7 +33,7 @@ class Country(TranslatableMixin, models.Model):
    title = models.CharField(max_length=100)

    translatable_fields = [
-        'title',
+        TranslatableField('title'),
    ]

    def __str__(self):
@ -58,7 +59,7 @@ class BreadIngredient(TranslatableMixin, models.Model):
    ]

    translatable_fields = [
-        'name',
+        TranslatableField('name'),
    ]

    def __str__(self):
@ -86,7 +87,7 @@ class BreadType(TranslatableMixin, models.Model):
    ]

    translatable_fields = [
-        'title',
+        TranslatableField('title'),
    ]

    def __str__(self):
@ -160,15 +161,16 @@ class BreadPage(TranslatablePageMixin, Page):
    parent_page_types = ['BreadsIndexPage']

    translatable_fields = [
-        'title',
-        'slug',
-        'seo_title',
-        'search_description',
-        'introduction',
-        'body',
-        'origin',
-        'bread_type',
-        'ingredients',
+        TranslatableField('title'),
+        TranslatableField('slug'),
+        TranslatableField('seo_title'),
+        TranslatableField('search_description'),
+        TranslatableField('introduction'),
+        SynchronizedField('image'),
+        TranslatableField('body'),
+        TranslatableField('origin'),
+        TranslatableField('bread_type'),
+        TranslatableField('ingredients'),
    ]


@ -203,11 +205,12 @@ class BreadsIndexPage(TranslatablePageMixin, Page):
    subpage_types = ['BreadPage']

    translatable_fields = [
-        'title',
-        'slug',
-        'seo_title',
-        'search_description',
-        'introduction',
+        TranslatableField('title'),
+        TranslatableField('slug'),
+        TranslatableField('seo_title'),
+        TranslatableField('search_description'),
+        TranslatableField('introduction'),
+        SynchronizedField('image'),
    ]

    # Returns a queryset of BreadPage objects that are live, that are direct
--- a/bakerydemo/locations/migrations/0008_auto_20191004_1512.py
+++ b/bakerydemo/locations/migrations/0008_auto_20191004_1512.py
@ -0,0 +1,23 @@
+# Generated by Django 2.1.12 on 2019-10-04 15:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('locations', '0007_regionflag'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='locationpage',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='locationsindexpage',
+            name='is_source_translation',
+            field=models.BooleanField(default=True),
+        ),
+    ]
--- a/bakerydemo/locations/models.py
+++ b/bakerydemo/locations/models.py
@ -11,6 +11,7 @@ from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, StreamFieldPane
 from wagtail.core.models import Orderable, Page
 from wagtail.search import index
 from wagtail.images.edit_handlers import ImageChooserPanel
+from wagtail_localize.fields import TranslatableField, SynchronizedField
 from wagtail_localize.models import TranslatablePageMixin
 from wagtail_localize.admin.regions.components import register_region_component

@ -105,11 +106,12 @@ class LocationsIndexPage(TranslatablePageMixin, Page):
    subpage_types = ['LocationPage']

    translatable_fields = [
-        'title',
-        'slug',
-        'seo_title',
-        'search_description',
-        'introduction',
+        TranslatableField('title'),
+        TranslatableField('slug'),
+        TranslatableField('seo_title'),
+        TranslatableField('search_description'),
+        TranslatableField('introduction'),
+        SynchronizedField('image'),
    ]

    # Allows children of this indexpage to be accessible via the indexpage
@ -184,12 +186,16 @@ class LocationPage(TranslatablePageMixin, Page):
    ]

    translatable_fields = [
-        'title',
-        'slug',
-        'seo_title',
-        'search_description',
-        'introduction',
-        'body',
+        TranslatableField('title'),
+        TranslatableField('slug'),
+        TranslatableField('seo_title'),
+        TranslatableField('search_description'),
+        TranslatableField('introduction'),
+        SynchronizedField('image'),
+        TranslatableField('body'),
+        SynchronizedField('address'),
+        SynchronizedField('lat_long'),
+        SynchronizedField('hours_of_operation'),
    ]

    def __str__(self):
--- a/requirements/base.txt
+++ b/requirements/base.txt
@ -6,4 +6,4 @@ Pillow==4.0.0

 # Localisation
 googletrans==2.4.0
-e git://github.com/kaedroho/wagtail-localize.git@51f006abdbce7603cd9e4ea48f9c23793763153c#egg=wagtail-localize
+-e git://github.com/kaedroho/wagtail-localize.git@7d2bf27561217b05c91e26820d238a21ce3381a1#egg=wagtail-localize