Use a templatetag for inline tables - update french translations - clean in migrations

1 files changed, 5 insertions, 14 deletions

diff --git a/chimere/models.py b/chimere/models.py
index 1933ba3..458fa31 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -55,7 +55,7 @@ class News(models.Model):
 class TinyUrl(models.Model):
     """Tinyfied version of permalink parameters
     """
-    parameters = models.CharField(_("uParameters"), max_length=500)
+    parameters = models.CharField(_(u"Parameters"), max_length=500)
     def __unicode__(self):
         return self.parameters
     class Meta:
@@ -377,19 +377,10 @@ class MultimediaFile(models.Model):
     name = models.CharField(_(u"Name"), max_length=150, blank=True, null=True)
     url = models.CharField(_(u"Url"), max_length=200)
     order = models.IntegerField(_(u"Order"), default=1)
-    multimedia_type = models.ForeignKey(MultimediaType, blank=True,
-                                        null=True)
+    multimedia_type = models.ForeignKey(MultimediaType)
 
     def __unicode__(self):
-        return self.name
-
-    def clean(self):
-        if self.url and not self.iframe:
-            raise ValidationError(_(u"Multimedia type is mandatory if is "\
-                                    u"not an iframe."))
-        if self.multimedia_type and self.iframe:
-            raise ValidationError(_(u"There is no multimedia type associated "\
-                                    u"to an iframe."))
+        return self.name or u""
 
 class PictureFile(models.Model):
     name = models.CharField(_(u"Name"), max_length=150, blank=True, null=True)
@@ -397,11 +388,11 @@ class PictureFile(models.Model):
                                 height_field='height', width_field='width')
     height = models.IntegerField(_(u"Height"))
     width = models.IntegerField(_(u"Width"))
-    miniature = models.BooleanField(_(u"Display inside the resume ?"))
+    miniature = models.BooleanField(_(u"Display inside the resume?"))
     order = models.IntegerField(_(u"Order"), default=1)
 
     def __unicode__(self):
-        return self.name
+        return self.name or u""
 
 class RouteFile(models.Model):
     name = models.CharField(_(u"Name"), max_length=150)