common: refactor get_user_text and get_admin_text

circle/common/models.py

@@ -444,24 +444,27 @@ class HumanReadableObject(object):
     def from_dict(cls, d):
     def from_dict(cls, d):
         return None if d is None else cls(**d)
         return None if d is None else cls(**d)
 
 
-    def get_admin_text(self):
-        if self.admin_text_template == "":
+    def _get_parsed_text(self, key):
+        value = getattr(self, key)
+        if value == "":
             return ""
             return ""
         try:
         try:
-            return _(self.admin_text_template) % self.params
+            return _(value) % self.params
+        except KeyError:
+            logger.exception("Can't render %s '%s' %% %s",
+                             key, value, unicode(self.params))
+            raise
+
+    def get_admin_text(self):
+        try:
+            return self._get_parsed_text("admin_text_template")
         except KeyError:
         except KeyError:
-            logger.exception("Can't render admin_text_template '%s' %% %s",
-                             self.admin_text_template, unicode(self.params))
             return self.get_user_text()
             return self.get_user_text()
 
 
     def get_user_text(self):
     def get_user_text(self):
-        if self.user_text_template == "":
-            return ""
         try:
         try:
-            return _(self.user_text_template) % self.params
+            return self._get_parsed_text("user_text_template")
         except KeyError:
         except KeyError:
-            logger.exception("Can't render user_text_template '%s' %% %s",
-                             self.user_text_template, unicode(self.params))
             return self.user_text_template
             return self.user_text_template
 
 
     def get_text(self, user):
     def get_text(self, user):