Fixed auto creation of child pages

Author: kaedroho

wagtail_localize_pontoon/importer.py

@@ -130,11 +130,12 @@ def try_update_resource_translation(self, resource, language):
                 self.logger.info(
                     f"Cannot save translated page for '{resource.page.title}' in {language.get_display_name()} yet as its parent must be translated first"
                 )
+                return
 
             if created:
                 # Check if this page has any children that may be ready to translate
                 child_page_resources = PontoonResource.objects.filter(
-                    page__in=revision.page.get_children()
+                    page__in=resource.page.get_children()
                 )
 
                 for resource in child_page_resources:
@@ -157,8 +158,7 @@ def import_file(self, filename, old_content, new_content):
         old_po = polib.pofile(old_content.decode("utf-8"))
         new_po = polib.pofile(new_content.decode("utf-8"))
 
-        with transaction.atomic():
-            self.import_resource(resource, language, old_po, new_po)
+        self.import_resource(resource, language, old_po, new_po)
 
-            # Check if the translated page is ready to be created/updated
-            self.try_update_resource_translation(resource, language)
+        # Check if the translated page is ready to be created/updated
+        self.try_update_resource_translation(resource, language)

wagtail_localize_pontoon/models.py

@@ -171,12 +171,16 @@ def find_translatable_submission(self, language):
             )
 
         for submission in submissions_to_check:
-            translated_segments, total_segments = submission.get_translation_progress(
+            total_segments, translated_segments = submission.get_translation_progress(
                 language
             )
 
             if translated_segments == total_segments:
                 return submission
+            else:
+                import pdb
+
+                pdb.set_trace()
 
     def latest_submission(self):
         return self.submissions.latest("created_at")

wagtail_localize_pontoon/test/tests/test_importer.py

@@ -14,8 +14,8 @@
 
 
 def create_test_page(**kwargs):
-    root_page = Page.objects.get(id=1)
-    page = root_page.add_child(instance=TestPage(**kwargs))
+    parent = kwargs.pop("parent", None) or Page.objects.get(id=1)
+    page = parent.add_child(instance=TestPage(**kwargs))
     revision = page.save_revision()
     revision.publish()
     return page
@@ -118,3 +118,102 @@ def test_importer(self):
             log_resource = log.resources.get()
             self.assertEqual(log_resource.resource, self.resource)
             self.assertEqual(log_resource.language, self.language)
+
+    def test_importer_doesnt_import_if_parent_not_translated(self):
+        child_page = create_test_page(
+            title="Test child page",
+            slug="test-child-page",
+            test_translatable_field="The test child's translatable field",
+            test_synchronized_field="The test synchronized field",
+            parent=self.page,
+        )
+        child_resource = PontoonResource.objects.get(page=child_page)
+
+        with self.subTest(stage="Create child page"):
+            # Translate
+            po_v1 = create_test_po(
+                [("The test child's translatable field", "")]
+            ).encode("utf-8")
+
+            po_v2 = create_test_po(
+                [
+                    (
+                        "The test child's translatable field",
+                        "Le champ traduisible de test",
+                    )
+                ]
+            ).encode("utf-8")
+
+            importer = Importer(Language.objects.default(), logging.getLogger("dummy"))
+            importer.start_import("0" * 40)
+            importer.import_file(
+                child_resource.get_po_filename(language=self.language), po_v1, po_v2
+            )
+
+            # Check translated page was not created
+            self.assertFalse(
+                child_page.get_translations()
+                .filter(locale__language=self.language)
+                .exists()
+            )
+
+            # Check log
+            log = PontoonSyncLog.objects.get()
+            self.assertEqual(log.action, PontoonSyncLog.ACTION_PULL)
+            self.assertEqual(log.commit_id, "0" * 40)
+            log_resource = log.resources.get()
+            self.assertEqual(log_resource.resource, child_resource)
+            self.assertEqual(log_resource.language, self.language)
+
+        with self.subTest(stage="Create parent page"):
+            po_v1 = create_test_po([("The test translatable field", "")]).encode(
+                "utf-8"
+            )
+
+            po_v2 = create_test_po(
+                [("The test translatable field", "Le champ traduisible de test")]
+            ).encode("utf-8")
+
+            importer = Importer(Language.objects.default(), logging.getLogger("dummy"))
+            importer.start_import("0" * 39 + "1")
+            importer.import_file(
+                self.resource.get_po_filename(language=self.language), po_v1, po_v2
+            )
+
+            # Check both translated pages were created
+            translated_parent = self.page.get_translations().get(
+                locale__language=self.language
+            )
+            self.assertEqual(
+                translated_parent.translation_key, self.page.translation_key
+            )
+            self.assertFalse(translated_parent.is_source_translation)
+            self.assertEqual(
+                translated_parent.test_translatable_field,
+                "Le champ traduisible de test",
+            )
+            self.assertEqual(
+                translated_parent.test_synchronized_field, "The test synchronized field"
+            )
+
+            translated_child = child_page.get_translations().get(
+                locale__language=self.language
+            )
+            self.assertEqual(
+                translated_child.translation_key, child_page.translation_key
+            )
+            self.assertFalse(translated_child.is_source_translation)
+            self.assertEqual(
+                translated_child.test_translatable_field, "Le champ traduisible de test"
+            )
+            self.assertEqual(
+                translated_child.test_synchronized_field, "The test synchronized field"
+            )
+
+            # Check log
+            log = PontoonSyncLog.objects.exclude(id=log.id).get()
+            self.assertEqual(log.action, PontoonSyncLog.ACTION_PULL)
+            self.assertEqual(log.commit_id, "0" * 39 + "1")
+            log_resource = log.resources.get()
+            self.assertEqual(log_resource.resource, self.resource)
+            self.assertEqual(log_resource.language, self.language)