improving formulator queries

ashwoods · Mar 2, 2015 · 783695e · 783695e
1 parent 7e358ab
commit 783695e
Showing 1 changed file with 8 additions and 20 deletions.
diff --git a/formulator/models.py b/formulator/models.py
@@ -137,12 +137,9 @@ def __str__(self):
         return "FieldSet: %s %s" % (self.name, self.form.name)
 
 
-    @property
+    @cached_property
     def safe_legend(self):
-        try:
-            return self.legend
-        except:
-            return self.name.title()
+        return self.safe_translation_getter('legend', self.name.title())
 
     @cached_property
     def fields(self):
@@ -214,26 +211,17 @@ class Meta:
     def __str__(self):
         return "Field: %s" % self.name
 
-    @property
+    @cached_property
     def safe_label(self):
-        try:
-            return self.label
-        except:
-            return self.name.title()
+        return self.safe_translation_getter('label', self.name.title())
 
-    @property
+    @cached_property
     def safe_initial(self):
-        try:
-            return self.initial
-        except:
-            return ''
+        return self.safe_translation_getter('initial', '')
 
-    @property
+    @cached_property
     def safe_help_text(self):
-        try:
-            return self.help_text
-        except:
-            return ''
+        return self.safe_translation_getter('help_text', '')
 
     def formfield_instance_factory(self, field_class=None, attrs=None):
         """Returns an instance of a form field"""