Fix string extraction from nullable RichTextField

wagtail · Sep 23, 2022 · 7e6de4d · 7e6de4d
1 parent 7c8b75d
commit 7e6de4d
Show file tree

Hide file tree

Showing 6 changed files with 167 additions and 176 deletions.
diff --git a/wagtail_localize/segments/extract.py b/wagtail_localize/segments/extract.py
@@ -238,8 +238,10 @@ def extract_segments(instance):
                 )
 
         elif isinstance(field, RichTextField):
+            value = field.value_from_object(instance)
+
             if is_translatable:
-                template, strings = extract_strings(field.value_from_object(instance))
+                template, strings = extract_strings(value)
 
                 # Find all unique href values
                 hrefs = set()

diff --git a/wagtail_localize/segments/tests/test_segment_extraction.py b/wagtail_localize/segments/tests/test_segment_extraction.py
@@ -113,6 +113,10 @@ def test_richtextfield(self):
             [segment.wrap("test_richtextfield") for segment in RICH_TEXT_TEST_OUTPUT],
         )
 
+    def test_null_richtextfield(self):
+        page = make_test_page(test_null_richtextfield=None)
+        self.assertEqual(extract_segments(page), [])
+
     def test_snippet(self):
         test_snippet = TestSnippet.objects.create(field="Test content")
         page = make_test_page(test_snippet=test_snippet)

diff --git a/wagtail_localize/strings.py b/wagtail_localize/strings.py
@@ -297,6 +297,9 @@ def extract_strings(html):
         tuple[str, list[tuple[StringValue, dict]]]: Returns a template string, and list 2-tuples containing a
             StringValue and dict of HTML attribute
     """
+    if html is None:
+        html = ""
+
     soup = BeautifulSoup(html, "html.parser")
 
     def wrap(elements):