From: Guillaume Pellerin Date: Mon, 10 Nov 2014 16:26:49 +0000 (+0100) Subject: update item size X-Git-Tag: 1.5.0rc1~27^2~57 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cd9d59fa1ab3acd2df5dbf22699deaaa9acc8100;p=telemeta.git update item size --- diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 5717f88f..ca655e86 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 810064ee..944ed4a5 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 17:21+0100\n" +"POT-Creation-Date: 2014-11-10 17:26+0100\n" "PO-Revision-Date: 2012-12-22 21:24+0100\n" "Last-Translator: Patrik Tschudin \n" "Language-Team: LANGUAGE \n" @@ -673,10 +673,10 @@ msgstr "Schlüsselwörter" msgid "instruments" msgstr "Instrumente" -#: models/media.py:505 +#: models/media.py:505 templates/telemeta/mediaitem_detail.html:305 #, fuzzy #| msgid "collections" -msgid "item size (Mo)" +msgid "item size" msgstr "Sammlungen" #: models/media.py:531 models/media.py:532 @@ -968,7 +968,7 @@ msgstr "g:i A,M j,n/j/y" #: templates/telemeta/collection_detail.html:222 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:353 +#: templates/telemeta/mediaitem_detail.html:354 #: templates/telemeta/mediaitem_detail_dc.html:20 #: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 @@ -1387,7 +1387,7 @@ msgid "Related documentation" msgstr "damit zusammenhängende Dokumentation" #: templates/telemeta/collection_detail.html:156 -#: templates/telemeta/mediaitem_detail.html:315 +#: templates/telemeta/mediaitem_detail.html:316 msgid "Comments" msgstr "Kommentare" diff --git a/telemeta/locale/es/LC_MESSAGES/django.mo b/telemeta/locale/es/LC_MESSAGES/django.mo index 00292b79..d1ed7d79 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 41dad840..60e0946c 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 17:21+0100\n" +"POT-Creation-Date: 2014-11-10 17:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -655,8 +655,8 @@ msgstr "" msgid "instruments" msgstr "" -#: models/media.py:505 -msgid "item size (Mo)" +#: models/media.py:505 templates/telemeta/mediaitem_detail.html:305 +msgid "item size" msgstr "" #: models/media.py:531 models/media.py:532 @@ -937,7 +937,7 @@ msgstr "" #: templates/telemeta/collection_detail.html:222 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:353 +#: templates/telemeta/mediaitem_detail.html:354 #: templates/telemeta/mediaitem_detail_dc.html:20 #: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 @@ -1342,7 +1342,7 @@ msgid "Related documentation" msgstr "" #: templates/telemeta/collection_detail.html:156 -#: templates/telemeta/mediaitem_detail.html:315 +#: templates/telemeta/mediaitem_detail.html:316 msgid "Comments" msgstr "" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index b206c269..73ebf581 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 655770be..62106325 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 17:21+0100\n" +"POT-Creation-Date: 2014-11-10 17:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -654,9 +654,9 @@ 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:505 templates/telemeta/mediaitem_detail.html:305 +msgid "item size" +msgstr "taille de l'item" #: models/media.py:531 models/media.py:532 msgid "item related media" @@ -937,7 +937,7 @@ msgstr "" #: templates/telemeta/collection_detail.html:222 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:353 +#: templates/telemeta/mediaitem_detail.html:354 #: templates/telemeta/mediaitem_detail_dc.html:20 #: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 @@ -1344,7 +1344,7 @@ msgid "Related documentation" msgstr "Documentation associée" #: templates/telemeta/collection_detail.html:156 -#: templates/telemeta/mediaitem_detail.html:315 +#: templates/telemeta/mediaitem_detail.html:316 msgid "Comments" msgstr "Commentaires" diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo index 0bc564e0..c36c278b 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 d933ed85..ec2b77f6 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 17:21+0100\n" +"POT-Creation-Date: 2014-11-10 17:26+0100\n" "PO-Revision-Date: 2014-09-02 16:18+2\n" "Last-Translator: Zaichao XIA \n" "Language-Team: zh_CN \n" @@ -673,10 +673,10 @@ msgstr "关键词" msgid "instruments" msgstr "仪器" -#: models/media.py:505 +#: models/media.py:505 templates/telemeta/mediaitem_detail.html:305 #, fuzzy #| msgid "collections" -msgid "item size (Mo)" +msgid "item size" msgstr "选集" #: models/media.py:531 models/media.py:532 @@ -966,7 +966,7 @@ msgstr "" #: templates/telemeta/collection_detail.html:222 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:353 +#: templates/telemeta/mediaitem_detail.html:354 #: templates/telemeta/mediaitem_detail_dc.html:20 #: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 @@ -1377,7 +1377,7 @@ msgid "Related documentation" msgstr "相关文献" #: templates/telemeta/collection_detail.html:156 -#: templates/telemeta/mediaitem_detail.html:315 +#: templates/telemeta/mediaitem_detail.html:316 msgid "Comments" msgstr "注解" diff --git a/telemeta/models/media.py b/telemeta/models/media.py index ba354308..81504ebc 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)') + size.verbose_name = _('item size') class MediaItemRelated(MediaRelated): "Item related media" diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html index c84a10b6..4c94f121 100644 --- a/telemeta/templates/telemeta/mediaitem_detail.html +++ b/telemeta/templates/telemeta/mediaitem_detail.html @@ -302,7 +302,10 @@ Item : {{ item }}
{% dl_field item "approx_duration" %} - {% dl_field item "size" %} + {% if item.size %} +
{% trans "item size" %}
+
{{ item.size|filesizeformat }}
+ {% endif %}