From cd9d59fa1ab3acd2df5dbf22699deaaa9acc8100 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 10 Nov 2014 17:26:49 +0100 Subject: [PATCH] update item size --- telemeta/locale/de/LC_MESSAGES/django.mo | Bin 24393 -> 24393 bytes telemeta/locale/de/LC_MESSAGES/django.po | 10 +++++----- telemeta/locale/es/LC_MESSAGES/django.mo | Bin 420 -> 420 bytes telemeta/locale/es/LC_MESSAGES/django.po | 10 +++++----- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 20881 -> 20871 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 12 ++++++------ telemeta/locale/zh_CN/LC_MESSAGES/django.mo | Bin 22918 -> 22918 bytes telemeta/locale/zh_CN/LC_MESSAGES/django.po | 10 +++++----- telemeta/models/media.py | 2 +- .../templates/telemeta/mediaitem_detail.html | 5 ++++- 10 files changed, 26 insertions(+), 23 deletions(-) diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 5717f88fe004ed89896c4de5c2da11182799d7ed..ca655e86977a671f53d9b323f760dd1d2b8fffa9 100644 GIT binary patch delta 16 XcmX@PkMZO_#tnwHjAomSY{iuTJQ4-L delta 16 XcmX@PkMZO_#tnwHjE0+yY{iuTJM;y- 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 00292b79dccc8b017cbf3b5fd2cb3071248059dc..d1ed7d79b7323599070c23474a1f56040014274e 100644 GIT binary patch delta 12 TcmZ3&yo7neG)A+H(|H*I9I^xg delta 12 TcmZ3&yo7neG)BXX(|H*I9GL_C 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 b206c26962c80a5faeee8288545e42487f3a5323..73ebf5815e48d80947336c25e176e3b8466e9e1d 100644 GIT binary patch delta 3923 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\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 0bc564e0c85fae456d1db89bec2f9002b6084132..c36c278b33613b0f6aac9e3dc14fb4f65fb3f4e3 100644 GIT binary patch delta 16 YcmZqM%-FV>al=tNMzhVw><&l)06Z%O@Bjb+ delta 16 YcmZqM%-FV>al=tNM#Ig=><&l)06Yx_>i_@% 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 %}