Changeset 513

Show
Ignore:
Timestamp:
01/27/10 14:29:14 (7 months ago)
Author:
olivier
Message:

make use of the MediaCollection?.collector_is_creator field in the collection detail template ; fix MediaCollection?.countries() unit test

Location:
trunk/telemeta
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/telemeta/locale/fr/LC_MESSAGES/django.po

    r512 r513  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2010-01-27 14:13+0100\n" 
     11"POT-Creation-Date: 2010-01-27 14:25+0100\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    … …  
    398398msgstr "Mentions légales" 
    399399 
    400 #: templates/telemeta_default/collection_detail.html:94 
     400#: templates/telemeta_default/collection_detail.html:79 
     401msgid "Collector" 
     402msgstr "Collecteur" 
     403 
     404#: templates/telemeta_default/collection_detail.html:100 
    401405msgid "Archiving data" 
    402406msgstr "Données d'archivage" 
    403407 
    404 #: templates/telemeta_default/collection_detail.html:115 
     408#: templates/telemeta_default/collection_detail.html:121 
    405409msgid "Technical data" 
    406410msgstr "Données techniques" 
    407411 
    408 #: templates/telemeta_default/collection_detail.html:120 
     412#: templates/telemeta_default/collection_detail.html:126 
    409413msgid "Media type" 
    410414msgstr "Type de media" 
    411415 
    412 #: templates/telemeta_default/collection_detail.html:120 
     416#: templates/telemeta_default/collection_detail.html:126 
    413417msgid "Audio" 
    414418msgstr "" 
    415419 
    416 #: templates/telemeta_default/collection_detail.html:124 
     420#: templates/telemeta_default/collection_detail.html:130 
    417421msgid "Number of items" 
    418422msgstr "Nombre d'items" 

  • trunk/telemeta/templates/telemeta_default/collection_detail.html

    r512 r513  
    7575                <div> 
    7676                    <dl class="listing"> 
     77                        {% if collection.collector_is_creator %} 
     78                          {% if collection.creator %} 
     79                          <dt>{% trans "Collector" %}</dt><dd>{{ collector.creator }}</dd> 
     80                          {% endif%} 
     81                        {% else %} 
    7782                        {% dl_field collection.collector %} 
     83                        {% endif %} 
    7884                        {% dl_field collection.publisher %} 
    7985                        {% dl_field collection.publisher_collection %} 

  • trunk/telemeta/tests/model_tests.py

    r509 r513  
    276276 
    277277    def testCollectionCountries(self): 
    278         "Test the MediaCollection.get_countries() method" 
    279         self.assertEquals(self.volonte.get_countries(), [self.belgique, self.france]) 
     278        "Test the MediaCollection.countries() method" 
     279        self.assertEquals(self.volonte.countries(), [self.belgique, self.france]) 
    280280 
    281281