From: Guillaume Pellerin Date: Mon, 10 Nov 2014 16:21:48 +0000 (+0100) Subject: add item size X-Git-Tag: 1.5.0rc1~27^2~58 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=47a7241d76f3c8067f48c4c057d6ba0d3a67d7e7;p=telemeta.git add item size --- diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 5cef6780..5717f88f 100644 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 b7e92200..810064ee 100644 --- 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-10 16:01+0100\n" +"POT-Creation-Date: 2014-11-10 17:21+0100\n" "PO-Revision-Date: 2012-12-22 21:24+0100\n" "Last-Translator: Patrik Tschudin \n" "Language-Team: LANGUAGE \n" @@ -494,7 +494,7 @@ msgstr "abgeschlossene Elemente" msgid "recordist identical to depositor" msgstr "TonmeisterIn ist identisch mit HinterlegerIn" -#: models/media.py:245 templates/telemeta/collection_detail.html:82 +#: models/media.py:245 templates/telemeta/collection_detail.html:73 msgid "published" msgstr "publiziert" @@ -673,6 +673,12 @@ msgstr "Schlüsselwörter" msgid "instruments" msgstr "Instrumente" +#: models/media.py:505 +#, fuzzy +#| msgid "collections" +msgid "item size (Mo)" +msgstr "Sammlungen" + #: models/media.py:531 models/media.py:532 msgid "item related media" msgstr "zum Element gehörende Medien" @@ -959,10 +965,10 @@ 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:231 +#: templates/telemeta/collection_detail.html:222 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:352 +#: templates/telemeta/mediaitem_detail.html:353 #: templates/telemeta/mediaitem_detail_dc.html:20 #: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 @@ -1208,6 +1214,7 @@ msgid "Collections" msgstr "Sammlungen" #: templates/telemeta/base.html:117 templates/telemeta/breadcrumbs.html:7 +#: templates/telemeta/collection_detail.html:62 #: templates/telemeta/inc/breadcrumbs.html:8 #: templates/telemeta/mediaitem_list.html:11 msgid "Items" @@ -1249,7 +1256,7 @@ msgstr "" "Ursprungsgesellschaften." #: templates/telemeta/base.html:186 -#: templates/telemeta/collection_detail.html:117 +#: templates/telemeta/collection_detail.html:108 msgid "Legal notices" msgstr "juristische Hinweise" @@ -1332,70 +1339,70 @@ msgstr "zu Wiedergabeliste hinzufügen" msgid "Download" msgstr "herunterladen:" -#: templates/telemeta/collection_detail.html:68 +#: templates/telemeta/collection_detail.html:63 msgid "View list" msgstr "" -#: templates/telemeta/collection_detail.html:78 +#: templates/telemeta/collection_detail.html:69 #, fuzzy #| msgid "Documentation" msgid "Document status" msgstr "Dokumentation" -#: templates/telemeta/collection_detail.html:80 +#: templates/telemeta/collection_detail.html:71 #, fuzzy #| msgid "Unpublished" msgid "unpublished" msgstr "unveröffentlicht" -#: templates/telemeta/collection_detail.html:88 +#: templates/telemeta/collection_detail.html:79 #: templates/telemeta/inc/collection_list.html:12 #: templates/telemeta/lists.html:73 msgid "Recording period" msgstr "Aufnahmeperiode" -#: templates/telemeta/collection_detail.html:104 +#: templates/telemeta/collection_detail.html:95 #: templates/telemeta/mediaitem_detail.html:214 msgid "Geographic and cultural informations" msgstr "geographische und kulturelle Informationen" -#: templates/telemeta/collection_detail.html:122 +#: templates/telemeta/collection_detail.html:113 #: templates/telemeta/inc/collection_list.html:11 #: templates/telemeta/inc/mediaitem_list.html:10 #: templates/telemeta/lists.html:72 msgid "Recordist" msgstr "TonmeisterIn" -#: templates/telemeta/collection_detail.html:137 +#: templates/telemeta/collection_detail.html:128 msgid "Bibliographic references" msgstr "bibliographische Referenzen" -#: templates/telemeta/collection_detail.html:149 +#: templates/telemeta/collection_detail.html:140 #: templates/telemeta/mediaitem_detail.html:277 msgid "Archiving data" msgstr "Archivdaten" -#: templates/telemeta/collection_detail.html:157 +#: templates/telemeta/collection_detail.html:148 msgid "Related documentation" msgstr "damit zusammenhängende Dokumentation" -#: templates/telemeta/collection_detail.html:165 -#: templates/telemeta/mediaitem_detail.html:314 +#: templates/telemeta/collection_detail.html:156 +#: templates/telemeta/mediaitem_detail.html:315 msgid "Comments" msgstr "Kommentare" -#: templates/telemeta/collection_detail.html:169 +#: templates/telemeta/collection_detail.html:160 #: templates/telemeta/mediaitem_detail.html:291 #: templates/telemeta/resource_detail.html:75 msgid "Last modification" msgstr "Letzte Änderung" -#: templates/telemeta/collection_detail.html:183 +#: templates/telemeta/collection_detail.html:174 #: templates/telemeta/mediaitem_detail.html:301 msgid "Technical data" msgstr "technische Daten" -#: templates/telemeta/collection_detail.html:196 +#: templates/telemeta/collection_detail.html:187 #: templates/telemeta/geo_countries.html:16 msgid "Number of items" msgstr "Anzahl Elemente" diff --git a/telemeta/locale/es/LC_MESSAGES/django.mo b/telemeta/locale/es/LC_MESSAGES/django.mo index 15b154dd..00292b79 100644 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 93f2821e..41dad840 100644 --- 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-10 16:01+0100\n" +"POT-Creation-Date: 2014-11-10 17:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -482,7 +482,7 @@ msgstr "" msgid "recordist identical to depositor" msgstr "" -#: models/media.py:245 templates/telemeta/collection_detail.html:82 +#: models/media.py:245 templates/telemeta/collection_detail.html:73 msgid "published" msgstr "" @@ -655,6 +655,10 @@ msgstr "" msgid "instruments" msgstr "" +#: models/media.py:505 +msgid "item size (Mo)" +msgstr "" + #: models/media.py:531 models/media.py:532 msgid "item related media" msgstr "" @@ -930,10 +934,10 @@ 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:231 +#: templates/telemeta/collection_detail.html:222 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:352 +#: templates/telemeta/mediaitem_detail.html:353 #: templates/telemeta/mediaitem_detail_dc.html:20 #: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 @@ -1173,6 +1177,7 @@ msgid "Collections" msgstr "" #: templates/telemeta/base.html:117 templates/telemeta/breadcrumbs.html:7 +#: templates/telemeta/collection_detail.html:62 #: templates/telemeta/inc/breadcrumbs.html:8 #: templates/telemeta/mediaitem_list.html:11 msgid "Items" @@ -1211,7 +1216,7 @@ msgid "" msgstr "" #: templates/telemeta/base.html:186 -#: templates/telemeta/collection_detail.html:117 +#: templates/telemeta/collection_detail.html:108 msgid "Legal notices" msgstr "" @@ -1293,66 +1298,66 @@ msgstr "" msgid "Download" msgstr "" -#: templates/telemeta/collection_detail.html:68 +#: templates/telemeta/collection_detail.html:63 msgid "View list" msgstr "" -#: templates/telemeta/collection_detail.html:78 +#: templates/telemeta/collection_detail.html:69 msgid "Document status" msgstr "" -#: templates/telemeta/collection_detail.html:80 +#: templates/telemeta/collection_detail.html:71 msgid "unpublished" msgstr "" -#: templates/telemeta/collection_detail.html:88 +#: templates/telemeta/collection_detail.html:79 #: templates/telemeta/inc/collection_list.html:12 #: templates/telemeta/lists.html:73 msgid "Recording period" msgstr "" -#: templates/telemeta/collection_detail.html:104 +#: templates/telemeta/collection_detail.html:95 #: templates/telemeta/mediaitem_detail.html:214 msgid "Geographic and cultural informations" msgstr "" -#: templates/telemeta/collection_detail.html:122 +#: templates/telemeta/collection_detail.html:113 #: templates/telemeta/inc/collection_list.html:11 #: templates/telemeta/inc/mediaitem_list.html:10 #: templates/telemeta/lists.html:72 msgid "Recordist" msgstr "" -#: templates/telemeta/collection_detail.html:137 +#: templates/telemeta/collection_detail.html:128 msgid "Bibliographic references" msgstr "" -#: templates/telemeta/collection_detail.html:149 +#: templates/telemeta/collection_detail.html:140 #: templates/telemeta/mediaitem_detail.html:277 msgid "Archiving data" msgstr "" -#: templates/telemeta/collection_detail.html:157 +#: templates/telemeta/collection_detail.html:148 msgid "Related documentation" msgstr "" -#: templates/telemeta/collection_detail.html:165 -#: templates/telemeta/mediaitem_detail.html:314 +#: templates/telemeta/collection_detail.html:156 +#: templates/telemeta/mediaitem_detail.html:315 msgid "Comments" msgstr "" -#: templates/telemeta/collection_detail.html:169 +#: templates/telemeta/collection_detail.html:160 #: templates/telemeta/mediaitem_detail.html:291 #: templates/telemeta/resource_detail.html:75 msgid "Last modification" msgstr "" -#: templates/telemeta/collection_detail.html:183 +#: templates/telemeta/collection_detail.html:174 #: templates/telemeta/mediaitem_detail.html:301 msgid "Technical data" msgstr "" -#: templates/telemeta/collection_detail.html:196 +#: templates/telemeta/collection_detail.html:187 #: templates/telemeta/geo_countries.html:16 msgid "Number of items" msgstr "" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 50de5889..b206c269 100644 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 2ef84be4..655770be 100644 --- 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-10 16:01+0100\n" +"POT-Creation-Date: 2014-11-10 17:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -481,7 +481,7 @@ msgstr "fiches items faites" msgid "recordist identical to depositor" msgstr "collecteur identique au déposant" -#: models/media.py:245 templates/telemeta/collection_detail.html:82 +#: models/media.py:245 templates/telemeta/collection_detail.html:73 msgid "published" msgstr "édité" @@ -654,6 +654,10 @@ msgstr "mots-clés" msgid "instruments" msgstr "instruments" +#: models/media.py:505 +msgid "item size (Mo)" +msgstr "volume de l'item (Mo)" + #: models/media.py:531 models/media.py:532 msgid "item related media" msgstr "média associés à l'item" @@ -930,10 +934,10 @@ 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:231 +#: templates/telemeta/collection_detail.html:222 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:352 +#: templates/telemeta/mediaitem_detail.html:353 #: templates/telemeta/mediaitem_detail_dc.html:20 #: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 @@ -1173,6 +1177,7 @@ msgid "Collections" msgstr "Collections" #: templates/telemeta/base.html:117 templates/telemeta/breadcrumbs.html:7 +#: templates/telemeta/collection_detail.html:62 #: templates/telemeta/inc/breadcrumbs.html:8 #: templates/telemeta/mediaitem_list.html:11 msgid "Items" @@ -1213,7 +1218,7 @@ msgstr "" "communautés d'origine." #: templates/telemeta/base.html:186 -#: templates/telemeta/collection_detail.html:117 +#: templates/telemeta/collection_detail.html:108 msgid "Legal notices" msgstr "Mentions légales" @@ -1295,66 +1300,66 @@ msgstr "Ajouter à la liste" msgid "Download" msgstr "Téléchargement" -#: templates/telemeta/collection_detail.html:68 +#: templates/telemeta/collection_detail.html:63 msgid "View list" msgstr "Voir liste" -#: templates/telemeta/collection_detail.html:78 +#: templates/telemeta/collection_detail.html:69 msgid "Document status" msgstr "Statut du document" -#: templates/telemeta/collection_detail.html:80 +#: templates/telemeta/collection_detail.html:71 msgid "unpublished" msgstr "inédites" -#: templates/telemeta/collection_detail.html:88 +#: templates/telemeta/collection_detail.html:79 #: templates/telemeta/inc/collection_list.html:12 #: templates/telemeta/lists.html:73 msgid "Recording period" msgstr "Période d'enregistrement" -#: templates/telemeta/collection_detail.html:104 +#: templates/telemeta/collection_detail.html:95 #: templates/telemeta/mediaitem_detail.html:214 msgid "Geographic and cultural informations" msgstr "Indications géographiques et culturelles" -#: templates/telemeta/collection_detail.html:122 +#: templates/telemeta/collection_detail.html:113 #: templates/telemeta/inc/collection_list.html:11 #: templates/telemeta/inc/mediaitem_list.html:10 #: templates/telemeta/lists.html:72 msgid "Recordist" msgstr "Collecteur" -#: templates/telemeta/collection_detail.html:137 +#: templates/telemeta/collection_detail.html:128 msgid "Bibliographic references" msgstr "Références bibliographiques" -#: templates/telemeta/collection_detail.html:149 +#: templates/telemeta/collection_detail.html:140 #: templates/telemeta/mediaitem_detail.html:277 msgid "Archiving data" msgstr "Données d'archivage" -#: templates/telemeta/collection_detail.html:157 +#: templates/telemeta/collection_detail.html:148 msgid "Related documentation" msgstr "Documentation associée" -#: templates/telemeta/collection_detail.html:165 -#: templates/telemeta/mediaitem_detail.html:314 +#: templates/telemeta/collection_detail.html:156 +#: templates/telemeta/mediaitem_detail.html:315 msgid "Comments" msgstr "Commentaires" -#: templates/telemeta/collection_detail.html:169 +#: templates/telemeta/collection_detail.html:160 #: 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:183 +#: templates/telemeta/collection_detail.html:174 #: templates/telemeta/mediaitem_detail.html:301 msgid "Technical data" msgstr "Données techniques" -#: templates/telemeta/collection_detail.html:196 +#: templates/telemeta/collection_detail.html:187 #: templates/telemeta/geo_countries.html:16 msgid "Number of items" msgstr "Nombre d'items" diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo index 6e4bdaf2..0bc564e0 100644 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 7a7a64a0..d933ed85 100644 --- 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-10 16:01+0100\n" +"POT-Creation-Date: 2014-11-10 17:21+0100\n" "PO-Revision-Date: 2014-09-02 16:18+2\n" "Last-Translator: Zaichao XIA \n" "Language-Team: zh_CN \n" @@ -495,7 +495,7 @@ msgstr "已完成项" msgid "recordist identical to depositor" msgstr "录音者与寄存者相同" -#: models/media.py:245 templates/telemeta/collection_detail.html:82 +#: models/media.py:245 templates/telemeta/collection_detail.html:73 msgid "published" msgstr "已出版的" @@ -673,6 +673,12 @@ msgstr "关键词" msgid "instruments" msgstr "仪器" +#: models/media.py:505 +#, fuzzy +#| msgid "collections" +msgid "item size (Mo)" +msgstr "选集" + #: models/media.py:531 models/media.py:532 msgid "item related media" msgstr "项相关媒体" @@ -957,10 +963,10 @@ 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:231 +#: templates/telemeta/collection_detail.html:222 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:352 +#: templates/telemeta/mediaitem_detail.html:353 #: templates/telemeta/mediaitem_detail_dc.html:20 #: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 @@ -1202,6 +1208,7 @@ msgid "Collections" msgstr "选集" #: templates/telemeta/base.html:117 templates/telemeta/breadcrumbs.html:7 +#: templates/telemeta/collection_detail.html:62 #: templates/telemeta/inc/breadcrumbs.html:8 #: templates/telemeta/mediaitem_list.html:11 msgid "Items" @@ -1240,7 +1247,7 @@ msgid "" msgstr "档案的使用尊重文化遗产的原始所有者。" #: templates/telemeta/base.html:186 -#: templates/telemeta/collection_detail.html:117 +#: templates/telemeta/collection_detail.html:108 msgid "Legal notices" msgstr "合法通知" @@ -1322,70 +1329,70 @@ msgstr "添加到播放列表" msgid "Download" msgstr "下载" -#: templates/telemeta/collection_detail.html:68 +#: templates/telemeta/collection_detail.html:63 msgid "View list" msgstr "" -#: templates/telemeta/collection_detail.html:78 +#: templates/telemeta/collection_detail.html:69 #, fuzzy #| msgid "Documentation" msgid "Document status" msgstr "文献" -#: templates/telemeta/collection_detail.html:80 +#: templates/telemeta/collection_detail.html:71 #, fuzzy #| msgid "Unpublished" msgid "unpublished" msgstr "未出版的" -#: templates/telemeta/collection_detail.html:88 +#: templates/telemeta/collection_detail.html:79 #: templates/telemeta/inc/collection_list.html:12 #: templates/telemeta/lists.html:73 msgid "Recording period" msgstr "录音时段" -#: templates/telemeta/collection_detail.html:104 +#: templates/telemeta/collection_detail.html:95 #: templates/telemeta/mediaitem_detail.html:214 msgid "Geographic and cultural informations" msgstr "地理和文化信息" -#: templates/telemeta/collection_detail.html:122 +#: templates/telemeta/collection_detail.html:113 #: templates/telemeta/inc/collection_list.html:11 #: templates/telemeta/inc/mediaitem_list.html:10 #: templates/telemeta/lists.html:72 msgid "Recordist" msgstr "录音员" -#: templates/telemeta/collection_detail.html:137 +#: templates/telemeta/collection_detail.html:128 msgid "Bibliographic references" msgstr "参考文献" -#: templates/telemeta/collection_detail.html:149 +#: templates/telemeta/collection_detail.html:140 #: templates/telemeta/mediaitem_detail.html:277 msgid "Archiving data" msgstr "存档数据" -#: templates/telemeta/collection_detail.html:157 +#: templates/telemeta/collection_detail.html:148 msgid "Related documentation" msgstr "相关文献" -#: templates/telemeta/collection_detail.html:165 -#: templates/telemeta/mediaitem_detail.html:314 +#: templates/telemeta/collection_detail.html:156 +#: templates/telemeta/mediaitem_detail.html:315 msgid "Comments" msgstr "注解" -#: templates/telemeta/collection_detail.html:169 +#: templates/telemeta/collection_detail.html:160 #: templates/telemeta/mediaitem_detail.html:291 #: templates/telemeta/resource_detail.html:75 msgid "Last modification" msgstr "上次修改" -#: templates/telemeta/collection_detail.html:183 +#: templates/telemeta/collection_detail.html:174 #: templates/telemeta/mediaitem_detail.html:301 msgid "Technical data" msgstr "专业数据" -#: templates/telemeta/collection_detail.html:196 +#: templates/telemeta/collection_detail.html:187 #: templates/telemeta/geo_countries.html:16 msgid "Number of items" msgstr "项数目" diff --git a/telemeta/models/media.py b/telemeta/models/media.py index b27452b5..ba354308 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -502,7 +502,7 @@ class MediaItem(MediaResource): return self.file.size else: return 0 - + size.verbose_name = _('item size (Mo)') class MediaItemRelated(MediaRelated): "Item related media" diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html index 7aa51681..c84a10b6 100644 --- a/telemeta/templates/telemeta/mediaitem_detail.html +++ b/telemeta/templates/telemeta/mediaitem_detail.html @@ -302,6 +302,7 @@ Item : {{ item }}
{% dl_field item "approx_duration" %} + {% dl_field item "size" %}