Unit: Consistent properties behavior

Make all is_* cached properties. Having method among them is confusing and easy to mistake in invocation.
WeblateOrg · Sep 21, 2020 · 4b023f7 · 4b023f7
1 parent d2a137a
commit 4b023f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/weblate/trans/models/translation.py b/weblate/trans/models/translation.py
@@ -622,7 +622,7 @@ def update_units(self, units, store, author_name, author_id):
                 store.add_unit(pounit.unit)
 
             # Store translations
-            if unit.is_plural():
+            if unit.is_plural:
                 pounit.set_target(unit.get_target_plurals())
             else:
                 pounit.set_target(unit.target)

diff --git a/weblate/trans/models/unit.py b/weblate/trans/models/unit.py
@@ -554,7 +554,7 @@ def update_from_unit(self, unit, pos, created):
         self.update_priority(save=False)
 
         # Sanitize number of plurals
-        if self.is_plural():
+        if self.is_plural:
             self.target = join_plural(self.get_target_plurals())
 
         if created:
@@ -609,11 +609,12 @@ def update_priority(self, save=True):
                     same_content=True, same_state=True, update_fields=["priority"]
                 )
 
+    @cached_property
     def is_plural(self):
         """Check whether message is plural."""
         return is_plural(self.source) or is_plural(self.target)
 
-    @property
+    @cached_property
     def is_source(self):
         return self.source_unit_id is None or self.source_unit_id == self.id
 
@@ -638,7 +639,7 @@ def source_string(self):
     def get_target_plurals(self):
         """Return target plurals in array."""
         # Is this plural?
-        if not self.is_plural():
+        if not self.is_plural:
             return [self.target]
 
         # Split plurals

diff --git a/weblate/trans/tests/test_component.py b/weblate/trans/tests/test_component.py
@@ -100,22 +100,22 @@ def test_create_ts(self):
         unit = Unit.objects.get(
             source__startswith="Orangutan", translation__language_code="cs"
         )
-        self.assertTrue(unit.is_plural())
+        self.assertTrue(unit.is_plural)
         self.assertFalse(unit.translated)
         self.assertFalse(unit.fuzzy)
 
         unit = Unit.objects.get(
             source__startswith="Hello", translation__language_code="cs"
         )
-        self.assertFalse(unit.is_plural())
+        self.assertFalse(unit.is_plural)
         self.assertTrue(unit.translated)
         self.assertFalse(unit.fuzzy)
         self.assertEqual(unit.target, "Hello, world!\n")
 
         unit = Unit.objects.get(
             source__startswith="Thank ", translation__language_code="cs"
         )
-        self.assertFalse(unit.is_plural())
+        self.assertFalse(unit.is_plural)
         self.assertFalse(unit.translated)
         self.assertTrue(unit.fuzzy)
         self.assertEqual(unit.target, "Thanks")