Use a less tricky implementation of fallback_to_any

matthiask · Jul 27, 2020 · aa1e324 · aa1e324
1 parent 22686e3
commit aa1e324
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/translated_fields/utils.py b/translated_fields/utils.py
@@ -23,17 +23,13 @@ def getter(self):
 def fallback_to_any(name, field):
     def getter(self):
         current = getattr(self, to_attribute(name), None)
-
-        return current or next(
-            filter(
-                None,
-                (
-                    getattr(self, to_attribute(name, language))
-                    for language in field.languages
-                ),
-            ),
-            "",
-        )
+        if current:
+            return current
+        for language in field.languages:
+            value = getattr(self, to_attribute(name, language))
+            if value:
+                return value
+        return ""
 
     return getter