fix item with no access, locales

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 8922cc89bf602f9e183ba924ad3edf961b9be3d5..8399fcbf934fa32c9c5ba4ac9f6ec40d3b8cf4c1 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 e7b86b62933a1da5b22fb4c9e47ec19fd4db1a0c..b12e0c1b14cf4002cdf66153766f35ad28e89729 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-27 10:52+0100\n"
+"POT-Creation-Date: 2014-11-27 16:19+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"
@@ -567,12 +567,12 @@ msgstr "Kulturraum"
 msgid "language"
 msgstr "Sprache"
 
-#: models/media.py:371 templates/telemeta/mediaitem_detail.html:250
+#: models/media.py:371 templates/telemeta/mediaitem_detail.html:258
 #, fuzzy
 msgid "Language (ISO norm)"
 msgstr "Sprache"
 
-#: models/media.py:373 templates/telemeta/mediaitem_detail.html:254
+#: models/media.py:373 templates/telemeta/mediaitem_detail.html:262
 #, fuzzy
 msgid "Ethnographic context"
 msgstr "Kommentare / ethnographischer Kontext"
@@ -962,7 +962,7 @@ msgstr "g:i A,M j,n/j/y"
 #: templates/telemeta/collection_detail.html:249
 #: templates/telemeta/collection_detail_dc.html:25
 #: templates/telemeta/lists.html:63
-#: templates/telemeta/mediaitem_detail.html:387
+#: templates/telemeta/mediaitem_detail.html:398
 #: templates/telemeta/mediaitem_detail_dc.html:20
 #: templates/telemeta/resource_detail.html:115
 #: templates/telemeta/resource_detail_dc.html:17
@@ -1338,14 +1338,14 @@ msgstr "Dokumentation"
 #: templates/telemeta/collection_detail.html:93
 #, fuzzy
 msgctxt "collection"
-msgid "unpublished"
+msgid "Unpublished"
 msgstr "unveröffentlicht"
 
 #: templates/telemeta/collection_detail.html:95
 #, fuzzy
 msgctxt "collection"
-msgid "published"
-msgstr "publiziert"
+msgid "Published"
+msgstr "veröffentlicht"
 
 #: templates/telemeta/collection_detail.html:103
 #: templates/telemeta/lists.html:78
@@ -1354,13 +1354,13 @@ msgid "Recording period"
 msgstr "Aufnahmeperiode"
 
 #: templates/telemeta/collection_detail.html:108
-#: templates/telemeta/mediaitem_detail.html:234
+#: templates/telemeta/mediaitem_detail.html:242
 #, fuzzy
 msgid "Access type"
 msgstr "Status"
 
 #: templates/telemeta/collection_detail.html:120
-#: templates/telemeta/mediaitem_detail.html:242
+#: templates/telemeta/mediaitem_detail.html:250
 msgid "Geographic and cultural informations"
 msgstr "geographische und kulturelle Informationen"
 
@@ -1376,7 +1376,7 @@ msgid "Bibliographic references"
 msgstr "bibliographische Referenzen"
 
 #: templates/telemeta/collection_detail.html:165
-#: templates/telemeta/mediaitem_detail.html:305
+#: templates/telemeta/mediaitem_detail.html:313
 msgid "Archiving data"
 msgstr "Archivdaten"
 
@@ -1385,18 +1385,18 @@ msgid "Related documentation"
 msgstr "damit zusammenhängende Dokumentation"
 
 #: templates/telemeta/collection_detail.html:183
-#: templates/telemeta/mediaitem_detail.html:349
+#: templates/telemeta/mediaitem_detail.html:357
 msgid "Comments"
 msgstr "Kommentare"
 
 #: templates/telemeta/collection_detail.html:187
-#: templates/telemeta/mediaitem_detail.html:319
+#: templates/telemeta/mediaitem_detail.html:327
 #: templates/telemeta/resource_detail.html:85
 msgid "Last modification"
 msgstr "Letzte Änderung"
 
 #: templates/telemeta/collection_detail.html:201
-#: templates/telemeta/mediaitem_detail.html:329
+#: templates/telemeta/mediaitem_detail.html:337
 msgid "Technical data"
 msgstr "technische Daten"
 
@@ -1527,7 +1527,7 @@ msgstr "Eintrag hinzufügen"
 #: templates/telemeta/enumeration_edit.html:17
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:30
-#: templates/telemeta/mediaitem_detail.html:191
+#: templates/telemeta/mediaitem_detail.html:199
 #: templates/telemeta/mediaitem_edit.html:135
 msgid "Value"
 msgstr "Wert"
@@ -1674,37 +1674,41 @@ msgstr "Passwort vergessen."
 
 #: templates/telemeta/mediaitem_add.html:5
 #: templates/telemeta/mediaitem_detail.html:5 views/item.py:134
-#: views/item.py:934
 msgid "Item"
 msgstr "Element"
 
-#: templates/telemeta/mediaitem_detail.html:180
+#: templates/telemeta/mediaitem_detail.html:135
+msgid ""
+"This archive is not available online, please contact the CREM. Thank you."
+msgstr ""
+
+#: templates/telemeta/mediaitem_detail.html:188
 #: templates/telemeta/mediaitem_edit.html:125
 msgid "File"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:182
+#: templates/telemeta/mediaitem_detail.html:190
 #: templates/telemeta/mediaitem_edit.html:90
 #: templates/telemeta/mediaitem_edit.html:127
 msgid "Markers"
 msgstr "Marken"
 
-#: templates/telemeta/mediaitem_detail.html:190
+#: templates/telemeta/mediaitem_detail.html:198
 #: templates/telemeta/mediaitem_edit.html:134
 msgid "Property"
 msgstr "Eigenschaft"
 
-#: templates/telemeta/mediaitem_detail.html:192
+#: templates/telemeta/mediaitem_detail.html:200
 #: templates/telemeta/mediaitem_edit.html:136
 msgid "Unit"
 msgstr "Einheit"
 
-#: templates/telemeta/mediaitem_detail.html:213
+#: templates/telemeta/mediaitem_detail.html:221
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "You don't have access to the media of this item."
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:213
+#: templates/telemeta/mediaitem_detail.html:221
 #: templates/telemeta/mediaitem_edit.html:74
 #, fuzzy
 msgid "Please contact the administrators to get more rights."
@@ -1712,34 +1716,34 @@ msgstr ""
 "Bitte loggen Sie sich ein oder kontaktieren Sie den Administrator der "
 "Website, um einen privaten Zugang zu erhalten."
 
-#: templates/telemeta/mediaitem_detail.html:213
+#: templates/telemeta/mediaitem_detail.html:221
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Click here"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:232
+#: templates/telemeta/mediaitem_detail.html:240
 msgid "Recording date"
 msgstr "Aufnahmedatum"
 
-#: templates/telemeta/mediaitem_detail.html:244
+#: templates/telemeta/mediaitem_detail.html:252
 #: templates/telemeta/inc/mediaitem_list.html:12
 msgid "Location"
 msgstr "Aufnahmeort"
 
-#: templates/telemeta/mediaitem_detail.html:265
+#: templates/telemeta/mediaitem_detail.html:273
 #, fuzzy
 msgid "Musical informations"
 msgstr "physisches Format"
 
-#: templates/telemeta/mediaitem_detail.html:313
+#: templates/telemeta/mediaitem_detail.html:321
 msgid "Published references"
 msgstr "publizierte Referenzen"
 
-#: templates/telemeta/mediaitem_detail.html:316
+#: templates/telemeta/mediaitem_detail.html:324
 msgid "Remarks"
 msgstr "Bemerkungen"
 
-#: templates/telemeta/mediaitem_detail.html:337
+#: templates/telemeta/mediaitem_detail.html:345
 #, fuzzy
 msgid "Item size"
 msgstr "Sammlungen"
@@ -2204,7 +2208,7 @@ msgid "Access not allowed"
 msgstr "Zugang verboten"
 
 #: views/collection.py:52 views/home.py:93 views/item.py:135 views/item.py:507
-#: views/item.py:935 views/profile.py:70
+#: views/profile.py:70
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr ""
@@ -2227,10 +2231,19 @@ msgstr "Listen"
 msgid "You have successfully updated your item."
 msgstr ""
 
-#: views/item.py:933
 #, fuzzy
-msgid "Access not allowed."
-msgstr "Zugang verboten"
+#~ msgctxt "collection"
+#~ msgid "unpublished"
+#~ msgstr "unveröffentlicht"
+
+#, fuzzy
+#~ msgctxt "collection"
+#~ msgid "published"
+#~ msgstr "publiziert"
+
+#, fuzzy
+#~ msgid "Access not allowed."
+#~ msgstr "Zugang verboten"
 
 #, fuzzy
 #~ msgctxt "edit"

diff --git a/telemeta/locale/es/LC_MESSAGES/django.mo b/telemeta/locale/es/LC_MESSAGES/django.mo
index 519a2fe275fd964fa4949fbd99f54346465b74e4..ac919424f87f45dff1961a5115b51035d9e5301f 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 f0e6fde59b7851c087d85a2bfd79f2f6703a5065..4e7b6e1ab232877d80cddc30cc0e80912ac647b2 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-27 10:52+0100\n"
+"POT-Creation-Date: 2014-11-27 16:19+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"
@@ -556,11 +556,11 @@ msgstr ""
 msgid "language"
 msgstr ""
 
-#: models/media.py:371 templates/telemeta/mediaitem_detail.html:250
+#: models/media.py:371 templates/telemeta/mediaitem_detail.html:258
 msgid "Language (ISO norm)"
 msgstr ""
 
-#: models/media.py:373 templates/telemeta/mediaitem_detail.html:254
+#: models/media.py:373 templates/telemeta/mediaitem_detail.html:262
 msgid "Ethnographic context"
 msgstr ""
 
@@ -937,7 +937,7 @@ msgstr ""
 #: templates/telemeta/collection_detail.html:249
 #: templates/telemeta/collection_detail_dc.html:25
 #: templates/telemeta/lists.html:63
-#: templates/telemeta/mediaitem_detail.html:387
+#: templates/telemeta/mediaitem_detail.html:398
 #: templates/telemeta/mediaitem_detail_dc.html:20
 #: templates/telemeta/resource_detail.html:115
 #: templates/telemeta/resource_detail_dc.html:17
@@ -1301,12 +1301,12 @@ msgstr ""
 
 #: templates/telemeta/collection_detail.html:93
 msgctxt "collection"
-msgid "unpublished"
+msgid "Unpublished"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:95
 msgctxt "collection"
-msgid "published"
+msgid "Published"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:103
@@ -1316,12 +1316,12 @@ msgid "Recording period"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:108
-#: templates/telemeta/mediaitem_detail.html:234
+#: templates/telemeta/mediaitem_detail.html:242
 msgid "Access type"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:120
-#: templates/telemeta/mediaitem_detail.html:242
+#: templates/telemeta/mediaitem_detail.html:250
 msgid "Geographic and cultural informations"
 msgstr ""
 
@@ -1337,7 +1337,7 @@ msgid "Bibliographic references"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:165
-#: templates/telemeta/mediaitem_detail.html:305
+#: templates/telemeta/mediaitem_detail.html:313
 msgid "Archiving data"
 msgstr ""
 
@@ -1346,18 +1346,18 @@ msgid "Related documentation"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:183
-#: templates/telemeta/mediaitem_detail.html:349
+#: templates/telemeta/mediaitem_detail.html:357
 msgid "Comments"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:187
-#: templates/telemeta/mediaitem_detail.html:319
+#: templates/telemeta/mediaitem_detail.html:327
 #: templates/telemeta/resource_detail.html:85
 msgid "Last modification"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:201
-#: templates/telemeta/mediaitem_detail.html:329
+#: templates/telemeta/mediaitem_detail.html:337
 msgid "Technical data"
 msgstr ""
 
@@ -1484,7 +1484,7 @@ msgstr ""
 #: templates/telemeta/enumeration_edit.html:17
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:30
-#: templates/telemeta/mediaitem_detail.html:191
+#: templates/telemeta/mediaitem_detail.html:199
 #: templates/telemeta/mediaitem_edit.html:135
 msgid "Value"
 msgstr ""
@@ -1629,68 +1629,72 @@ msgstr ""
 
 #: templates/telemeta/mediaitem_add.html:5
 #: templates/telemeta/mediaitem_detail.html:5 views/item.py:134
-#: views/item.py:934
 msgid "Item"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:180
+#: templates/telemeta/mediaitem_detail.html:135
+msgid ""
+"This archive is not available online, please contact the CREM. Thank you."
+msgstr ""
+
+#: templates/telemeta/mediaitem_detail.html:188
 #: templates/telemeta/mediaitem_edit.html:125
 msgid "File"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:182
+#: templates/telemeta/mediaitem_detail.html:190
 #: templates/telemeta/mediaitem_edit.html:90
 #: templates/telemeta/mediaitem_edit.html:127
 msgid "Markers"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:190
+#: templates/telemeta/mediaitem_detail.html:198
 #: templates/telemeta/mediaitem_edit.html:134
 msgid "Property"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:192
+#: templates/telemeta/mediaitem_detail.html:200
 #: templates/telemeta/mediaitem_edit.html:136
 msgid "Unit"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:213
+#: templates/telemeta/mediaitem_detail.html:221
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "You don't have access to the media of this item."
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:213
+#: templates/telemeta/mediaitem_detail.html:221
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Please contact the administrators to get more rights."
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:213
+#: templates/telemeta/mediaitem_detail.html:221
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Click here"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:232
+#: templates/telemeta/mediaitem_detail.html:240
 msgid "Recording date"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:244
+#: templates/telemeta/mediaitem_detail.html:252
 #: templates/telemeta/inc/mediaitem_list.html:12
 msgid "Location"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:265
+#: templates/telemeta/mediaitem_detail.html:273
 msgid "Musical informations"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:313
+#: templates/telemeta/mediaitem_detail.html:321
 msgid "Published references"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:316
+#: templates/telemeta/mediaitem_detail.html:324
 msgid "Remarks"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:337
+#: templates/telemeta/mediaitem_detail.html:345
 msgid "Item size"
 msgstr ""
 
@@ -2132,7 +2136,7 @@ msgid "Access not allowed"
 msgstr ""
 
 #: views/collection.py:52 views/home.py:93 views/item.py:135 views/item.py:507
-#: views/item.py:935 views/profile.py:70
+#: views/profile.py:70
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr ""
@@ -2152,7 +2156,3 @@ msgstr ""
 #: views/item.py:729
 msgid "You have successfully updated your item."
 msgstr ""
-
-#: views/item.py:933
-msgid "Access not allowed."
-msgstr ""

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index 2985941a2666d9126a83eb577b3011bbb03cbfbb..1b5e1aaa1172daf8564a022aba6fd87b132bc4da 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 e717ca1828c9031029f16f5a63290c9970f76a64..507ee814129a80454b04005d54a43d5b36a902fc 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-27 10:52+0100\n"
+"POT-Creation-Date: 2014-11-27 16:19+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"
@@ -555,11 +555,11 @@ msgstr "aire culturelle"
 msgid "language"
 msgstr "langue"
 
-#: models/media.py:371 templates/telemeta/mediaitem_detail.html:250
+#: models/media.py:371 templates/telemeta/mediaitem_detail.html:258
 msgid "Language (ISO norm)"
 msgstr "Langue (norme ISO)"
 
-#: models/media.py:373 templates/telemeta/mediaitem_detail.html:254
+#: models/media.py:373 templates/telemeta/mediaitem_detail.html:262
 msgid "Ethnographic context"
 msgstr "Contexte ethnographique"
 
@@ -937,7 +937,7 @@ msgstr ""
 #: templates/telemeta/collection_detail.html:249
 #: templates/telemeta/collection_detail_dc.html:25
 #: templates/telemeta/lists.html:63
-#: templates/telemeta/mediaitem_detail.html:387
+#: templates/telemeta/mediaitem_detail.html:398
 #: templates/telemeta/mediaitem_detail_dc.html:20
 #: templates/telemeta/resource_detail.html:115
 #: templates/telemeta/resource_detail_dc.html:17
@@ -1303,13 +1303,13 @@ msgstr "Statut du document"
 
 #: templates/telemeta/collection_detail.html:93
 msgctxt "collection"
-msgid "unpublished"
-msgstr "inédite"
+msgid "Unpublished"
+msgstr "Inédit"
 
 #: templates/telemeta/collection_detail.html:95
 msgctxt "collection"
-msgid "published"
-msgstr "éditée"
+msgid "Published"
+msgstr "Edité"
 
 #: templates/telemeta/collection_detail.html:103
 #: templates/telemeta/lists.html:78
@@ -1318,12 +1318,12 @@ msgid "Recording period"
 msgstr "Période d'enregistrement"
 
 #: templates/telemeta/collection_detail.html:108
-#: templates/telemeta/mediaitem_detail.html:234
+#: templates/telemeta/mediaitem_detail.html:242
 msgid "Access type"
 msgstr "Type d'accès"
 
 #: templates/telemeta/collection_detail.html:120
-#: templates/telemeta/mediaitem_detail.html:242
+#: templates/telemeta/mediaitem_detail.html:250
 msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
@@ -1339,7 +1339,7 @@ msgid "Bibliographic references"
 msgstr "Références bibliographiques"
 
 #: templates/telemeta/collection_detail.html:165
-#: templates/telemeta/mediaitem_detail.html:305
+#: templates/telemeta/mediaitem_detail.html:313
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
@@ -1348,18 +1348,18 @@ msgid "Related documentation"
 msgstr "Documentation associée"
 
 #: templates/telemeta/collection_detail.html:183
-#: templates/telemeta/mediaitem_detail.html:349
+#: templates/telemeta/mediaitem_detail.html:357
 msgid "Comments"
 msgstr "Commentaires"
 
 #: templates/telemeta/collection_detail.html:187
-#: templates/telemeta/mediaitem_detail.html:319
+#: templates/telemeta/mediaitem_detail.html:327
 #: templates/telemeta/resource_detail.html:85
 msgid "Last modification"
 msgstr "Dernière modification de la fiche"
 
 #: templates/telemeta/collection_detail.html:201
-#: templates/telemeta/mediaitem_detail.html:329
+#: templates/telemeta/mediaitem_detail.html:337
 msgid "Technical data"
 msgstr "Données techniques"
 
@@ -1486,7 +1486,7 @@ msgstr "Ajouter une entrée"
 #: templates/telemeta/enumeration_edit.html:17
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:30
-#: templates/telemeta/mediaitem_detail.html:191
+#: templates/telemeta/mediaitem_detail.html:199
 #: templates/telemeta/mediaitem_edit.html:135
 msgid "Value"
 msgstr "Valeur"
@@ -1632,68 +1632,74 @@ msgstr "Mot de passe oublié"
 
 #: templates/telemeta/mediaitem_add.html:5
 #: templates/telemeta/mediaitem_detail.html:5 views/item.py:134
-#: views/item.py:934
 msgid "Item"
 msgstr "Item"
 
-#: templates/telemeta/mediaitem_detail.html:180
+#: templates/telemeta/mediaitem_detail.html:135
+msgid ""
+"This archive is not available online, please contact the CREM. Thank you."
+msgstr ""
+"Cette archive n’est pas accessible en ligne, veuillez contacter le CREM. "
+"Merci."
+
+#: templates/telemeta/mediaitem_detail.html:188
 #: templates/telemeta/mediaitem_edit.html:125
 msgid "File"
 msgstr "Fichier"
 
-#: templates/telemeta/mediaitem_detail.html:182
+#: templates/telemeta/mediaitem_detail.html:190
 #: templates/telemeta/mediaitem_edit.html:90
 #: templates/telemeta/mediaitem_edit.html:127
 msgid "Markers"
 msgstr "Marqueurs"
 
-#: templates/telemeta/mediaitem_detail.html:190
+#: templates/telemeta/mediaitem_detail.html:198
 #: templates/telemeta/mediaitem_edit.html:134
 msgid "Property"
 msgstr "Propriété"
 
-#: templates/telemeta/mediaitem_detail.html:192
+#: templates/telemeta/mediaitem_detail.html:200
 #: templates/telemeta/mediaitem_edit.html:136
 msgid "Unit"
 msgstr "Unité"
 
-#: templates/telemeta/mediaitem_detail.html:213
+#: templates/telemeta/mediaitem_detail.html:221
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "You don't have access to the media of this item."
 msgstr "Vous n'avez pas accès aux médias de cet item."
 
-#: templates/telemeta/mediaitem_detail.html:213
+#: templates/telemeta/mediaitem_detail.html:221
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Please contact the administrators to get more rights."
 msgstr "Contactez les administrateurs du site pour obtenir plus de droits."
 
-#: templates/telemeta/mediaitem_detail.html:213
+#: templates/telemeta/mediaitem_detail.html:221
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Click here"
 msgstr "Cliquez ici"
 
-#: templates/telemeta/mediaitem_detail.html:232
+#: templates/telemeta/mediaitem_detail.html:240
 msgid "Recording date"
 msgstr "Date d'enregistrement"
 
-#: templates/telemeta/mediaitem_detail.html:244
+#: templates/telemeta/mediaitem_detail.html:252
 #: templates/telemeta/inc/mediaitem_list.html:12
 msgid "Location"
 msgstr "Lieu"
 
-#: templates/telemeta/mediaitem_detail.html:265
+#: templates/telemeta/mediaitem_detail.html:273
 msgid "Musical informations"
 msgstr "Informations sur la musique"
 
-#: templates/telemeta/mediaitem_detail.html:313
+#: templates/telemeta/mediaitem_detail.html:321
 msgid "Published references"
 msgstr "Références éditées"
 
-#: templates/telemeta/mediaitem_detail.html:316
+#: templates/telemeta/mediaitem_detail.html:324
 msgid "Remarks"
 msgstr "Remarques"
 
-#: templates/telemeta/mediaitem_detail.html:337
+#: templates/telemeta/mediaitem_detail.html:345
 msgid "Item size"
 msgstr "Taille de l'item"
 
@@ -2139,7 +2145,7 @@ msgid "Access not allowed"
 msgstr "Accès non autorisé"
 
 #: views/collection.py:52 views/home.py:93 views/item.py:135 views/item.py:507
-#: views/item.py:935 views/profile.py:70
+#: views/profile.py:70
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr ""
@@ -2162,9 +2168,8 @@ msgstr "Listes"
 msgid "You have successfully updated your item."
 msgstr ""
 
-#: views/item.py:933
-msgid "Access not allowed."
-msgstr "Accès non autorisé"
+#~ msgid "Access not allowed."
+#~ msgstr "Accès non autorisé"
 
 #~ msgctxt "edit"
 #~ msgid "General"

diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo
index 3c53932d45bfc9c72419820423c2940e58f35a79..4b56603ebfef57924d54fa784b48be9f010c90b0 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 41eaeedfa29288fd649f7794ed48db8537253f99..54e8b496fe46170be4046fe671e84978c82d7f0d 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-27 10:52+0100\n"
+"POT-Creation-Date: 2014-11-27 16:19+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"
@@ -567,12 +567,12 @@ msgstr "文化区域"
 msgid "language"
 msgstr "语言"
 
-#: models/media.py:371 templates/telemeta/mediaitem_detail.html:250
+#: models/media.py:371 templates/telemeta/mediaitem_detail.html:258
 #, fuzzy
 msgid "Language (ISO norm)"
 msgstr "ISO语言"
 
-#: models/media.py:373 templates/telemeta/mediaitem_detail.html:254
+#: models/media.py:373 templates/telemeta/mediaitem_detail.html:262
 msgid "Ethnographic context"
 msgstr "人种文本"
 
@@ -959,7 +959,7 @@ msgstr ""
 #: templates/telemeta/collection_detail.html:249
 #: templates/telemeta/collection_detail_dc.html:25
 #: templates/telemeta/lists.html:63
-#: templates/telemeta/mediaitem_detail.html:387
+#: templates/telemeta/mediaitem_detail.html:398
 #: templates/telemeta/mediaitem_detail_dc.html:20
 #: templates/telemeta/resource_detail.html:115
 #: templates/telemeta/resource_detail_dc.html:17
@@ -1328,13 +1328,13 @@ msgstr "文献"
 #: templates/telemeta/collection_detail.html:93
 #, fuzzy
 msgctxt "collection"
-msgid "unpublished"
+msgid "Unpublished"
 msgstr "未出版的"
 
 #: templates/telemeta/collection_detail.html:95
 #, fuzzy
 msgctxt "collection"
-msgid "published"
+msgid "Published"
 msgstr "已出版的"
 
 #: templates/telemeta/collection_detail.html:103
@@ -1344,13 +1344,13 @@ msgid "Recording period"
 msgstr "录音时段"
 
 #: templates/telemeta/collection_detail.html:108
-#: templates/telemeta/mediaitem_detail.html:234
+#: templates/telemeta/mediaitem_detail.html:242
 #, fuzzy
 msgid "Access type"
 msgstr "访问状态"
 
 #: templates/telemeta/collection_detail.html:120
-#: templates/telemeta/mediaitem_detail.html:242
+#: templates/telemeta/mediaitem_detail.html:250
 msgid "Geographic and cultural informations"
 msgstr "地理和文化信息"
 
@@ -1366,7 +1366,7 @@ msgid "Bibliographic references"
 msgstr "参考文献"
 
 #: templates/telemeta/collection_detail.html:165
-#: templates/telemeta/mediaitem_detail.html:305
+#: templates/telemeta/mediaitem_detail.html:313
 msgid "Archiving data"
 msgstr "存档数据"
 
@@ -1375,18 +1375,18 @@ msgid "Related documentation"
 msgstr "相关文献"
 
 #: templates/telemeta/collection_detail.html:183
-#: templates/telemeta/mediaitem_detail.html:349
+#: templates/telemeta/mediaitem_detail.html:357
 msgid "Comments"
 msgstr "注解"
 
 #: templates/telemeta/collection_detail.html:187
-#: templates/telemeta/mediaitem_detail.html:319
+#: templates/telemeta/mediaitem_detail.html:327
 #: templates/telemeta/resource_detail.html:85
 msgid "Last modification"
 msgstr "上次修改"
 
 #: templates/telemeta/collection_detail.html:201
-#: templates/telemeta/mediaitem_detail.html:329
+#: templates/telemeta/mediaitem_detail.html:337
 msgid "Technical data"
 msgstr "专业数据"
 
@@ -1517,7 +1517,7 @@ msgstr "添加记录"
 #: templates/telemeta/enumeration_edit.html:17
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:30
-#: templates/telemeta/mediaitem_detail.html:191
+#: templates/telemeta/mediaitem_detail.html:199
 #: templates/telemeta/mediaitem_edit.html:135
 msgid "Value"
 msgstr "价值"
@@ -1662,68 +1662,72 @@ msgstr "忘记密码"
 
 #: templates/telemeta/mediaitem_add.html:5
 #: templates/telemeta/mediaitem_detail.html:5 views/item.py:134
-#: views/item.py:934
 msgid "Item"
 msgstr "项"
 
-#: templates/telemeta/mediaitem_detail.html:180
+#: templates/telemeta/mediaitem_detail.html:135
+msgid ""
+"This archive is not available online, please contact the CREM. Thank you."
+msgstr ""
+
+#: templates/telemeta/mediaitem_detail.html:188
 #: templates/telemeta/mediaitem_edit.html:125
 msgid "File"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:182
+#: templates/telemeta/mediaitem_detail.html:190
 #: templates/telemeta/mediaitem_edit.html:90
 #: templates/telemeta/mediaitem_edit.html:127
 msgid "Markers"
 msgstr "书签"
 
-#: templates/telemeta/mediaitem_detail.html:190
+#: templates/telemeta/mediaitem_detail.html:198
 #: templates/telemeta/mediaitem_edit.html:134
 msgid "Property"
 msgstr "性能"
 
-#: templates/telemeta/mediaitem_detail.html:192
+#: templates/telemeta/mediaitem_detail.html:200
 #: templates/telemeta/mediaitem_edit.html:136
 msgid "Unit"
 msgstr "单元"
 
-#: templates/telemeta/mediaitem_detail.html:213
+#: templates/telemeta/mediaitem_detail.html:221
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "You don't have access to the media of this item."
 msgstr "您无权访问该项的媒体"
 
-#: templates/telemeta/mediaitem_detail.html:213
+#: templates/telemeta/mediaitem_detail.html:221
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Please contact the administrators to get more rights."
 msgstr "请联系管理员以获得跟多权限。"
 
-#: templates/telemeta/mediaitem_detail.html:213
+#: templates/telemeta/mediaitem_detail.html:221
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Click here"
 msgstr "点击这里"
 
-#: templates/telemeta/mediaitem_detail.html:232
+#: templates/telemeta/mediaitem_detail.html:240
 msgid "Recording date"
 msgstr "录音日期"
 
-#: templates/telemeta/mediaitem_detail.html:244
+#: templates/telemeta/mediaitem_detail.html:252
 #: templates/telemeta/inc/mediaitem_list.html:12
 msgid "Location"
 msgstr "位置"
 
-#: templates/telemeta/mediaitem_detail.html:265
+#: templates/telemeta/mediaitem_detail.html:273
 msgid "Musical informations"
 msgstr "音乐信息"
 
-#: templates/telemeta/mediaitem_detail.html:313
+#: templates/telemeta/mediaitem_detail.html:321
 msgid "Published references"
 msgstr "已出版参考资料"
 
-#: templates/telemeta/mediaitem_detail.html:316
+#: templates/telemeta/mediaitem_detail.html:324
 msgid "Remarks"
 msgstr "评论"
 
-#: templates/telemeta/mediaitem_detail.html:337
+#: templates/telemeta/mediaitem_detail.html:345
 #, fuzzy
 msgid "Item size"
 msgstr "选集"
@@ -2173,7 +2177,7 @@ msgid "Access not allowed"
 msgstr "不允许访问"
 
 #: views/collection.py:52 views/home.py:93 views/item.py:135 views/item.py:507
-#: views/item.py:935 views/profile.py:70
+#: views/profile.py:70
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr "请登录或联系网站管理员以获得私人访问权限。"
@@ -2194,10 +2198,19 @@ msgstr "列表"
 msgid "You have successfully updated your item."
 msgstr ""
 
-#: views/item.py:933
 #, fuzzy
-msgid "Access not allowed."
-msgstr "不允许访问"
+#~ msgctxt "collection"
+#~ msgid "unpublished"
+#~ msgstr "未出版的"
+
+#, fuzzy
+#~ msgctxt "collection"
+#~ msgid "published"
+#~ msgstr "已出版的"
+
+#, fuzzy
+#~ msgid "Access not allowed."
+#~ msgstr "不允许访问"
 
 #, fuzzy
 #~ msgctxt "edit"

diff --git a/telemeta/pages/de/help.rst b/telemeta/pages/de/help.rst
index de816106171b0f5f803e349165e9c349a7ac4e14..9ab30bfe46c4c9e37bc8c0f6264b1e0d255e8eb4 100644 (file)
--- a/telemeta/pages/de/help.rst
+++ b/telemeta/pages/de/help.rst
@@ -1,20 +1,17 @@
-.. image:: images/help.png
-    :align: left
-
 ========================
 Hilfe zu Telemeta
 ========================
 
 Für technische Unterstützung treten Sie bitte unserer Mailingliste bei:
-    
+
     `http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta <http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta>`_
-    
+
 oder kontaktieren Sie uns per Email:
-        
+
      support@parisson.com
-        
+
 oder Twitter:
-            
+
     `http://twitter.com/telemeta <http://twitter.com/telemeta>`_
 
 Weitere Informationen über das Telemetasystem finden Sie unter `telemeta.org <http://telemeta.org>`_

diff --git a/telemeta/pages/en/help.rst b/telemeta/pages/en/help.rst
index 045ed33c24fed5b100014fc4f177679ea1597eeb..b23a1c7e57d06e394c947ae1837cb15c03cf47ad 100644 (file)
--- a/telemeta/pages/en/help.rst
+++ b/telemeta/pages/en/help.rst
@@ -1,24 +1,21 @@
-.. image:: images/help.png
-    :align: left
-
 ========================
 Help pages for Telemeta
 ========================
 
 In order to get access to some resticted items on this site, please contact:
-    
+
     Aude Julien <aude.da-cruz-lima (at) mae.u-paris10.fr>
 
 For technical assistance, please join our mailing list:
-        
+
     `http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta <http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta>`_
-        
+
 or contact the hotline by email:
-            
+
      support@parisson.com
-            
+
 or twitter :
-                
+
     `http://twitter.com/telemeta <http://twitter.com/telemeta>`_
 
 For more informations about the Telemeta system, see `telemeta.org <http://telemeta.org>`_

diff --git a/telemeta/pages/fr/help.rst b/telemeta/pages/fr/help.rst
index a2a320a6b2429a94b0fb326cacdd5322743b22c5..8582fd4dc3b18d197c8b8b41a836e6982ba7de26 100644 (file)
--- a/telemeta/pages/fr/help.rst
+++ b/telemeta/pages/fr/help.rst
@@ -1,6 +1,3 @@
-.. image:: images/help.png
-    :align: left
-
 ========================
 Pages d'aide de Telemeta
 ========================

diff --git a/telemeta/pages/zh_CN/help.rst b/telemeta/pages/zh_CN/help.rst
index 045ed33c24fed5b100014fc4f177679ea1597eeb..b23a1c7e57d06e394c947ae1837cb15c03cf47ad 100644 (file)
--- a/telemeta/pages/zh_CN/help.rst
+++ b/telemeta/pages/zh_CN/help.rst
@@ -1,24 +1,21 @@
-.. image:: images/help.png
-    :align: left
-
 ========================
 Help pages for Telemeta
 ========================
 
 In order to get access to some resticted items on this site, please contact:
-    
+
     Aude Julien <aude.da-cruz-lima (at) mae.u-paris10.fr>
 
 For technical assistance, please join our mailing list:
-        
+
     `http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta <http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta>`_
-        
+
 or contact the hotline by email:
-            
+
      support@parisson.com
-            
+
 or twitter :
-                
+
     `http://twitter.com/telemeta <http://twitter.com/telemeta>`_
 
 For more informations about the Telemeta system, see `telemeta.org <http://telemeta.org>`_

diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index b318ff2d174dc939e15ccbbac371e1d1fae355f5..da2aee292b194f5f23f476277c0bfda1f7c4a31f 100644 (file)
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -90,9 +90,9 @@
                 {% endif %}
                 <dt>{% trans "Document status" %}</dt>
                 {% if '_I_' in collection.public_id %}
-                 <dd>{% trans 'unpublished' context "collection" %}</dd>
+                 <dd>{% trans 'Unpublished' context "collection" %}</dd>
                 {% elif '_E_' in collection.public_id %}
-                 <dd>{% trans 'published' context "collection" %}</dd>
+                 <dd>{% trans 'Published' context "collection" %}</dd>
                 {% else %}
                  <dd>&nbsp;</dd>
                 {% endif %}

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 2b14ddb66fad5a036e23928cb5bcf3dc6cf5f70a..f0087c574976b0afdd71c6f0d54e53d2ecc948b0 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -127,8 +127,16 @@
 </div>
 {% endblock title_buttons %}
 
-
 {% block content %}
+
+{% if access == 'none' and not perms.telemeta.can_play_all_items %}
+
+<div>
+{% trans "This archive is not available online, please contact the CREM. Thank you."%}
+</div>
+
+{% else %}
+
 <div class="{% if item.file %}{% if access == 'full' or perms.telemeta.can_play_all_items %}with-rightcol{% endif %}{% endif %}">
 
     {% if item.file or item.url %}
@@ -378,10 +386,13 @@
 </script>
 {% endif %}
 
-{% endblock %}
+<a href="{% url "telemeta-item-dublincore" item.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
+
+{% endif %}
+
+{% endblock content %}
 
 {% block delete %}
-<a href="{% url "telemeta-item-dublincore" item.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
 {% if user.is_authenticated and perms.telemeta.delete_mediaitem %}
  <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url "telemeta-item-delete" item.public_id %}';};return false;"
         class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index f5763ebac6531c64d8136354019db0506a25ff5c..9bc99ab58d630b1702fa99b527bb9d909ec7cc91 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -929,14 +929,6 @@ class ItemDetailView(ItemViewMixin, DetailView):
 
         access = get_item_access(item, self.request.user)
 
-        if access == 'none':
-            mess = ugettext('Access not allowed.')
-            title = ugettext('Item') + ' : ' + public_id + ' : ' + mess
-            description = ugettext('Please login or contact the website administator to get a private access.')
-            message = title + '\n' + description
-            messages.error(self.request, title)
-            context['access'] = None
-
         previous, next = self.item_previous_next(item)
 
         self.item_analyze(item)