hide LAM format enumerations

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 6b80a371e0dbc168f2027667fd05f0cc832be99b..8638a9945b0fa6c96f45d0ff13c2c2ccca9cdc85 100644 (file)
Binary files a/telemeta/locale/de/LC_MESSAGES/django.mo and b/telemeta/locale/de/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po
index d9789de364b81c11581888c7b759f6a3208f6cbf..fdf63ee0c878da2e200f649b7f32a3396103b09b 100644 (file)
--- a/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-13 11:50+0100\n"
+"POT-Creation-Date: 2014-11-13 16:52+0100\n"
 "PO-Revision-Date: 2012-12-22 21:24+0100\n"
 "Last-Translator: Patrik Tschudin <patsch@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -938,7 +938,7 @@ msgstr "nach Konversation"
 msgid "by message"
 msgstr "nach Mitteilung"
 
-#: templates/postman/base_folder.html:23 templates/telemeta/lists.html:75
+#: templates/postman/base_folder.html:23 templates/telemeta/lists.html:80
 msgid "Action"
 msgstr "Aktion"
 
@@ -965,9 +965,9 @@ msgid "g:i A,M j,n/j/y"
 msgstr "g:i A,M j,n/j/y"
 
 #: templates/postman/base_folder.html:49 templates/postman/view.html:25
-#: templates/telemeta/collection_detail.html:224
+#: templates/telemeta/collection_detail.html:227
 #: templates/telemeta/collection_detail_dc.html:25
-#: templates/telemeta/lists.html:58
+#: templates/telemeta/lists.html:63
 #: templates/telemeta/mediaitem_detail.html:357
 #: templates/telemeta/mediaitem_detail_dc.html:20
 #: templates/telemeta/resource_detail.html:105
@@ -1148,7 +1148,7 @@ msgstr "Aufzählung"
 #: templates/telemeta/inc/module_revisions.html:17
 #: templates/telemeta/inc/resource_list.html:8
 #: templates/telemeta/inc/resource_related.html:21
-#: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_copy.html:39
+#: templates/telemeta/lists.html:74 templates/telemeta/mediaitem_copy.html:39
 #: templates/telemeta/search_criteria.html:91
 #: templates/telemeta/search_results.html:53
 msgid "Title"
@@ -1249,7 +1249,7 @@ msgstr ""
 "Ursprungsgesellschaften."
 
 #: templates/telemeta/base.html:175
-#: templates/telemeta/collection_detail.html:108
+#: templates/telemeta/collection_detail.html:111
 msgid "Legal notices"
 msgstr "juristische Hinweise"
 
@@ -1301,7 +1301,7 @@ msgid "Collection"
 msgstr "Sammlung"
 
 #: templates/telemeta/collection_detail.html:43
-#: templates/telemeta/lists.html:55
+#: templates/telemeta/lists.html:60
 #: templates/telemeta/mediaitem_detail.html:95
 #: templates/telemeta/profile_detail.html:72
 #: templates/telemeta/resource_detail.html:43
@@ -1348,60 +1348,65 @@ msgstr "Dokumentation"
 msgid "unpublished"
 msgstr "unveröffentlicht"
 
-#: templates/telemeta/collection_detail.html:79
+#: templates/telemeta/collection_detail.html:81
 #: templates/telemeta/inc/collection_list.html:12
-#: templates/telemeta/lists.html:73
+#: templates/telemeta/lists.html:78
 msgid "Recording period"
 msgstr "Aufnahmeperiode"
 
-#: templates/telemeta/collection_detail.html:95
+#: templates/telemeta/collection_detail.html:86
+#, fuzzy
+msgid "Access type"
+msgstr "Status"
+
+#: templates/telemeta/collection_detail.html:98
 #: templates/telemeta/mediaitem_detail.html:214
 msgid "Geographic and cultural informations"
 msgstr "geographische und kulturelle Informationen"
 
-#: templates/telemeta/collection_detail.html:113
+#: templates/telemeta/collection_detail.html:116
 #: templates/telemeta/inc/collection_list.html:11
 #: templates/telemeta/inc/mediaitem_list.html:10
-#: templates/telemeta/lists.html:72
+#: templates/telemeta/lists.html:77
 msgid "Recordist"
 msgstr "TonmeisterIn"
 
-#: templates/telemeta/collection_detail.html:128
+#: templates/telemeta/collection_detail.html:131
 msgid "Bibliographic references"
 msgstr "bibliographische Referenzen"
 
-#: templates/telemeta/collection_detail.html:140
+#: templates/telemeta/collection_detail.html:143
 #: templates/telemeta/mediaitem_detail.html:277
 msgid "Archiving data"
 msgstr "Archivdaten"
 
-#: templates/telemeta/collection_detail.html:148
+#: templates/telemeta/collection_detail.html:151
 msgid "Related documentation"
 msgstr "damit zusammenhängende Dokumentation"
 
-#: templates/telemeta/collection_detail.html:156
+#: templates/telemeta/collection_detail.html:159
 #: templates/telemeta/mediaitem_detail.html:319
 msgid "Comments"
 msgstr "Kommentare"
 
-#: templates/telemeta/collection_detail.html:160
+#: templates/telemeta/collection_detail.html:163
 #: templates/telemeta/mediaitem_detail.html:291
 #: templates/telemeta/resource_detail.html:75
 msgid "Last modification"
 msgstr "Letzte Änderung"
 
-#: templates/telemeta/collection_detail.html:174
+#: templates/telemeta/collection_detail.html:177
 #: templates/telemeta/mediaitem_detail.html:301
 msgid "Technical data"
 msgstr "technische Daten"
 
-#: templates/telemeta/collection_detail.html:184
+#: templates/telemeta/collection_detail.html:187
 #, fuzzy
 #| msgid "Collections"
 msgid "Collection size"
 msgstr "Sammlungen"
 
-#: templates/telemeta/collection_detail.html:188
+#: templates/telemeta/collection_detail.html:191
 #: templates/telemeta/geo_countries.html:16
 msgid "Number of items"
 msgstr "Anzahl Elemente"
@@ -1485,11 +1490,11 @@ msgstr "veröffentlicht"
 msgid "Digitized"
 msgstr ""
 
-#: templates/telemeta/collection_list.html:36
+#: templates/telemeta/collection_list.html:38
 #: templates/telemeta/enumeration_edit.html:23
 #: templates/telemeta/instrument_alias_edit.html:22
-#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:49
-#: templates/telemeta/resource_list.html:22
+#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:51
+#: templates/telemeta/resource_list.html:24
 msgid "Add"
 msgstr "hinzufügen"
 
@@ -1632,7 +1637,7 @@ msgstr ""
 #: templates/telemeta/inc/collection_list.html:13
 #: templates/telemeta/inc/mediaitem_list.html:17
 #: templates/telemeta/inc/resource_list.html:11
-#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40
+#: templates/telemeta/lists.html:76 templates/telemeta/mediaitem_copy.html:40
 msgid "Code"
 msgstr "Code"
 
@@ -1681,7 +1686,7 @@ msgid "No item"
 msgstr "kein Element"
 
 #: templates/telemeta/inc/module_revisions.html:18
-#: templates/telemeta/lists.html:70
+#: templates/telemeta/lists.html:75
 msgid "Type"
 msgstr "Typus"
 
@@ -1691,7 +1696,7 @@ msgid "User"
 msgstr "BenutzerIn"
 
 #: templates/telemeta/inc/module_revisions.html:40
-#: templates/telemeta/lists.html:92
+#: templates/telemeta/lists.html:97
 msgid "deleted"
 msgstr "gelöscht"
 
@@ -1735,7 +1740,7 @@ msgstr "Diese Instrumentenliste ist leer"
 msgid "My playlists"
 msgstr "Meine Wiedergabeliste"
 
-#: templates/telemeta/lists.html:74
+#: templates/telemeta/lists.html:79
 #: templates/telemeta/search_criteria.html:143
 #: templates/telemeta/search_results.html:70
 msgid "Sound"
@@ -2186,7 +2191,7 @@ msgstr ""
 "Bitte loggen Sie sich ein oder kontaktieren Sie den Administrator der "
 "Website, um einen privaten Zugang zu erhalten."
 
-#: views/collection.py:312
+#: views/collection.py:317
 msgid "You have successfully updated your collection."
 msgstr ""
 

diff --git a/telemeta/locale/es/LC_MESSAGES/django.mo b/telemeta/locale/es/LC_MESSAGES/django.mo
index 6b7052340f454e1bbb769f929cc9765bbef1c383..578e3938fd99d6d1ebd3243545a8de93d30090d0 100644 (file)
Binary files a/telemeta/locale/es/LC_MESSAGES/django.mo and b/telemeta/locale/es/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/es/LC_MESSAGES/django.po b/telemeta/locale/es/LC_MESSAGES/django.po
index f63fc42df6b89cd07797e6843c857dcde202ff60..8c88ca5e0dda15997a85bf9c274c146c312738b6 100644 (file)
--- a/telemeta/locale/es/LC_MESSAGES/django.po
+++ b/telemeta/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-13 11:50+0100\n"
+"POT-Creation-Date: 2014-11-13 16:52+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"
@@ -906,7 +906,7 @@ msgstr ""
 msgid "by message"
 msgstr ""
 
-#: templates/postman/base_folder.html:23 templates/telemeta/lists.html:75
+#: templates/postman/base_folder.html:23 templates/telemeta/lists.html:80
 msgid "Action"
 msgstr ""
 
@@ -933,9 +933,9 @@ msgid "g:i A,M j,n/j/y"
 msgstr ""
 
 #: templates/postman/base_folder.html:49 templates/postman/view.html:25
-#: templates/telemeta/collection_detail.html:224
+#: templates/telemeta/collection_detail.html:227
 #: templates/telemeta/collection_detail_dc.html:25
-#: templates/telemeta/lists.html:58
+#: templates/telemeta/lists.html:63
 #: templates/telemeta/mediaitem_detail.html:357
 #: templates/telemeta/mediaitem_detail_dc.html:20
 #: templates/telemeta/resource_detail.html:105
@@ -1110,7 +1110,7 @@ msgstr ""
 #: templates/telemeta/inc/module_revisions.html:17
 #: templates/telemeta/inc/resource_list.html:8
 #: templates/telemeta/inc/resource_related.html:21
-#: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_copy.html:39
+#: templates/telemeta/lists.html:74 templates/telemeta/mediaitem_copy.html:39
 #: templates/telemeta/search_criteria.html:91
 #: templates/telemeta/search_results.html:53
 msgid "Title"
@@ -1208,7 +1208,7 @@ msgid ""
 msgstr ""
 
 #: templates/telemeta/base.html:175
-#: templates/telemeta/collection_detail.html:108
+#: templates/telemeta/collection_detail.html:111
 msgid "Legal notices"
 msgstr ""
 
@@ -1260,7 +1260,7 @@ msgid "Collection"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:43
-#: templates/telemeta/lists.html:55
+#: templates/telemeta/lists.html:60
 #: templates/telemeta/mediaitem_detail.html:95
 #: templates/telemeta/profile_detail.html:72
 #: templates/telemeta/resource_detail.html:43
@@ -1302,58 +1302,62 @@ msgstr ""
 msgid "unpublished"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:79
+#: templates/telemeta/collection_detail.html:81
 #: templates/telemeta/inc/collection_list.html:12
-#: templates/telemeta/lists.html:73
+#: templates/telemeta/lists.html:78
 msgid "Recording period"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:95
+#: templates/telemeta/collection_detail.html:86
+msgid "Access type"
+msgstr ""
+
+#: templates/telemeta/collection_detail.html:98
 #: templates/telemeta/mediaitem_detail.html:214
 msgid "Geographic and cultural informations"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:113
+#: templates/telemeta/collection_detail.html:116
 #: templates/telemeta/inc/collection_list.html:11
 #: templates/telemeta/inc/mediaitem_list.html:10
-#: templates/telemeta/lists.html:72
+#: templates/telemeta/lists.html:77
 msgid "Recordist"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:128
+#: templates/telemeta/collection_detail.html:131
 msgid "Bibliographic references"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:140
+#: templates/telemeta/collection_detail.html:143
 #: templates/telemeta/mediaitem_detail.html:277
 msgid "Archiving data"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:148
+#: templates/telemeta/collection_detail.html:151
 msgid "Related documentation"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:156
+#: templates/telemeta/collection_detail.html:159
 #: templates/telemeta/mediaitem_detail.html:319
 msgid "Comments"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:160
+#: templates/telemeta/collection_detail.html:163
 #: templates/telemeta/mediaitem_detail.html:291
 #: templates/telemeta/resource_detail.html:75
 msgid "Last modification"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:174
+#: templates/telemeta/collection_detail.html:177
 #: templates/telemeta/mediaitem_detail.html:301
 msgid "Technical data"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:184
+#: templates/telemeta/collection_detail.html:187
 msgid "Collection size"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:188
+#: templates/telemeta/collection_detail.html:191
 #: templates/telemeta/geo_countries.html:16
 msgid "Number of items"
 msgstr ""
@@ -1436,11 +1440,11 @@ msgstr ""
 msgid "Digitized"
 msgstr ""
 
-#: templates/telemeta/collection_list.html:36
+#: templates/telemeta/collection_list.html:38
 #: templates/telemeta/enumeration_edit.html:23
 #: templates/telemeta/instrument_alias_edit.html:22
-#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:49
-#: templates/telemeta/resource_list.html:22
+#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:51
+#: templates/telemeta/resource_list.html:24
 msgid "Add"
 msgstr ""
 
@@ -1579,7 +1583,7 @@ msgstr ""
 #: templates/telemeta/inc/collection_list.html:13
 #: templates/telemeta/inc/mediaitem_list.html:17
 #: templates/telemeta/inc/resource_list.html:11
-#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40
+#: templates/telemeta/lists.html:76 templates/telemeta/mediaitem_copy.html:40
 msgid "Code"
 msgstr ""
 
@@ -1628,7 +1632,7 @@ msgid "No item"
 msgstr ""
 
 #: templates/telemeta/inc/module_revisions.html:18
-#: templates/telemeta/lists.html:70
+#: templates/telemeta/lists.html:75
 msgid "Type"
 msgstr ""
 
@@ -1638,7 +1642,7 @@ msgid "User"
 msgstr ""
 
 #: templates/telemeta/inc/module_revisions.html:40
-#: templates/telemeta/lists.html:92
+#: templates/telemeta/lists.html:97
 msgid "deleted"
 msgstr ""
 
@@ -1682,7 +1686,7 @@ msgstr ""
 msgid "My playlists"
 msgstr ""
 
-#: templates/telemeta/lists.html:74
+#: templates/telemeta/lists.html:79
 #: templates/telemeta/search_criteria.html:143
 #: templates/telemeta/search_results.html:70
 msgid "Sound"
@@ -2105,7 +2109,7 @@ msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr ""
 
-#: views/collection.py:312
+#: views/collection.py:317
 msgid "You have successfully updated your collection."
 msgstr ""
 

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index 7f9c547272ce1536b76f7d23f8340d3d56a6f1be..10b88a18cb474e983e965b033906a0b3d2bc9f1f 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 7d26e3e0fab1fc7b12ce179b355055fc31d57355..8c616464852c5506170e5519c55a49409c1816dc 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: 2014-11-13 11:50+0100\n"
+"POT-Creation-Date: 2014-11-13 16:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -906,7 +906,7 @@ msgstr "par conversation"
 msgid "by message"
 msgstr "par message"
 
-#: templates/postman/base_folder.html:23 templates/telemeta/lists.html:75
+#: templates/postman/base_folder.html:23 templates/telemeta/lists.html:80
 msgid "Action"
 msgstr "Action"
 
@@ -933,9 +933,9 @@ msgid "g:i A,M j,n/j/y"
 msgstr ""
 
 #: templates/postman/base_folder.html:49 templates/postman/view.html:25
-#: templates/telemeta/collection_detail.html:224
+#: templates/telemeta/collection_detail.html:227
 #: templates/telemeta/collection_detail_dc.html:25
-#: templates/telemeta/lists.html:58
+#: templates/telemeta/lists.html:63
 #: templates/telemeta/mediaitem_detail.html:357
 #: templates/telemeta/mediaitem_detail_dc.html:20
 #: templates/telemeta/resource_detail.html:105
@@ -1110,7 +1110,7 @@ msgstr "Énumérations"
 #: templates/telemeta/inc/module_revisions.html:17
 #: templates/telemeta/inc/resource_list.html:8
 #: templates/telemeta/inc/resource_related.html:21
-#: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_copy.html:39
+#: templates/telemeta/lists.html:74 templates/telemeta/mediaitem_copy.html:39
 #: templates/telemeta/search_criteria.html:91
 #: templates/telemeta/search_results.html:53
 msgid "Title"
@@ -1210,7 +1210,7 @@ msgstr ""
 "communautés d'origine."
 
 #: templates/telemeta/base.html:175
-#: templates/telemeta/collection_detail.html:108
+#: templates/telemeta/collection_detail.html:111
 msgid "Legal notices"
 msgstr "Mentions légales"
 
@@ -1262,7 +1262,7 @@ msgid "Collection"
 msgstr "Collection"
 
 #: templates/telemeta/collection_detail.html:43
-#: templates/telemeta/lists.html:55
+#: templates/telemeta/lists.html:60
 #: templates/telemeta/mediaitem_detail.html:95
 #: templates/telemeta/profile_detail.html:72
 #: templates/telemeta/resource_detail.html:43
@@ -1304,58 +1304,62 @@ msgstr "Statut du document"
 msgid "unpublished"
 msgstr "inédites"
 
-#: templates/telemeta/collection_detail.html:79
+#: templates/telemeta/collection_detail.html:81
 #: templates/telemeta/inc/collection_list.html:12
-#: templates/telemeta/lists.html:73
+#: templates/telemeta/lists.html:78
 msgid "Recording period"
 msgstr "Période d'enregistrement"
 
-#: templates/telemeta/collection_detail.html:95
+#: templates/telemeta/collection_detail.html:86
+msgid "Access type"
+msgstr "Type d'accès"
+
+#: templates/telemeta/collection_detail.html:98
 #: templates/telemeta/mediaitem_detail.html:214
 msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
-#: templates/telemeta/collection_detail.html:113
+#: templates/telemeta/collection_detail.html:116
 #: templates/telemeta/inc/collection_list.html:11
 #: templates/telemeta/inc/mediaitem_list.html:10
-#: templates/telemeta/lists.html:72
+#: templates/telemeta/lists.html:77
 msgid "Recordist"
 msgstr "Collecteur"
 
-#: templates/telemeta/collection_detail.html:128
+#: templates/telemeta/collection_detail.html:131
 msgid "Bibliographic references"
 msgstr "Références bibliographiques"
 
-#: templates/telemeta/collection_detail.html:140
+#: templates/telemeta/collection_detail.html:143
 #: templates/telemeta/mediaitem_detail.html:277
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
-#: templates/telemeta/collection_detail.html:148
+#: templates/telemeta/collection_detail.html:151
 msgid "Related documentation"
 msgstr "Documentation associée"
 
-#: templates/telemeta/collection_detail.html:156
+#: templates/telemeta/collection_detail.html:159
 #: templates/telemeta/mediaitem_detail.html:319
 msgid "Comments"
 msgstr "Commentaires"
 
-#: templates/telemeta/collection_detail.html:160
+#: templates/telemeta/collection_detail.html:163
 #: templates/telemeta/mediaitem_detail.html:291
 #: templates/telemeta/resource_detail.html:75
 msgid "Last modification"
 msgstr "Dernière modification de la fiche"
 
-#: templates/telemeta/collection_detail.html:174
+#: templates/telemeta/collection_detail.html:177
 #: templates/telemeta/mediaitem_detail.html:301
 msgid "Technical data"
 msgstr "Données techniques"
 
-#: templates/telemeta/collection_detail.html:184
+#: templates/telemeta/collection_detail.html:187
 msgid "Collection size"
 msgstr "Volume de la collection"
 
-#: templates/telemeta/collection_detail.html:188
+#: templates/telemeta/collection_detail.html:191
 #: templates/telemeta/geo_countries.html:16
 msgid "Number of items"
 msgstr "Nombre d'items"
@@ -1438,11 +1442,11 @@ msgstr "Éditées"
 msgid "Digitized"
 msgstr "Numérisé"
 
-#: templates/telemeta/collection_list.html:36
+#: templates/telemeta/collection_list.html:38
 #: templates/telemeta/enumeration_edit.html:23
 #: templates/telemeta/instrument_alias_edit.html:22
-#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:49
-#: templates/telemeta/resource_list.html:22
+#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:51
+#: templates/telemeta/resource_list.html:24
 msgid "Add"
 msgstr "Ajouter"
 
@@ -1583,7 +1587,7 @@ msgstr ""
 #: templates/telemeta/inc/collection_list.html:13
 #: templates/telemeta/inc/mediaitem_list.html:17
 #: templates/telemeta/inc/resource_list.html:11
-#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40
+#: templates/telemeta/lists.html:76 templates/telemeta/mediaitem_copy.html:40
 msgid "Code"
 msgstr "Cote"
 
@@ -1632,7 +1636,7 @@ msgid "No item"
 msgstr "Aucun item"
 
 #: templates/telemeta/inc/module_revisions.html:18
-#: templates/telemeta/lists.html:70
+#: templates/telemeta/lists.html:75
 msgid "Type"
 msgstr "Type"
 
@@ -1642,7 +1646,7 @@ msgid "User"
 msgstr "Utilisateur"
 
 #: templates/telemeta/inc/module_revisions.html:40
-#: templates/telemeta/lists.html:92
+#: templates/telemeta/lists.html:97
 msgid "deleted"
 msgstr "supprimé"
 
@@ -1686,7 +1690,7 @@ msgstr "Cette énumération est vide"
 msgid "My playlists"
 msgstr "Mes listes de lecture"
 
-#: templates/telemeta/lists.html:74
+#: templates/telemeta/lists.html:79
 #: templates/telemeta/search_criteria.html:143
 #: templates/telemeta/search_results.html:70
 msgid "Sound"
@@ -2114,7 +2118,7 @@ msgstr ""
 "Connectez-vous s'il vous plaît ou bien contactez l'administrateur du site "
 "pour obtenir un accès privé."
 
-#: views/collection.py:312
+#: views/collection.py:317
 msgid "You have successfully updated your collection."
 msgstr ""
 

diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo
index bb9cafbe1a4505ef6a0459caee477452bfd5705c..89f3c9e95d3f8fc898a88fa851a7f19758c89b80 100644 (file)
Binary files a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo and b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.po b/telemeta/locale/zh_CN/LC_MESSAGES/django.po
index 4def00ef4c084c83255dca97bfa7395d3f38c03d..ae89246f910f060d3916d1b2ae31c1ef0bf9d586 100644 (file)
--- a/telemeta/locale/zh_CN/LC_MESSAGES/django.po
+++ b/telemeta/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Telemeta 1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-13 11:50+0100\n"
+"POT-Creation-Date: 2014-11-13 16:52+0100\n"
 "PO-Revision-Date: 2014-09-02 16:18+2\n"
 "Last-Translator: Zaichao XIA <xiazaichao@gmail.com>\n"
 "Language-Team: zh_CN <LL@li.org>\n"
@@ -937,7 +937,7 @@ msgstr "通过保存"
 msgid "by message"
 msgstr "通过消息"
 
-#: templates/postman/base_folder.html:23 templates/telemeta/lists.html:75
+#: templates/postman/base_folder.html:23 templates/telemeta/lists.html:80
 msgid "Action"
 msgstr "行动"
 
@@ -964,9 +964,9 @@ msgid "g:i A,M j,n/j/y"
 msgstr ""
 
 #: templates/postman/base_folder.html:49 templates/postman/view.html:25
-#: templates/telemeta/collection_detail.html:224
+#: templates/telemeta/collection_detail.html:227
 #: templates/telemeta/collection_detail_dc.html:25
-#: templates/telemeta/lists.html:58
+#: templates/telemeta/lists.html:63
 #: templates/telemeta/mediaitem_detail.html:357
 #: templates/telemeta/mediaitem_detail_dc.html:20
 #: templates/telemeta/resource_detail.html:105
@@ -1143,7 +1143,7 @@ msgstr "计数/列举"
 #: templates/telemeta/inc/module_revisions.html:17
 #: templates/telemeta/inc/resource_list.html:8
 #: templates/telemeta/inc/resource_related.html:21
-#: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_copy.html:39
+#: templates/telemeta/lists.html:74 templates/telemeta/mediaitem_copy.html:39
 #: templates/telemeta/search_criteria.html:91
 #: templates/telemeta/search_results.html:53
 msgid "Title"
@@ -1241,7 +1241,7 @@ msgid ""
 msgstr "档案的使用尊重文化遗产的原始所有者。"
 
 #: templates/telemeta/base.html:175
-#: templates/telemeta/collection_detail.html:108
+#: templates/telemeta/collection_detail.html:111
 msgid "Legal notices"
 msgstr "合法通知"
 
@@ -1293,7 +1293,7 @@ msgid "Collection"
 msgstr "选集"
 
 #: templates/telemeta/collection_detail.html:43
-#: templates/telemeta/lists.html:55
+#: templates/telemeta/lists.html:60
 #: templates/telemeta/mediaitem_detail.html:95
 #: templates/telemeta/profile_detail.html:72
 #: templates/telemeta/resource_detail.html:43
@@ -1339,60 +1339,66 @@ msgstr "文献"
 msgid "unpublished"
 msgstr "未出版的"
 
-#: templates/telemeta/collection_detail.html:79
+#: templates/telemeta/collection_detail.html:81
 #: templates/telemeta/inc/collection_list.html:12
-#: templates/telemeta/lists.html:73
+#: templates/telemeta/lists.html:78
 msgid "Recording period"
 msgstr "录音时段"
 
-#: templates/telemeta/collection_detail.html:95
+#: templates/telemeta/collection_detail.html:86
+#, fuzzy
+#| msgid "access status"
+msgid "Access type"
+msgstr "访问状态"
+
+#: templates/telemeta/collection_detail.html:98
 #: templates/telemeta/mediaitem_detail.html:214
 msgid "Geographic and cultural informations"
 msgstr "地理和文化信息"
 
-#: templates/telemeta/collection_detail.html:113
+#: templates/telemeta/collection_detail.html:116
 #: templates/telemeta/inc/collection_list.html:11
 #: templates/telemeta/inc/mediaitem_list.html:10
-#: templates/telemeta/lists.html:72
+#: templates/telemeta/lists.html:77
 msgid "Recordist"
 msgstr "录音员"
 
-#: templates/telemeta/collection_detail.html:128
+#: templates/telemeta/collection_detail.html:131
 msgid "Bibliographic references"
 msgstr "参考文献"
 
-#: templates/telemeta/collection_detail.html:140
+#: templates/telemeta/collection_detail.html:143
 #: templates/telemeta/mediaitem_detail.html:277
 msgid "Archiving data"
 msgstr "存档数据"
 
-#: templates/telemeta/collection_detail.html:148
+#: templates/telemeta/collection_detail.html:151
 msgid "Related documentation"
 msgstr "相关文献"
 
-#: templates/telemeta/collection_detail.html:156
+#: templates/telemeta/collection_detail.html:159
 #: templates/telemeta/mediaitem_detail.html:319
 msgid "Comments"
 msgstr "注解"
 
-#: templates/telemeta/collection_detail.html:160
+#: templates/telemeta/collection_detail.html:163
 #: templates/telemeta/mediaitem_detail.html:291
 #: templates/telemeta/resource_detail.html:75
 msgid "Last modification"
 msgstr "上次修改"
 
-#: templates/telemeta/collection_detail.html:174
+#: templates/telemeta/collection_detail.html:177
 #: templates/telemeta/mediaitem_detail.html:301
 msgid "Technical data"
 msgstr "专业数据"
 
-#: templates/telemeta/collection_detail.html:184
+#: templates/telemeta/collection_detail.html:187
 #, fuzzy
 #| msgid "Collections"
 msgid "Collection size"
 msgstr "选集"
 
-#: templates/telemeta/collection_detail.html:188
+#: templates/telemeta/collection_detail.html:191
 #: templates/telemeta/geo_countries.html:16
 msgid "Number of items"
 msgstr "项数目"
@@ -1476,11 +1482,11 @@ msgstr "已出版的"
 msgid "Digitized"
 msgstr ""
 
-#: templates/telemeta/collection_list.html:36
+#: templates/telemeta/collection_list.html:38
 #: templates/telemeta/enumeration_edit.html:23
 #: templates/telemeta/instrument_alias_edit.html:22
-#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:49
-#: templates/telemeta/resource_list.html:22
+#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:51
+#: templates/telemeta/resource_list.html:24
 msgid "Add"
 msgstr "添加"
 
@@ -1619,7 +1625,7 @@ msgstr ""
 #: templates/telemeta/inc/collection_list.html:13
 #: templates/telemeta/inc/mediaitem_list.html:17
 #: templates/telemeta/inc/resource_list.html:11
-#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40
+#: templates/telemeta/lists.html:76 templates/telemeta/mediaitem_copy.html:40
 msgid "Code"
 msgstr "密码"
 
@@ -1668,7 +1674,7 @@ msgid "No item"
 msgstr "无项目"
 
 #: templates/telemeta/inc/module_revisions.html:18
-#: templates/telemeta/lists.html:70
+#: templates/telemeta/lists.html:75
 msgid "Type"
 msgstr "类型"
 
@@ -1678,7 +1684,7 @@ msgid "User"
 msgstr "用户"
 
 #: templates/telemeta/inc/module_revisions.html:40
-#: templates/telemeta/lists.html:92
+#: templates/telemeta/lists.html:97
 msgid "deleted"
 msgstr "已删除"
 
@@ -1722,7 +1728,7 @@ msgstr "该仪器列表为空"
 msgid "My playlists"
 msgstr "我的播放列表"
 
-#: templates/telemeta/lists.html:74
+#: templates/telemeta/lists.html:79
 #: templates/telemeta/search_criteria.html:143
 #: templates/telemeta/search_results.html:70
 msgid "Sound"
@@ -2154,7 +2160,7 @@ msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr "请登录或联系网站管理员以获得私人访问权限。"
 
-#: views/collection.py:312
+#: views/collection.py:317
 msgid "You have successfully updated your collection."
 msgstr ""
 

diff --git a/telemeta/templates/telemeta/admin_enumerations.html b/telemeta/templates/telemeta/admin_enumerations.html
index 587cecd752c14186184c309819a0c01064b1ce6a..4f45f190f7aae5e09cc9bca79868511ec5f72fcd 100644 (file)
--- a/telemeta/templates/telemeta/admin_enumerations.html
+++ b/telemeta/templates/telemeta/admin_enumerations.html
@@ -8,24 +8,20 @@
 
 {% block tabcontents %}
 {% if enumerations %}
-
   <table class="listing">
    <thead>
     <tr><th>{% trans "Title"%}</th></tr>
    </thead><tbody>
     {% for enum in enumerations %}
-      {% if not enum.hidden %}
-         <tr><td><a href="{% url "telemeta-enumeration-edit" enum.id %}">
-                {% trans enum.name|capfirst %}</a></td></tr>
-      {% endif %}
+    <tr><td>
+      <a href="{% url "telemeta-enumeration-edit" enum.id %}">{% trans enum.name|capfirst %}</a>
+    </td></tr>
     {% endfor %}
-    </tbody>
+   </tbody>
   </table>
-
   {% else %}
     <p class="help">{% trans "No enumerations" %}</p>
  {% endif %}
-
 {% endblock %}
 
 

diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index e0446a44e01de87770b16fd3099a0bf16ea17ea1..244d2f9b9c547c820f96613a99f49661ba531cb6 100644 (file)
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -71,6 +71,8 @@
                  <dd>{% trans 'unpublished' %}</dd>
                 {% elif '_E_' in collection.public_id %}
                  <dd>{% trans 'published' %}</dd>
+                {% else %}
+                 <dd>&nbsp;</dd>
                 {% endif %}
                 {% if collection.description %}
                 {% dl_field collection "description" %}
@@ -81,7 +83,8 @@
                 {% if '_E_' in collection.public_id %}
                 {% dl_field collection "year_published" placeholder %}
                 {% endif %}
-                {% dl_field collection "public_access_label" %}
+                <dt>{% trans "Access type" %}</dt>
+                <dd>{% trans collection.public_access %}</dd>
                 {% for parent in parents %}
                 <dt>{% trans parent.element_type|capitalize %}</dt>
                 <dd><a href="{% url "telemeta-resource-detail" parent.element_type parent.public_id %}">{{ parent.title }}</a></dd>

diff --git a/telemeta/templates/telemeta/collection_list.html b/telemeta/templates/telemeta/collection_list.html
index f29e86fa2048ec3ab6577574874a010f761a3d70..b6b789bccbf675eeb31bc9a23396dfe3004e2b4b 100644 (file)
--- a/telemeta/templates/telemeta/collection_list.html
+++ b/telemeta/templates/telemeta/collection_list.html
@@ -31,7 +31,6 @@
     <li><a href="{% url "telemeta-collections-sound" %}">{% trans "Digitized" %}</a></li>
   </ul>
 </div>
-
     {% if user.is_authenticated and perms.telemeta.add_mediacollection %}
     <a href="{% url "telemeta-collection-add" %}">
     <button type="button" class="btn btn-default">

diff --git a/telemeta/views/admin.py b/telemeta/views/admin.py
index b4a5c19d38abd7b86adf58da09480042a2e271e2..33c084a6071a9189ad54be8de44b2aee7b1668d2 100644 (file)
--- a/telemeta/views/admin.py
+++ b/telemeta/views/admin.py
@@ -64,8 +64,9 @@ class AdminView(object):
         enumerations = []
         for model in models:
             if issubclass(model, Enumeration):
-                enumerations.append({"name": model._meta.verbose_name,
-                    "id": model._meta.module_name})
+                if not model.hidden:
+                    enumerations.append({"name": model._meta.verbose_name,
+                                         "id": model._meta.module_name})
 
         cmp = lambda obj1, obj2: unaccent_icmp(obj1['name'], obj2['name'])
         enumerations.sort(cmp)
@@ -178,7 +179,7 @@ class AdminView(object):
             objects = getattr(from_record, link).all()
             for obj in objects:
                 for name in obj._meta.get_all_field_names():
-                    try: 
+                    try:
                         field = obj._meta.get_field(name)
                         if type(field) == field_type:
                             if field.rel.to == enumeration: