Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f4a1777
Removed modeltranslation and upgrade wagtail + django (#6743)
KalobTaulien May 26, 2021
4a709d3
Added wagtail-localize as a package (nothing else) (#6762)
KalobTaulien May 27, 2021
2cd723f
Bootstrapping the snippets
KalobTaulien May 31, 2021
ab5cc86
Pre-bootstrap migrations
KalobTaulien May 31, 2021
675b301
Bootstrap migrations
KalobTaulien May 31, 2021
2133339
Convert to TranslatableMixin
KalobTaulien May 31, 2021
e3f1ba9
TranslatableMixin migrations
KalobTaulien May 31, 2021
5df9342
TranslationMixin migrations + I forgot a couple models in the previou…
KalobTaulien May 31, 2021
7c5cb03
Additional migrations (merged into 0013)
KalobTaulien May 31, 2021
b29edcc
Translatable fields
KalobTaulien May 31, 2021
bba3b35
use the correct static tagset (#6775)
Pomax May 31, 2021
8a59810
Merge branch 'wagtail-localize-2021' into 6708-snippet-translations
KalobTaulien May 31, 2021
1fd679f
Typo
KalobTaulien May 31, 2021
407e429
Update network-api/networkapi/wagtailpages/pagemodels/base.py
KalobTaulien Jun 1, 2021
11a663d
Update network-api/networkapi/wagtailpages/pagemodels/campaigns.py
KalobTaulien Jun 1, 2021
18b6ed7
Update network-api/networkapi/wagtailpages/pagemodels/dear_internet.py
KalobTaulien Jun 1, 2021
66a5145
Update network-api/networkapi/wagtailpages/pagemodels/primary.py
KalobTaulien Jun 1, 2021
6a5e828
Update network-api/networkapi/wagtailpages/pagemodels/index.py
KalobTaulien Jun 1, 2021
916b89b
Update network-api/networkapi/wagtailpages/pagemodels/publications/ar…
KalobTaulien Jun 1, 2021
4d7a9b5
Update network-api/networkapi/wagtailpages/pagemodels/products.py
KalobTaulien Jun 1, 2021
538f1ba
Update network-api/networkapi/wagtailpages/pagemodels/publications/pu…
KalobTaulien Jun 1, 2021
ff7c89d
Minor adjustments
KalobTaulien Jun 1, 2021
a056f99
Field fixes
KalobTaulien Jun 1, 2021
11be947
Don't support translating footnotes until wagtail-localize and wagtai…
KalobTaulien Jun 2, 2021
622a061
Campaign page fields
KalobTaulien Jun 2, 2021
105c851
More translation fields
KalobTaulien Jun 2, 2021
344cec2
Issue refs
KalobTaulien Jun 3, 2021
74f5daf
Oop
KalobTaulien Jun 3, 2021
321db34
Homepage snippet and orderable support
KalobTaulien Jun 4, 2021
7daf612
More snippet support
KalobTaulien Jun 4, 2021
4081cee
More translations
KalobTaulien Jun 4, 2021
7b2868e
Flake8
KalobTaulien Jun 4, 2021
6096b4e
Migration cleanup
KalobTaulien Jun 4, 2021
2d7d43e
Merge branch 'wagtail-localize-2021' into 6708-snippet-translations
KalobTaulien Jun 4, 2021
06dcf28
Migration cleanup
KalobTaulien Jun 7, 2021
67024e5
Migration already exists
KalobTaulien Jun 7, 2021
3e3c245
More translation migrations
KalobTaulien Jun 7, 2021
92637c3
So. many. translations
KalobTaulien Jun 7, 2021
aa02f3f
Merge branch 'wagtail-localize-2021' into 6708-snippet-translations
KalobTaulien Jun 8, 2021
3c4719d
Wagtail 2.13. Needed for the 0062 wagtail core comment migration
KalobTaulien Jun 9, 2021
5345110
Meta class migrations
KalobTaulien Jun 9, 2021
0042084
Forgot to bootstrap the DonationModal (singular)
KalobTaulien Jun 9, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Generated by Django 3.1.11 on 2021-05-31 17:35

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('wagtailcore', '0062_comment_models_and_pagesubscription'),
('highlights', '0004_remove_highlight_image'),
]

operations = [
migrations.AddField(
model_name='highlight',
name='locale',
field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailcore.locale'),
),
migrations.AddField(
model_name='highlight',
name='translation_key',
field=models.UUIDField(editable=False, null=True),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Generated by Django 3.1.11 on 2021-05-31 17:18

from django.db import migrations
from wagtail.core.models import BootstrapTranslatableModel


class Migration(migrations.Migration):

dependencies = [
('highlights', '0005_auto_20210531_1735'),
]

operations = [
BootstrapTranslatableModel('highlights.Highlight'),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Generated by Django 3.1.11 on 2021-05-31 18:02

from django.db import migrations, models
import django.db.models.deletion
import uuid


class Migration(migrations.Migration):

dependencies = [
('wagtailcore', '0062_comment_models_and_pagesubscription'),
('highlights', '0006_bootstrap_migration'),
]

operations = [
migrations.AlterField(
model_name='highlight',
name='locale',
field=models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailcore.locale'),
preserve_default=False,
),
migrations.AlterField(
model_name='highlight',
name='translation_key',
field=models.UUIDField(default=uuid.uuid4, editable=False),
),
migrations.AlterUniqueTogether(
name='highlight',
unique_together={('translation_key', 'locale')},
),
]
5 changes: 3 additions & 2 deletions network-api/networkapi/highlights/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from adminsortable.models import SortableMixin
from wagtail.admin.edit_handlers import FieldPanel
from wagtail.core.fields import RichTextField
from wagtail.core.models import TranslatableMixin
from wagtail.images.edit_handlers import ImageChooserPanel
from wagtail.snippets.models import register_snippet

Expand Down Expand Up @@ -33,7 +34,7 @@ def published(self):


@register_snippet
class Highlight(SortableMixin):
class Highlight(TranslatableMixin, SortableMixin):
"""
An data type to highlight things like pulse
projects, custom pages, etc
Expand Down Expand Up @@ -99,7 +100,7 @@ class Highlight(SortableMixin):

objects = HighlightQuerySet.as_manager()

class Meta:
class Meta(TranslatableMixin.Meta):
verbose_name_plural = 'highlights'
ordering = ('order',)

Expand Down
28 changes: 27 additions & 1 deletion network-api/networkapi/mozfest/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
from wagtail.core.models import Page
from wagtail.images.edit_handlers import ImageChooserPanel
from wagtail.snippets.edit_handlers import SnippetChooserPanel
from wagtail_localize.fields import SynchronizedField, TranslatableField


from networkapi.wagtailpages.utils import (
set_main_site_nav_information,
Expand Down Expand Up @@ -167,10 +169,34 @@ class MozfestHomepage(MozfestPrimaryPage):
else:
content_panels = all_panels

# Because we inherit from PrimaryPage, but the "use_wide_templatae" property does nothing
# Because we inherit from PrimaryPage, but the "use_wide_template" property does nothing
# we should hide it and make sure we use the right template
settings_panels = Page.settings_panels

translatable_fields = [
# Promote tab fields
SynchronizedField('slug'),
TranslatableField('seo_title'),
SynchronizedField('show_in_menus'),
TranslatableField('search_description'),
SynchronizedField('search_image'),
# Content tab fields
TranslatableField('title'),
TranslatableField('cta_button_label'),
SynchronizedField('cta_button_destination'),
TranslatableField('banner_heading'),
TranslatableField('banner_guide_text'),
SynchronizedField('banner_video_url'),
TranslatableField('title'),
TranslatableField('search_description'),
TranslatableField('search_image'),
TranslatableField('signup'),
TranslatableField('body'),
# TODO: Add in footnote support when wagtail-footnotes and wagtail-localize can work together.
# Issue can be found at https://github.com/mozilla/foundation.mozilla.org/issues/6790
# TranslatableField('footnotes'),
]

def get_context(self, request):
context = super().get_context(request)
context['banner_video_type'] = self.specific.banner_video_type
Expand Down
25 changes: 25 additions & 0 deletions network-api/networkapi/news/migrations/0005_auto_20210531_1735.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Generated by Django 3.1.11 on 2021-05-31 17:35

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('wagtailcore', '0062_comment_models_and_pagesubscription'),
('news', '0004_remove_news_featured'),
]

operations = [
migrations.AddField(
model_name='news',
name='locale',
field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailcore.locale'),
),
migrations.AddField(
model_name='news',
name='translation_key',
field=models.UUIDField(editable=False, null=True),
),
]
15 changes: 15 additions & 0 deletions network-api/networkapi/news/migrations/0006_bootstrap_migration.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Generated by Django 3.1.11 on 2021-05-31 17:37

from django.db import migrations
from wagtail.core.models import BootstrapTranslatableModel


class Migration(migrations.Migration):

dependencies = [
('news', '0005_auto_20210531_1735'),
]

operations = [
BootstrapTranslatableModel('news.News')
]
31 changes: 31 additions & 0 deletions network-api/networkapi/news/migrations/0007_localize_migration.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Generated by Django 3.1.11 on 2021-05-31 18:02

from django.db import migrations, models
import django.db.models.deletion
import uuid


class Migration(migrations.Migration):

dependencies = [
('wagtailcore', '0062_comment_models_and_pagesubscription'),
('news', '0006_bootstrap_migration'),
]

operations = [
migrations.AlterField(
model_name='news',
name='locale',
field=models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailcore.locale'),
preserve_default=False,
),
migrations.AlterField(
model_name='news',
name='translation_key',
field=models.UUIDField(default=uuid.uuid4, editable=False),
),
migrations.AlterUniqueTogether(
name='news',
unique_together={('translation_key', 'locale')},
),
]
5 changes: 3 additions & 2 deletions network-api/networkapi/news/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from networkapi.utility.images import get_image_upload_path
from wagtail.snippets.models import register_snippet
from wagtail.core.models import TranslatableMixin


def get_thumbnail_upload_path(instance, filename):
Expand All @@ -29,7 +30,7 @@ def published(self):


@register_snippet
class News(models.Model):
class News(TranslatableMixin, models.Model):
"""
Medium blog posts, articles and other media
"""
Expand Down Expand Up @@ -88,7 +89,7 @@ class News(models.Model):

objects = NewsQuerySet.as_manager()

class Meta:
class Meta(TranslatableMixin.Meta):
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's check if this is actually necessary or not. If we don't need to mark the Meta class as translatable, that saves some migration work. (not much, but "not doing anything we don't need to do is worth not doing" =D)

"""Meta settings for news model"""

verbose_name = 'news article'
Expand Down
9 changes: 5 additions & 4 deletions network-api/networkapi/wagtailpages/donation_modal.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from django.db import models

from wagtail.core.models import TranslatableMixin
from wagtail.snippets.edit_handlers import SnippetChooserPanel
from wagtail.snippets.models import register_snippet
from modelcluster.fields import ParentalKey


@register_snippet
class DonationModal(models.Model):
class DonationModal(TranslatableMixin, models.Model):
name = models.CharField(
default='',
max_length=100,
Expand Down Expand Up @@ -48,11 +49,11 @@ def to_simple_dict(self):
def __str__(self):
return self.name

class Meta:
class Meta(TranslatableMixin.Meta):
verbose_name_plural = 'Donation CTA'


class DonationModals(models.Model):
class DonationModals(TranslatableMixin, models.Model):
page = ParentalKey(
'wagtailpages.CampaignPage',
related_name='donation_modals',
Expand All @@ -75,6 +76,6 @@ def to_simple_dict(self):
SnippetChooserPanel('donation_modal'),
]

class Meta:
class Meta(TranslatableMixin.Meta):
verbose_name = 'Donation Modals'
verbose_name_plural = 'Donation Modals'
Loading