Changeset 512

Timestamp:

01/27/10 14:21:03 (6 weeks ago)

Author:

olivier

Message:

add internationalized verbose names to model fields, and gettext french translation ; update collection detail template

Location:

trunk/telemeta

Files:

• locale (added)
• locale/fr (added)
• locale/fr/LC_MESSAGES (added)
• locale/fr/LC_MESSAGES/django.mo (added)
• locale/fr/LC_MESSAGES/django.po (added)
• models/core.py (modified) (1 diff)
• models/crem.py (modified) (28 diffs)
• models/dublincore.py (modified) (2 diffs)
• templates/telemeta_default/base.html (modified) (1 diff)
• templates/telemeta_default/collection_detail.html (modified) (6 diffs)
• templatetags/telemeta_utils.py (modified) (2 diffs)

trunk/telemeta/models/core.py

@@ -134 +134 @@
 
     def __init__(self, *args, **kwargs):
-        super(DurationField, self).__init__(args, **normalize_field(kwargs, '00:00'))
+        super(DurationField, self).__init__(*args, **normalize_field(kwargs, '00:00'))
 
     def get_internal_type(self):

trunk/telemeta/models/crem.py

@@ -39 +39 @@
 from telemeta.util.unaccent import unaccent_icmp
 import re
+from django.db.models import FieldDoesNotExist
 from telemeta.models.core import DurationField, Duration, WeakForeignKey, EnhancedModel, \
                                  CharField, TextField, IntegerField, BooleanField, \
                                  DateTimeField, FileField, ForeignKey, FloatField, DateField
 from telemeta.models import dublincore as dc
+from django.utils.translation import ugettext_lazy as _
 
 class ModelCore(EnhancedModel):
@@ -115 +117 @@
         return fields_list
 
+    @classmethod
+    def field_label(cls, field_name):
+        try:
+            return cls._meta.get_field(field_name).verbose_name
+        except FieldDoesNotExist:
+            try:
+                return getattr(cls, field_name).verbose_name
+            except AttributeError:
+                return field_name
+
     class Meta:
         abstract = True
@@ -136 +148 @@
     code_regex             = '(?:%s|%s)' % (published_code_regex, unpublished_code_regex)
 
-    reference             = CharField(unique=True, null=True)
-    physical_format       = WeakForeignKey('PhysicalFormat', related_name="collections")
-    old_code              = CharField(unique=True, null=True)
-    code                  = CharField(unique=True, required=True)
-    title                 = CharField(required=True)
-    alt_title             = CharField()
-    physical_items_num    = IntegerField(default=0)
-    publishing_status     = WeakForeignKey('PublishingStatus', related_name="collections")
-    creator               = CharField()
-    booklet_author        = CharField()
-    booklet_description   = TextField()
-    collector             = CharField()
-    collector_is_creator  = BooleanField()
-    publisher             = WeakForeignKey('Publisher', related_name="collections")     
-    is_published          = BooleanField()
-    year_published        = IntegerField()
-    publisher_collection  = WeakForeignKey('PublisherCollection', related_name="collections")
-    publisher_serial      = CharField()
-    external_references   = TextField()
-    acquisition_mode      = WeakForeignKey('AcquisitionMode', related_name="collections")
-    comment               = TextField()
-    metadata_author       = WeakForeignKey('MetadataAuthor', related_name="collections")
-    metadata_writer       = WeakForeignKey('MetadataWriter', related_name="collections")
-    legal_rights          = WeakForeignKey('LegalRight', related_name="collections")
-    alt_ids               = CharField()
-    recorded_from_year    = IntegerField()
-    recorded_to_year      = IntegerField()
-    recording_context     = WeakForeignKey('RecordingContext', related_name="collections")
-    approx_duration       = DurationField()
-    doctype_code          = IntegerField()
-    travail               = CharField()
-    state                 = TextField()
-    cnrs_contributor      = CharField()
-    items_done            = CharField()
-    a_informer_07_03      = CharField()
-    ad_conversion         = WeakForeignKey('AdConversion', related_name='collections')
-    public_access         = CharField(choices=PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata")
+    reference             = CharField(_('reference'), unique=True, null=True)
+    physical_format       = WeakForeignKey('PhysicalFormat', related_name="collections", 
+                                           verbose_name=_('archive format'))
+    old_code              = CharField(_('old code'), unique=True, null=True)
+    code                  = CharField(_('code'), unique=True, required=True)
+    title                 = CharField(_('title'), required=True)
+    alt_title             = CharField(_('original title / translation'))
+    physical_items_num    = IntegerField(_('number of components (medium / piece)'))
+    publishing_status     = WeakForeignKey('PublishingStatus', related_name="collections", 
+                                           verbose_name=_('secondary edition'))
+    creator               = CharField(_('depositor / contributor'))
+    booklet_author        = CharField(_('author of published notice'))
+    booklet_description   = TextField(_('related documentation'))
+    collector             = CharField(_('collector'))
+    collector_is_creator  = BooleanField(_('collector identical to depositor'))
+    publisher             = WeakForeignKey('Publisher', related_name="collections", 
+                                           verbose_name=_('publisher / status'))     
+    is_published          = BooleanField(_('published'))
+    year_published        = IntegerField(_('year published'))
+    publisher_collection  = WeakForeignKey('PublisherCollection', related_name="collections", 
+                                            verbose_name=_('publisher collection'))
+    publisher_serial      = CharField(_('publisher serial number'))
+    external_references   = TextField(_('bibliographic references'))
+    acquisition_mode      = WeakForeignKey('AcquisitionMode', related_name="collections", 
+                                            verbose_name=_('mode of acquisition'))
+    comment               = TextField(_('comment'))
+    metadata_author       = WeakForeignKey('MetadataAuthor', related_name="collections", 
+                                           verbose_name=_('record author'))
+    metadata_writer       = WeakForeignKey('MetadataWriter', related_name="collections", 
+                                           verbose_name=_('record writer'))
+    legal_rights          = WeakForeignKey('LegalRight', related_name="collections", 
+                                           verbose_name=_('legal rights'))
+    alt_ids               = CharField(_('copies'))
+    recorded_from_year    = IntegerField(_('recording year (from)'))
+    recorded_to_year      = IntegerField(_('recording year (until)'))
+    recording_context     = WeakForeignKey('RecordingContext', related_name="collections", 
+                                           verbose_name=_('recording context'))
+    approx_duration       = DurationField(_('approximative duration'))
+    doctype_code          = IntegerField(_('document type'))
+    travail               = CharField(_('archiver notes'))
+    state                 = TextField(_('status'))
+    cnrs_contributor      = CharField(_('CNRS depositor'))
+    items_done            = CharField(_('items finished'))
+    a_informer_07_03      = CharField(_('a_informer_07_03'))
+    ad_conversion         = WeakForeignKey('AdConversion', related_name='collections', 
+                                           verbose_name=_('A/D conversion'))
+    public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, 
+                                      max_length=16, default="metadata")
 
     objects               = query.MediaCollectionManager()
@@ -194 +217 @@
         return unaccent_icmp(obj1.name, obj2.name)
 
-    def get_countries(self):
+    def countries(self):
         "Return the countries of the items"
         countries = []
@@ -207 +230 @@
 
         return countries
-
-    def get_ethnic_groups(self):
+    countries.verbose_name = _("states / nations")
+
+    def ethnic_groups(self):
         "Return the ethnic groups of the items"
         groups = []
@@ -219 +243 @@
 
         return groups
+    ethnic_groups.verbose_name = _('populations / social groups')
+
+    def computed_duration(self):
+        duration = Duration()
+        for item in self.items.all():
+            duration += item.computed_duration()
+
+        return duration
+    computed_duration.verbose_name = _('computed duration')        
 
     def is_valid_code(self, code):
@@ -251 +284 @@
     code_regex              = '(?:%s|%s)' % (published_code_regex, unpublished_code_regex)
 
-    collection            = ForeignKey('MediaCollection', related_name="items")
-    track                 = CharField()
-    old_code              = CharField(unique=True, null=True)
-    code                  = CharField(unique=True, null=True)
-    approx_duration       = DurationField()
-    recorded_from_date    = DateField()
-    recorded_to_date      = DateField()
-    location              = WeakForeignKey('Location', related_name="items",
-                                           db_column='location_name')
-    location_comment      = CharField()
-    ethnic_group          = WeakForeignKey('EthnicGroup', related_name="items")
-    title                 = CharField(required=True)
-    alt_title             = CharField()
-    author                = CharField()
-    vernacular_style      = WeakForeignKey('VernacularStyle', related_name="items")
-    context_comment       = TextField()
-    external_references   = TextField()
-    moda_execut           = CharField()
-    copied_from_item      = WeakForeignKey('self', related_name="copies")
-    collector             = CharField()
-    cultural_area         = CharField()
-    generic_style         = WeakForeignKey('GenericStyle', related_name="items")
-    collector_selection   = CharField()
-    creator_reference     = CharField()
-    comment               = TextField()
-    file                  = FileField(upload_to='items/%Y/%m/%d', db_column="filename")
-    public_access         = CharField(choices=PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata")
+    collection            = ForeignKey('MediaCollection', related_name="items", 
+                                       verbose_name=_('collection'))
+    track                 = CharField(_('item number'))
+    old_code              = CharField(_('old code'), unique=True, null=True)
+    code                  = CharField(_('code'), unique=True, null=True)
+    approx_duration       = DurationField(_('approximative duration'))
+    recorded_from_date    = DateField(_('recording date (from)'))
+    recorded_to_date      = DateField(_('recording date (until)'))
+    location              = WeakForeignKey('Location', related_name="items", 
+                                           db_column='location_name', verbose_name=_('location'))
+    location_comment      = CharField(_('location comment'))
+    ethnic_group          = WeakForeignKey('EthnicGroup', related_name="items", 
+                                           verbose_name=_('population / social group'))
+    title                 = CharField(_('title'), required=True)
+    alt_title             = CharField(_('original title / translation'))
+    author                = CharField(_('author'))
+    vernacular_style      = WeakForeignKey('VernacularStyle', related_name="items", 
+                                           verbose_name=_('vernacular name'))
+    context_comment       = TextField(_('comments'))
+    external_references   = TextField(_('published reference'))
+    moda_execut           = CharField(_('moda_execut'))
+    copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of'))
+    collector             = CharField(_('collector'))
+    cultural_area         = CharField(_('cultural area'))
+    generic_style         = WeakForeignKey('GenericStyle', related_name="items", 
+                                           verbose_name=_('generic name'))
+    collector_selection   = CharField(_('collector selection'))
+    creator_reference     = CharField(_('depositor reference'))
+    comment               = TextField(_('comment'))
+    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")
+    public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata")
 
     objects               = query.MediaItemManager()
@@ -317 +354 @@
         super(MediaItem, self).save(force_insert, force_update, using)
 
-    def duration(self):
+    def computed_duration(self):
         "Tell the length in seconds of this item media data"
         # FIXME: use TimeSide?
@@ -327 +364 @@
             media.close()
 
-        if seconds:
-            return Duration(seconds=seconds)
-
-        return self.approx_duration
+        return Duration(seconds=seconds)
+
+    computed_duration.verbose_name = _('computed duration')        
 
     def __unicode__(self):
@@ -340 +376 @@
     "Describe an item part"
     element_type = 'part'
-    item  = ForeignKey('MediaItem', related_name="parts")
-    title = CharField(required=True)
-    start = FloatField(required=True)
-    end   = FloatField(required=True)
+    item  = ForeignKey('MediaItem', related_name="parts", verbose_name=_('item'))
+    title = CharField(_('title'), required=True)
+    start = FloatField(_('start'), required=True)
+    end   = FloatField(_('end'), required=True)
     
     class Meta(MetaCore):
@@ -353 +389 @@
 class Enumeration(ModelCore):
     "Abstract enumerations base class"
-    value = CharField(required=True, unique=True)
+    value = CharField(_('value'), required=True, unique=True)
     
     def __unicode__(self):
@@ -423 +459 @@
 class Instrument(ModelCore):
     "Instrument used in the item"
-    name    = CharField(required=True)
+    name    = CharField(_('name'), required=True)
 
     class Meta(MetaCore):
@@ -433 +469 @@
 class InstrumentAlias(ModelCore):
     "Instrument other name"
-    name = CharField(required=True)
+    name = CharField(_('name'), required=True)
 
     class Meta(MetaCore):
@@ -443 +479 @@
 class InstrumentRelation(ModelCore):
     "Instrument family"
-    instrument        = ForeignKey('Instrument', related_name="parent_relation")
-    parent_instrument = ForeignKey('Instrument', related_name="child_relation")
+    instrument        = ForeignKey('Instrument', related_name="parent_relation", 
+                                   verbose_name=_('instrument'))
+    parent_instrument = ForeignKey('Instrument', related_name="child_relation", 
+                                   verbose_name=_('parent instrument'))
 
     class Meta(MetaCore):
@@ -452 +490 @@
 class InstrumentAliasRelation(ModelCore):
     "Instrument family other name"
-    alias      = ForeignKey('InstrumentAlias', related_name="other_name")
-    instrument = ForeignKey('InstrumentAlias', related_name="relation")
+    alias      = ForeignKey('InstrumentAlias', related_name="other_name", 
+                            verbose_name=_('alias'))
+    instrument = ForeignKey('InstrumentAlias', related_name="relation", 
+                            verbose_name=_('instrument'))
 
     class Meta(MetaCore):
@@ -461 +501 @@
 class MediaItemPerformance(ModelCore):
     "Item performance"
-    media_item      = ForeignKey('MediaItem', related_name="performances")
-    instrument      = WeakForeignKey('Instrument', related_name="performances")
-    alias           = WeakForeignKey('InstrumentAlias', related_name="performances")
-    instruments_num = CharField()
-    musicians       = CharField()
+    media_item      = ForeignKey('MediaItem', related_name="performances", 
+                                 verbose_name=_('item'))
+    instrument      = WeakForeignKey('Instrument', related_name="performances", 
+                                     verbose_name=_('instrument'))
+    alias           = WeakForeignKey('InstrumentAlias', related_name="performances", 
+                                     verbose_name=_('alias'))
+    instruments_num = CharField(_('instruments num'))
+    musicians       = CharField(_('interprets'))
 
     class Meta(MetaCore):
@@ -474 +517 @@
     LEVEL_CHOICES = (('user', 'user'), ('maintainer', 'maintainer'), ('admin', 'admin'))    
 
-    username   = CharField(primary_key=True, max_length=64, required=True)
-    level      = CharField(choices=LEVEL_CHOICES, max_length=32, required=True)
-    first_name = CharField()
-    last_name  = CharField()
-    phone      = CharField()
-    email      = CharField()
+    username   = CharField(_('username'), primary_key=True, max_length=64, required=True)
+    level      = CharField(_('level'), choices=LEVEL_CHOICES, max_length=32, required=True)
+    first_name = CharField(_('first name'))
+    last_name  = CharField(_('last name'))
+    phone      = CharField(_('phone'))
+    email      = CharField(_('email'))
 
     class Meta(MetaCore):
@@ -490 +533 @@
     "Item or collection playlist"
     owner_username = ForeignKey('User', related_name="playlists", db_column="owner_username") 
-    name           = CharField(required=True)
+    name           = CharField(_('name'), required=True)
 
     class Meta(MetaCore):
@@ -502 +545 @@
     RESOURCE_TYPE_CHOICES = (('item', 'item'), ('collection', 'collection'))
 
-    playlist              = ForeignKey('Playlist', related_name="resources")
-    resource_type         = CharField(choices=RESOURCE_TYPE_CHOICES, required=True)
-    resource              = IntegerField(required=True)
+    playlist              = ForeignKey('Playlist', related_name="resources", verbose_name=_('playlist'))
+    resource_type         = CharField(_('resource type'), choices=RESOURCE_TYPE_CHOICES, required=True)
+    resource              = IntegerField(_('resource'), required=True)
 
     class Meta(MetaCore):
@@ -513 +556 @@
     TYPE_CHOICES     = (('country', 'country'), ('continent', 'continent'), ('other', 'other'))
 
-    name             = CharField(primary_key=True, max_length=150, required=True)
-    type             = CharField(choices=TYPE_CHOICES, max_length=16, required=True)
-    complete_type    = ForeignKey('LocationType', related_name="types")
-    current_name     = WeakForeignKey('self', related_name="past_names", 
-                                      db_column="current_name") 
-    is_authoritative = BooleanField()
+    name             = CharField(_('name'), primary_key=True, max_length=150, required=True)
+    type             = CharField(_('type'), choices=TYPE_CHOICES, max_length=16, required=True)
+    complete_type    = ForeignKey('LocationType', related_name="types", verbose_name=_('complete type'))
+    current_name     = WeakForeignKey('self', related_name="past_names", db_column="current_name", 
+                                      verbose_name=_('current name')) 
+    is_authoritative = BooleanField(_('authoritative'))
 
     def parent(self):
@@ -560 +603 @@
 class LocationType(ModelCore):
     "Location type of an item location"
-    id   = CharField(max_length=64, primary_key=True, required=True)
-    name = CharField(max_length=150, required=True)
+    id   = CharField(_('identifier'), max_length=64, primary_key=True, required=True)
+    name = CharField(_('name'), max_length=150, required=True)
 
     class Meta(MetaCore):
@@ -568 +611 @@
 class LocationAlias(ModelCore):
     "Location other name"
-    location         = ForeignKey('Location', related_name="aliases",
-                                          db_column="location_name", max_length=150)
-    alias            = CharField(max_length=150, required=True)
-    is_authoritative = BooleanField()
+    location         = ForeignKey('Location', related_name="aliases", db_column="location_name", 
+                                  max_length=150, verbose_name=_('location'))
+    alias            = CharField(_('alias'), max_length=150, required=True)
+    is_authoritative = BooleanField(_('authoritative'))
 
     def __unicode__(self):
@@ -582 +625 @@
 class LocationRelation(ModelCore):
     "Location family"
-    location             = ForeignKey('Location', related_name="parent_relations",
-                                              db_column="location_name", max_length=150)
-    parent_location      = ForeignKey('Location', related_name="child_relations",
-                                              db_column="parent_location_name", null=True, max_length=150)
+    location             = ForeignKey('Location', related_name="parent_relations", 
+                                      db_column="location_name", max_length=150, verbose_name=_('location'))
+    parent_location      = ForeignKey('Location', related_name="child_relations", db_column="parent_location_name", 
+                                      null=True, max_length=150, verbose_name=_('parent location'))
     is_authoritative     = BooleanField()
 
@@ -599 +642 @@
 class MediaItemKeyword(ModelCore):
     "Item keyword"
-    item    = ForeignKey('MediaItem')
-    keyword = ForeignKey('ContextKeyword')
+    item    = ForeignKey('MediaItem', verbose_name=_('item'))
+    keyword = ForeignKey('ContextKeyword', verbose_name=_('keyword'))
 
     class Meta(MetaCore):
@@ -614 +657 @@
 class PublisherCollection(ModelCore):
     "Collection which belongs to publisher"
-    publisher = ForeignKey('Publisher', related_name="publisher_collections")
-    value     = CharField(required=True)
+    publisher = ForeignKey('Publisher', related_name="publisher_collections", verbose_name=_('publisher'))
+    value     = CharField(_('value'), required=True)
 
     def __unicode__(self):
@@ -628 +671 @@
     CHANGE_TYPE_CHOICES  = (('import', 'import'), ('create', 'create'), ('update', 'update'), ('delete','delete'))
 
-    element_type         = CharField(choices=ELEMENT_TYPE_CHOICES, max_length=16, required=True)
-    element_id           = IntegerField(required=True)
-    change_type          = CharField(choices=CHANGE_TYPE_CHOICES, max_length=16, required=True)
-    time                 = DateTimeField(auto_now_add=True)
-    user                 = ForeignKey('User', db_column='username', related_name="revisions")
+    element_type         = CharField(_('element type'), choices=ELEMENT_TYPE_CHOICES, max_length=16, required=True)
+    element_id           = IntegerField(_('element identifier'), required=True)
+    change_type          = CharField(_('modification type'), choices=CHANGE_TYPE_CHOICES, max_length=16, required=True)
+    time                 = DateTimeField(_('time'), auto_now_add=True)
+    user                 = ForeignKey('User', db_column='username', related_name="revisions", verbose_name=_('user'))
     
     @classmethod
@@ -655 +698 @@
 class EthnicGroup(ModelCore):
     "Item ethnic group"
-    name = CharField(required=True)
+    name = CharField(_('name'), required=True)
 
     class Meta(MetaCore):
@@ -665 +708 @@
 class EthnicGroupAlias(ModelCore):
     "Item ethnic group other name" 
-    ethnic_group = ForeignKey('EthnicGroup', related_name="aliases")
-    name         = CharField(required=True)
+    ethnic_group = ForeignKey('EthnicGroup', related_name="aliases", verbose_name=_('population / social group'))
+    name         = CharField(_('name'), required=True)
 
     class Meta(MetaCore):

trunk/telemeta/models/dublincore.py

@@ -145 +145 @@
         creator = Element('creator', collection.creator)
 
-    duration = Duration()
+    duration = max(collection.approx_duration, collection.computed_duration())
     parts = []
     for item in collection.items.all():
-        duration += item.duration()
-
         id = media_identifier(item)
         if id:
             parts.append(Element('relation', id, 'hasPart', item))
-
-    if duration < collection.approx_duration:            
-        duration = collection.approx_duration
 
     resource = Resource(
@@ -221 +216 @@
         Element('rights',           item.collection.legal_rights, 'license'),
         Element('rights',           media_access_rights(item.collection), 'accessRights'),
-        Element('format',           item.duration(), 'extent'),
+    
+        Element('format',           max(item.approx_duration, item.computed_duration()), 'extent'),
         Element('format',           item.collection.physical_format, 'medium'),
         #FIXME: audio mime types are missing,

trunk/telemeta/templates/telemeta_default/base.html

@@ -17 +17 @@
 {% load telemeta_utils %}
 <body>
-<!--
-{% if user.is_authenticated and user.is_staff %}
-<div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}<a href="doc/">{% trans 'Documentation' %}</a> / <a href="password_change/">{% trans 'Change password' %}</a> / <a href="logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
-{% endif %}
--->
 <div id="layout">
 <div id="header">

trunk/telemeta/templates/telemeta_default/collection_detail.html

@@ -1 +1 @@
 {% extends "telemeta/base.html" %}
 {% load telemeta_utils %}
+{% load i18n %}
 
 {% block extra_javascript %}
@@ -23 +24 @@
               (<a href="{% url telemeta-collection-m3u collection.public_id %}">M3U</a>,
               <a href="{% url telemeta-collection-xspf collection.public_id %}">XSPF</a>)</p>
-              {% if 0 %} {# Use 1/0 for alternate player #}
-                <!-- This is the XSPF Web Music Player, under the BSD license, 
-                  from: http://musicplayer.sourceforge.net/-->
-                <object type="application/x-shockwave-flash" width="362" height="200"
-                  data="{% url telemeta-swf "xspf_player.swf" %}?playlist_url={% url telemeta-collection-xspf collection.public_id %}">
-                  <param name="movie" 
-                    value="{% url telemeta-swf "xspf_player.swf" %}?playlist_url={% url telemeta-collection-xspf collection.public_id %}" />
-                </object>
-              {% else %}
                 <!-- This is Jeroen Wijering's Flash MP3 Player, 
                   under CC Attribution-NonCommercial-ShareAlike 2.0 license
@@ -44 +36 @@
                   so.write('collection_player_c');
                 </script> 
-              {% endif %}
             </div>
         </div>
@@ -54 +45 @@
         {% block general_info %}
             <dl class="listing">
-                {% if collection.creator %}<dt>Auteur / Cédant</dt><dd>{{ collection.creator }}</dd>{% endif %}
-
-                {% if collection.is_published %}
-                {% if collection.date_published %}<dt>Date</dt><dd>{{ collection.date_published }}</dd>{% endif %}
-                {% else %}
-                {% if collection.annee_enr %}<dt>Date</dt><dd>{{ collection.annee_enr }}</dd>{% endif %}
+                {% dl_field collection.title %}
+                {% dl_field collection.alt_title %}
+                {% dl_field collection.creator %}
+                {% if collection.recorded_from_year %}
+                <dt>{% trans "Recording year" %}</dt>
+                <dd>{{ collection.recorded_from_year }} {{ collection.recorded_to_year|prepend:" - "  }}</dd>
                 {% endif %}
-
-                {% if collection.title %}<dt>Titre</dt><dd>{{ collection.title }}</dd>{% endif %}
-                {% if collection.native_title %}<dt>Traduction du titre</dt><dd>{{ collection.native_title }}</dd>{% endif %}
-                {% if collection.duree_approx %}<dt>Durée</dt><dd>{{ collection.duree_approx }}</dd>{% endif %}
-
-                {% if collection.is_published %}
-                {% if collection.publisher %}<dt>Éditeur</dt><dd>{{ collection.publisher }}</dd>{% endif %}
-                {% if collection.publisher_reference %}<dt>Référence</dt><dd>{{ collection.publisher_reference }}</dd>{% endif %}
-                {% endif %}
-
+                {% dl_field collection.year_published %}
             </dl>
         {% endblock general_info %}
@@ -77 +59 @@
         {% block geoethnic_data %}
             <div>
-                <h4><a href="#">Données ethnographiques</a></h4>
+                <h4><a href="#">{% trans "Geographic and cultural informations" %}</a></h4>
                 <div>
                     <dl class="listing">
-
-                    {% if collection.get_countries %}
-                    <dt>État / Nation</dt><dd>{{collection.get_countries|join:", "}}</dd>
-                    {% endif %}
-
-                    {% if collection.get_ethnic_groups %}
-                    <dt>Ethnie / Groupe social</dt><dd>{{ collection.get_ethnic_groups|join:", " }}</dd>
-                    {% endif %}
-
-                    {% if collection.terrain_ou_autre %}<dt>Contexte de l’enregistrement</dt><dd>{{ collection.terrain_ou_autre }}</dd>{% endif %}
-
+                    {% dl_field collection.countries join with ", " %}
+                    {% dl_field collection.ethnic_groups join with ", " %}
                     </dl>
                 </div>
@@ -96 +69 @@
         {% endblock geoethnic_data %}
         </div>
-        {% if collection.is_published %}
         <div class="extraInfos">
-        {% block publication_data %}
-            <div class="folded">
-                <h4><a href="#">Détails du document édité</a></h4>
+        {% block legal_data %}
+            <div>
+                <h4><a href="#">{% trans "Legal mentions" %}</a></h4>
                 <div>
                     <dl class="listing">
-                    {% if collection.publishing_status %}<dt>Réédition</dt><dd>{{ collection.publishing_status }}</dd>{% endif %}
-                    {% if collection.booklet_writer %}<dt>Auteur Notice</dt><dd>{{ collection.booklet_writer }}</dd>{% endif %}
-                    {% if collection.booklet_description %}<dt>Notice</dt><dd>{{ collection.booklet_description }}</dd>{% endif %}
+                        {% dl_field collection.collector %}
+                        {% dl_field collection.publisher %}
+                        {% dl_field collection.publisher_collection %}
+                        {% dl_field collection.publisher_serial %}
+                        {% dl_field collection.booklet_author %}
+                        {% dl_field collection.external_references %}
+                        {% dl_field collection.doctype_code %}
+                        {% dl_field collection.public_access %}
+                        {% dl_field collection.legal_rights %}
                     </dl>
                 </div>
             </div>
-            <div class="nett"></div>
-        {% endblock publication_data %}
+        {% endblock legal_data %}
         </div>
-        {% endif %}
         <div class="extraInfos">
-        {% block document_identification %}
-            <div class="folded">
-                <h4><a href="#">Identification du document</a></h4>
+        {% block archive_data %}
+            <div>
+                <h4><a href="#">{% trans "Archiving data" %}</a></h4>
                 <div>
                     <dl class="listing">
-                    {% if collection.id %}<dt>Cote</dt><dd>{{ collection.id }}</dd>{% endif %}
-                    {% if collection.physical_format %}<dt>Format de l'original</dt><dd>{{ collection.physical_format }}</dd>{% endif %}
+                        {% dl_field collection.acquisition_mode %}
+                        {% dl_field collection.cnrs_contributor %}
+                        {% dl_field collection.metadata_writer %}
+                        {% dl_field collection.booklet_description %}
+                        {% dl_field collection.publishing_status %}
+                        {% dl_field collection.alt_ids %}
+                        {% dl_field collection.comment %}
+                        {% dl_field collection.metadata_writer %}
+                        {% dl_field collection.travail %}
+                        {% dl_field collection.items_done %}
                     </dl>
                 </div>
             </div>
-        {% endblock document_identification %}
+        {% endblock archive_data %}
         </div>
         <div class="extraInfos">
-        {% block document_data %}
-            <div class="folded">
-                <h4><a href="#">Informations documentaires</a></h4>
+        {% block technical_data %}
+            <div>
+                <h4><a href="#">{% trans "Technical data" %}</a></h4>
                 <div>
                     <dl class="listing">
-                    {% if collection.a_informer %}<dt>a informer</dt><dd>{{ collection.a_informer }}</dd>{% endif %}
-                    {% if collection.acquisition_mode %}<dt>acquisition mode</dt><dd>{{ collection.acquisition_mode }}</dd>{% endif %}
-                    {% if collection.champ36 %}<dt>champ36</dt><dd>{{ collection.champ36 }}</dd>{% endif %}
-                    {% if collection.collector %}<dt>collector</dt><dd>{{ collection.collector }}</dd>{% endif %}
-                    {% if collection.comment %}<dt>comment</dt><dd>{{ collection.comment }}</dd>{% endif %}
-                    <!--
-                    <dt>compil face plage</dt><dd>{{ object.compil_face_plage }}</dd>
-                    -->
-                    {% if collection.deposant_cnrs %}<dt>deposant cnrs</dt><dd>{{ collection.deposant_cnrs }}</dd>{% endif %}
-                    {% if collection.fiches %}<dt>fiches</dt><dd>{{ collection.fiches }}</dd>{% endif %}
-                    {% if collection.is_full_copy %}<dt>is full copy</dt><dd>{{ collection.is_full_copy }}</dd>{% endif %}
-                    {% if collection.is_original %}<dt>is original</dt><dd>{{ collection.is_original }}</dd>{% endif %}
-                    {% if collection.numerisation %}<dt>numerisation</dt><dd>{{ collection.numerisation }}</dd>{% endif %}
-                    {% if collection.physical_items_num %}<dt>physical items num</dt><dd>{{ collection.physical_items_num }}</dd>{% endif %}
-                    {% if collection.publisher_collection %}<dt>publisher collection</dt><dd>{{ collection.publisher_collection }}</dd>{% endif %}
-                    {% if collection.publisher_serial_id %}<dt>publisher serial id</dt><dd>{{ collection.publisher_serial_id }}</dd>{% endif %}
-                    {% if collection.record_author %}<dt>record author</dt><dd>{{ collection.record_author }}</dd>{% endif %}
-                    {% if collection.record_writer %}<dt>record writer</dt><dd>{{ collection.record_writer }}</dd>{% endif %}
-                    {% if collection.ref_biblio %}<dt>ref biblio</dt><dd>{{ collection.ref_biblio }}</dd>{% endif %}
-                    {% if collection.rights %}<dt>rights</dt><dd>{{ collection.rights }}</dd>{% endif %}
-                    {% if collection.travail %}<dt>travail</dt><dd>{{ collection.travail }}</dd>{% endif %}
-                    {% if collection.tri_dibm %}<dt>tri dibm</dt><dd>{{ collection.tri_dibm }}</dd>{% endif %}
+                        {% dl_field collection.code %}
+                        {% dl_field collection.old_code %}
+                        <dt>{% trans "Media type" %}</dt><dd>{% trans "Audio" %}</dd>
+                        {% dl_field collection.approx_duration %}
+                        {% dl_field collection.computed_duration %}
+                        {% dl_field collection.physical_items_num %}
+                        <dt>{% trans "Number of items" %}</dt><dd>{{ collection.items.count }}</dd>
+                        {% dl_field collection.physical_format %}
+                        {% dl_field collection.ad_conversion %}
                     </dl>
                 </div>
             </div>
-        {% endblock document_data %}
+        {% endblock technical_data %}
         </div>
         <h4>Items</h4>
+        {% with collection.items.all as items %}
+            {% include "telemeta/inc/mediaitem_list.html" %}
+        {% endwith %}
+        <!--
         {% with collection.ordered_items as items %}
             {% include "telemeta/inc/mediaitem_list.html" %}
         {% endwith %}
+        -->
         </div>
     </div>

trunk/telemeta/templatetags/telemeta_utils.py

@@ -4 +4 @@
 from django.core.urlresolvers import reverse
 import telemeta.models.dublincore as dc
+from django.utils import html
+from django import template
+from django.utils.text import capfirst
 
 register = template.Library()
@@ -94 +97 @@
     else:
         return dc.express_collection(resource)
+
+class DescriptionListFieldNode(template.Node):
+    def __init__(self, variable, join_with = None):
+        cut   = variable.split('.')
+        self.model  = template.Variable('.'.join(cut[:-1]))
+        self.member = cut[-1]
+        self.join_with = join_with
+
+    def render(self, context):
+        try:
+            model = self.model.resolve(context)
+            label = html.escape(capfirst(unicode(model.field_label(self.member))))
+            try:
+                value = getattr(model, self.member)
+            except AttributeError:
+                value = '<ERROR: no such field>'
+        except template.VariableDoesNotExist:
+            label = unicode(self.model) + '.' + self.member
+            value = '<ERROR: can\'t find variable>'
+
+        try:
+            value = value()
+        except TypeError:
+            pass
+        if self.join_with:
+            value = self.join_with.join([unicode(v) for v in value])
+        if value:
+            value = html.escape(unicode(value))
+            markup  = '<dt>%s</dt><dd>%s</dd>' % (label, value)
+            return markup
+
+        return ''
+
+@register.tag
+def dl_field(parser, token):
+    cut = token.split_contents()
+    join_with = None
+    try:
+        tag_name, variable = cut
+    except ValueError:
+        try:
+            tag_name, variable, arg3, arg4, arg5  = cut
+            if arg3 == 'join' and arg4 == 'with'and arg5[0] == arg5[-1] and arg5[0] in ('"', "'"):
+                join_with = arg5[1:-1]
+            else:
+                raise ValueError()
+        except ValueError:
+            raise template.TemplateSyntaxError("%r tag: invalid arguments" 
+                                               % token.contents.split()[0])
+
+    return DescriptionListFieldNode(variable, join_with=join_with)
+
+@register.filter
+def prepend(str, prefix):
+    if str:
+        return prefix + unicode(str)
+    return ''