Changeset 230

Timestamp:

03/09/10 18:09:09 (3 years ago)

Author:

luciano.ramalho

Message:

added translation to assistance models (FAQ, FieldHelp?); refactored code from vocabulary.admin to polyglot.admin

Location:

trunk/clinicaltrials

Files:

• assistance/admin.py (modified) (1 diff)
• assistance/models.py (modified) (4 diffs)
• polyglot/admin.py (added)
• utilities.py (modified) (2 diffs)
• vocabulary/admin.py (modified) (2 diffs)
• vocabulary/models.py (modified) (1 diff)

trunk/clinicaltrials/assistance/admin.py

@@ -3 +3 @@
 from utilities import safe_truncate
 
-class FieldHelpAdmin(admin.ModelAdmin):
-    list_display = ('form','field','done','short_text')
+from polyglot.admin import TranslationInline, TranslationAdmin
+
+class FieldHelpTranslationInline(TranslationInline):
+    model = FieldHelpTranslation
+
+class FieldHelpAdmin(TranslationAdmin):
+    list_display = ('form','field','short_text',
+                    'translation_completed', 'missing_translations')
     list_display_links = ('form','field')
     search_fields = ('form','field')
     list_filter = ('form',)
-    
-    def done(self, obj):
-        return bool(obj.text.strip())
-    done.boolean = True
-    
+    inlines = [FieldHelpTranslationInline]
+
     def short_text(self, obj):
-        return safe_truncate(obj.text, 80)
-    
-        
-admin.site.register(Category)
-admin.site.register(Question)
+        return safe_truncate(obj.text)
+
+class CategoryTranslationInline(TranslationInline):
+    model = CategoryTranslation
+
+class CategoryAdmin(TranslationAdmin):
+    inlines = [CategoryTranslationInline]
+    list_display = ('label',
+                    'translation_completed', 'missing_translations')
+
+class QuestionTranslationInline(TranslationInline):
+    model = QuestionTranslation
+
+class QuestionAdmin(TranslationAdmin):
+    inlines = [QuestionTranslationInline]
+    list_display = ('title','short_text',
+                    'translation_completed', 'missing_translations')
+    def short_text(self, obj):
+        return safe_truncate(obj.answer)
+
 admin.site.register(FieldHelp, FieldHelpAdmin)
+admin.site.register(Category, CategoryAdmin)
+admin.site.register(Question, QuestionAdmin)

trunk/clinicaltrials/assistance/models.py

@@ -1 +1 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+from django.contrib.contenttypes import generic
+
+from polyglot.models import Translation
+
 from datetime import datetime
 
@@ -8 +12 @@
 
     label = models.CharField(_('Label'), max_length=255, unique=True)
-    
+    translations = generic.GenericRelation('CategoryTranslation')
+
     def __unicode__(self):
         return self.label
 
+class CategoryTranslation(Translation):
+    label = models.CharField(_('Label'), max_length=255, unique=True)
 
 class Question(models.Model):
-
     category = models.ForeignKey(Category)
-    title = models.TextField(_('Title'), max_length=2000)
-    answer = models.TextField(_('Answer'), max_length=2000)
+    title = models.TextField(_('Title'), max_length=255)
+    answer = models.TextField(_('Answer'), max_length=2048)
     order = models.PositiveIntegerField(default=0)
     created = models.DateTimeField(_('Date of Registration'), default=datetime.now,
         editable=False)
+    translations = generic.GenericRelation('QuestionTranslation')
 
     def save(self):
@@ -30 +37 @@
     def __unicode__(self):
         return self.title
-    
+
+class QuestionTranslation(Translation):
+    title = models.TextField(_('Title'), max_length=255)
+    answer = models.TextField(_('Answer'), max_length=2048)
+
 class FieldHelp(models.Model):
     class Meta:
@@ -36 +47 @@
         unique_together = ('form', 'field')
         ordering = ('id',)
-        
+
     form = models.CharField(max_length=255, db_index=True)
     field = models.CharField(max_length=255, db_index=True)
-    text = models.TextField(max_length=2000, blank=True)
-    
+    text = models.TextField(max_length=2048, blank=True)
+    example = models.TextField(max_length=255, blank=True)
+
+    translations = generic.GenericRelation('FieldHelpTranslation')
+
     def __unicode__(self):
         return self.text
-        
+
+class FieldHelpTranslation(Translation):
+    text = models.TextField(max_length=2048, blank=True)
+    example = models.TextField(max_length=255, blank=True)

trunk/clinicaltrials/utilities.py

@@ -24 +24 @@
         rows.append('<tr><th>%s</th><td>%s</td></tr>' % (k, request.POST[k]))
     return HttpResponse(template % ('\n'.join(rows)))
-    
+
 
 ELLIPSIS = u'\u2026'
 
-def safe_truncate(text, max_length, ellipsis=ELLIPSIS, encoding='utf-8', 
+def safe_truncate(text, max_length=60, ellipsis=ELLIPSIS, encoding='utf-8',
                   raise_exc=False):
-    u'''truncate a string without breaking words 
+    u'''truncate a string without breaking words
 
         >>> safe_truncate(u'the time has come', 9, u'>')
@@ -75 +75 @@
     return text[:pos] + ellipsis
 
-    
+
 if __name__=='__main__':
     import doctest

trunk/clinicaltrials/vocabulary/admin.py

@@ -1 @@
-#!/usr/bin/env python
-
 from django.contrib import admin
 from django.contrib.contenttypes import generic
@@ -6 +4 @@
 
 from vocabulary.models import *
+from polyglot.admin import TranslationInline, TranslationAdmin
 
-class VocabularyTranslationInline(generic.GenericStackedInline):
+class VocabularyTranslationInline(TranslationInline):
     model = VocabularyTranslation
-    max_num = len(settings.TARGET_LANGUAGES)
-    radio_fields = {'language': admin.HORIZONTAL}
 
-class SimpleVocabularyAdmin(admin.ModelAdmin):
+class SimpleVocabularyAdmin(TranslationAdmin):
     list_display = ('label', 'description', 'translation_completed', 'missing_translations')
     inlines = [VocabularyTranslationInline]
 
-    def translation_completed(self, obj):
-        return len(Translation.missing(obj)) == 0
-    translation_completed.boolean = True
-
-class CountryCodeAdmin(SimpleVocabularyAdmin):
+class CountryCodeAdmin(TranslationAdmin):
     list_display = ('label', 'description', 'submission_language', 'translation_completed', 'missing_translations')
     search_fields = ('label', 'description')
+    list_filter = ('submission_language',)
     inlines = [VocabularyTranslationInline]
 

trunk/clinicaltrials/vocabulary/models.py

@@ -19 +19 @@
     def __unicode__(self):
         return self.label
-
-    def missing_translations(self):
-        return ' '.join(sorted(Translation.missing(self)))
 
     @classmethod