From 8736f547846111bd7ad90640779dc6442dd41313 Mon Sep 17 00:00:00 2001
From: Dennis McGregor <cluttering@gmail.com>
Date: Fri, 6 Sep 2024 07:52:09 +1200
Subject: [PATCH] Add sync translations from latest revision support

---
 wagtail_localize/models.py                    |  4 ++-
 .../admin/update_translations.html            |  2 +-
 wagtail_localize/views/update_translations.py | 25 ++++++++++++++++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/wagtail_localize/models.py b/wagtail_localize/models.py
index 5aa196ea..dc8c9e65 100644
--- a/wagtail_localize/models.py
+++ b/wagtail_localize/models.py
@@ -448,7 +448,7 @@ def update_or_create_from_instance(cls, instance):
         return source, created
 
     @transaction.atomic
-    def update_from_db(self):
+    def update_from_db(self, from_latest_revision=False):
         """
         Retrieves the source instance from the database and updates this TranslationSource
         with its current contents.
@@ -457,6 +457,8 @@ def update_from_db(self):
             Model.DoesNotExist: If the source instance has been deleted.
         """
         instance = self.get_source_instance()
+        if from_latest_revision and isinstance(instance, RevisionMixin):
+            instance = instance.get_latest_revision_as_object()
 
         if isinstance(instance, ClusterableModel):
             self.content_json = instance.to_json()
diff --git a/wagtail_localize/templates/wagtail_localize/admin/update_translations.html b/wagtail_localize/templates/wagtail_localize/admin/update_translations.html
index 19149490..ad8076ef 100644
--- a/wagtail_localize/templates/wagtail_localize/admin/update_translations.html
+++ b/wagtail_localize/templates/wagtail_localize/admin/update_translations.html
@@ -37,7 +37,7 @@
             <ul class="fields">
                 {% block visible_fields %}
                     {% for field in form.visible_fields %}
-                        {% if field.name == 'publish_translations' %}
+                        {% if field.name == 'publish_translations' or field.name == 'from_revision' %}
                             <li class="publish-translations-field">
                                 <div class="field boolean_field checkbox_input">
                                     <div class="field-content">
diff --git a/wagtail_localize/views/update_translations.py b/wagtail_localize/views/update_translations.py
index 09093da6..81b4993e 100644
--- a/wagtail_localize/views/update_translations.py
+++ b/wagtail_localize/views/update_translations.py
@@ -13,7 +13,7 @@
 from django.views.generic import TemplateView
 from django.views.generic.detail import SingleObjectMixin
 from wagtail.admin.views.pages.utils import get_valid_next_url_from_request
-from wagtail.models import Page
+from wagtail.models import Page, RevisionMixin
 from wagtail.snippets.models import get_snippet_models
 from wagtail.utils.version import get_main_version
 
@@ -29,6 +29,20 @@ class UpdateTranslationsForm(forms.Form):
         ),
         required=False,
     )
+    from_revision = forms.BooleanField(
+        label=gettext_lazy("Sync draft changes"),
+        help_text=gettext_lazy(
+            "This will update translations with current draft content. "
+            "If not set, then only published changes will be synced."
+        ),
+        required=False,
+    )
+
+    def __init__(self, instance, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        source_instance = instance.get_source_instance()
+        if not isinstance(source_instance, RevisionMixin):
+            self.fields["from_revision"].widget = forms.HiddenInput()
 
 
 class UpdateTranslationsView(SingleObjectMixin, TemplateView):
@@ -48,9 +62,9 @@ def get_subtitle(self):
 
     def get_form(self):
         if self.request.method == "POST":
-            return UpdateTranslationsForm(self.request.POST)
+            return UpdateTranslationsForm(self.object, self.request.POST)
         else:
-            return UpdateTranslationsForm()
+            return UpdateTranslationsForm(self.object)
 
     def get_success_message(self):
         return _("Successfully updated translations for '{object}'").format(
@@ -130,7 +144,10 @@ def post(self, request, **kwargs):
 
     @transaction.atomic
     def form_valid(self, form):
-        self.object.update_from_db()
+        from_latest_revision = False
+        if form.cleaned_data["from_revision"]:
+            from_latest_revision = True
+        self.object.update_from_db(from_latest_revision)
 
         enabled_translations = self.object.translations.filter(enabled=True)