updating question with pictures

[edumed.git] / curriculum / models.py

diff --git a/curriculum/models.py b/curriculum/models.py
index ad98877..b53d2ca 100644 (file)
--- a/curriculum/models.py
+++ b/curriculum/models.py
@@ -2,10 +2,10 @@
 import re
 from django.core.urlresolvers import reverse
 from django.db import models
 import re
 from django.core.urlresolvers import reverse
 from django.db import models

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _, get_language
+from fnpdjango.utils.models.translation import add_translatable

 
 class Section(models.Model):
 
 class Section(models.Model):

-    name = models.CharField(_('name'), max_length=255)

     slug = models.SlugField(_('slug'))
     order = models.IntegerField(_('order'))
 
     slug = models.SlugField(_('slug'))
     order = models.IntegerField(_('order'))
 


@@ -23,10 +23,13 @@ class Section(models.Model):
     def url_for_level(self, level):
         return "%s?s=%d&level=%s&d=1" % (reverse("curriculum"), self.pk, level.slug)
         
     def url_for_level(self, level):
         return "%s?s=%d&level=%s&d=1" % (reverse("curriculum"), self.pk, level.slug)
         

+add_translatable(Section, {
+    'name': models.CharField(_('name'), max_length=255, default = '')
+})
+

 
 class Competence(models.Model):
     section = models.ForeignKey(Section)
 
 class Competence(models.Model):
     section = models.ForeignKey(Section)

-    name = models.CharField(_('name'), max_length=255)

     slug = models.SlugField(_('slug'))
     order = models.IntegerField(_('order'))
 
     slug = models.SlugField(_('slug'))
     order = models.IntegerField(_('order'))
 


@@ -51,14 +54,18 @@ class Competence(models.Model):
     def from_text(cls, text):
         """Tries to return a Competence or a Section."""
         parts = re.split(ur'[-\u2013]', text, 1)
     def from_text(cls, text):
         """Tries to return a Competence or a Section."""
         parts = re.split(ur'[-\u2013]', text, 1)

+        lookup_field_name = 'name_%s__iexact' % get_language()

         if len(parts) == 1:
         if len(parts) == 1:

-            return Section.objects.get(name__iexact=text.strip())
+            return Section.objects.get(**{lookup_field_name: text.strip()})

         else:
         else:

-            return cls.objects.get(name__iexact=parts[1].strip())
+            return cls.objects.get(**{lookup_field_name: parts[1].strip()})
+
+add_translatable(Competence, {
+    'name': models.CharField(_('name'), max_length=255, default = '')
+})
+

 
 class Level(models.Model):
 
 class Level(models.Model):

-    group = models.CharField(_('group'), max_length=255)
-    name = models.CharField(_('name'), max_length=255)

     slug = models.CharField(_('slug'), max_length=255)
     order = models.IntegerField(_('order'))
 
     slug = models.CharField(_('slug'), max_length=255)
     order = models.IntegerField(_('order'))
 


@@ -70,10 +77,15 @@ class Level(models.Model):
     def __unicode__(self):
         return self.name
 
     def __unicode__(self):
         return self.name
 

+add_translatable(Level, {
+    'name': models.CharField(_('name'), max_length=255, default = ''),
+    'group': models.CharField(_('group'), max_length=255, default = '')
+})
+
+

 class CompetenceLevel(models.Model):
     competence = models.ForeignKey(Competence)
     level = models.ForeignKey(Level)
 class CompetenceLevel(models.Model):
     competence = models.ForeignKey(Competence)
     level = models.ForeignKey(Level)

-    description = models.TextField(_('description'))

 
     class Meta:
         ordering = ['competence', 'level']
 
     class Meta:
         ordering = ['competence', 'level']


@@ -86,6 +98,9 @@ class CompetenceLevel(models.Model):
     def get_absolute_url(self):
         return "%s?c=%d&level=%s&d=1" % (reverse("curriculum"), self.competence.pk, self.level.slug)
 
     def get_absolute_url(self):
         return "%s?c=%d&level=%s&d=1" % (reverse("curriculum"), self.competence.pk, self.level.slug)
 

+add_translatable(CompetenceLevel, {
+    'description': models.TextField(_('description'), default = '')
+})

 
 
 class CurriculumLevel(models.Model):
 
 
 class CurriculumLevel(models.Model):