make use of the MediaCollection.collector_is_creator field in the collection detail...

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index ac40e2e0a2178aa5fa7af21fe72c559d9b4bd328..56dc17eee9e5ebc6d84a2cdc07931829c04166ac 100644 (file)
Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index 2a6d04ac67f0764ff5db973d51ac4ad7b0f45c92..beac1804f083c92e35d85b8aa130e8858001156e 100644 (file)
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 14:13+0100\n"
+"POT-Creation-Date: 2010-01-27 14:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -397,22 +397,26 @@ msgstr "Indications géographiques et culturelles"
 msgid "Legal mentions"
 msgstr "Mentions légales"
 
-#: templates/telemeta_default/collection_detail.html:94
+#: templates/telemeta_default/collection_detail.html:79
+msgid "Collector"
+msgstr "Collecteur"
+
+#: templates/telemeta_default/collection_detail.html:100
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
-#: templates/telemeta_default/collection_detail.html:115
+#: templates/telemeta_default/collection_detail.html:121
 msgid "Technical data"
 msgstr "Données techniques"
 
-#: templates/telemeta_default/collection_detail.html:120
+#: templates/telemeta_default/collection_detail.html:126
 msgid "Media type"
 msgstr "Type de media"
 
-#: templates/telemeta_default/collection_detail.html:120
+#: templates/telemeta_default/collection_detail.html:126
 msgid "Audio"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:124
+#: templates/telemeta_default/collection_detail.html:130
 msgid "Number of items"
 msgstr "Nombre d'items"

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index fdf8c94bc1b75864badabdd44b899198f868bcd5..98160517b4026c709cf5c287f2d08163f644a6a7 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -74,7 +74,13 @@
                 <h4><a href="#">{% trans "Legal mentions" %}</a></h4>\r
                 <div>\r
                     <dl class="listing">\r
+                        {% if collection.collector_is_creator %}\r
+                          {% if collection.creator %}\r
+                          <dt>{% trans "Collector" %}</dt><dd>{{ collector.creator }}</dd>\r
+                          {% endif%}\r
+                        {% else %}\r
                         {% dl_field collection.collector %}\r
+                        {% endif %}\r
                         {% dl_field collection.publisher %}\r
                         {% dl_field collection.publisher_collection %}\r
                         {% dl_field collection.publisher_serial %}\r

diff --git a/telemeta/tests/model_tests.py b/telemeta/tests/model_tests.py
index ae5e3b499006bf79326ee99a7d676a16f624bab2..c75318ed7dcf9bd328abb18be31523e36d9d7ce8 100644 (file)
--- a/telemeta/tests/model_tests.py
+++ b/telemeta/tests/model_tests.py
@@ -275,8 +275,8 @@ class CollectionItemTestCase(unittest.TestCase):
         self.assertEquals(self.europe, self.item_2.location.continent())
 
     def testCollectionCountries(self):
-        "Test the MediaCollection.get_countries() method"
-        self.assertEquals(self.volonte.get_countries(), [self.belgique, self.france])
+        "Test the MediaCollection.countries() method"
+        self.assertEquals(self.volonte.countries(), [self.belgique, self.france])
 
         
 class RelatedDeleteTestCase(unittest.TestCase):