From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 10 Nov 2014 16:31:47 +0000 (+0100)
Subject: fix collection size
X-Git-Tag: 1.5.0rc1~27^2~56
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=058baf3c8d177c61d5d8287911210065d7419eba;p=telemeta.git

fix collection size
---

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index ca655e86..46af0501 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 944ed4a5..bbd0b0c9 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:26+0100\n"
+"POT-Creation-Date: 2014-11-10 17:31+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"
@@ -535,7 +535,7 @@ msgstr "berechnete Dauer"
 #: models/media.py:320
 #, fuzzy
 #| msgid "collections"
-msgid "collection size (Mo)"
+msgid "collection size"
 msgstr "Sammlungen"
 
 #: models/media.py:328 models/media.py:334 models/media.py:351
@@ -673,7 +673,7 @@ msgstr "Schlüsselwörter"
 msgid "instruments"
 msgstr "Instrumente"
 
-#: models/media.py:505 templates/telemeta/mediaitem_detail.html:305
+#: models/media.py:505
 #, fuzzy
 #| msgid "collections"
 msgid "item size"
@@ -965,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:222
+#: templates/telemeta/collection_detail.html:224
 #: templates/telemeta/collection_detail_dc.html:25
 #: templates/telemeta/lists.html:58
-#: templates/telemeta/mediaitem_detail.html:354
+#: templates/telemeta/mediaitem_detail.html:356
 #: 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:316
+#: templates/telemeta/mediaitem_detail.html:318
 msgid "Comments"
 msgstr "Kommentare"
 
@@ -1402,7 +1402,13 @@ msgstr "Letzte Änderung"
 msgid "Technical data"
 msgstr "technische Daten"
 
-#: templates/telemeta/collection_detail.html:187
+#: templates/telemeta/collection_detail.html:184
+#, fuzzy
+#| msgid "Collections"
+msgid "Collection size"
+msgstr "Sammlungen"
+
+#: templates/telemeta/collection_detail.html:188
 #: templates/telemeta/geo_countries.html:16
 msgid "Number of items"
 msgstr "Anzahl Elemente"
@@ -1841,6 +1847,12 @@ msgstr "publizierte Referenzen"
 msgid "Remarks"
 msgstr "Bemerkungen"
 
+#: templates/telemeta/mediaitem_detail.html:306
+#, fuzzy
+#| msgid "collections"
+msgid "Item size"
+msgstr "Sammlungen"
+
 #: templates/telemeta/mediaitem_detail_dc.html:13
 msgid "No such item"
 msgstr "kein solches Element"
diff --git a/telemeta/locale/es/LC_MESSAGES/django.mo b/telemeta/locale/es/LC_MESSAGES/django.mo
index d1ed7d79..bd47f2f7 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 60e0946c..a626e332 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:26+0100\n"
+"POT-Creation-Date: 2014-11-10 17:31+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"
@@ -519,7 +519,7 @@ msgid "computed duration"
 msgstr ""
 
 #: models/media.py:320
-msgid "collection size (Mo)"
+msgid "collection size"
 msgstr ""
 
 #: models/media.py:328 models/media.py:334 models/media.py:351
@@ -655,7 +655,7 @@ msgstr ""
 msgid "instruments"
 msgstr ""
 
-#: models/media.py:505 templates/telemeta/mediaitem_detail.html:305
+#: models/media.py:505
 msgid "item size"
 msgstr ""
 
@@ -934,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:222
+#: templates/telemeta/collection_detail.html:224
 #: templates/telemeta/collection_detail_dc.html:25
 #: templates/telemeta/lists.html:58
-#: templates/telemeta/mediaitem_detail.html:354
+#: templates/telemeta/mediaitem_detail.html:356
 #: 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:316
+#: templates/telemeta/mediaitem_detail.html:318
 msgid "Comments"
 msgstr ""
 
@@ -1357,7 +1357,11 @@ msgstr ""
 msgid "Technical data"
 msgstr ""
 
-#: templates/telemeta/collection_detail.html:187
+#: templates/telemeta/collection_detail.html:184
+msgid "Collection size"
+msgstr ""
+
+#: templates/telemeta/collection_detail.html:188
 #: templates/telemeta/geo_countries.html:16
 msgid "Number of items"
 msgstr ""
@@ -1783,6 +1787,10 @@ msgstr ""
 msgid "Remarks"
 msgstr ""
 
+#: templates/telemeta/mediaitem_detail.html:306
+msgid "Item size"
+msgstr ""
+
 #: templates/telemeta/mediaitem_detail_dc.html:13
 msgid "No such item"
 msgstr ""
diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index 73ebf581..5b5ece83 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 62106325..e7307d04 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:26+0100\n"
+"POT-Creation-Date: 2014-11-10 17:31+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"
@@ -518,7 +518,9 @@ msgid "computed duration"
 msgstr "durée calculée"
 
 #: models/media.py:320
-msgid "collection size (Mo)"
+#, fuzzy
+#| msgid "collection size (Mo)"
+msgid "collection size"
 msgstr "volume de la collection (Mo)"
 
 #: models/media.py:328 models/media.py:334 models/media.py:351
@@ -654,7 +656,7 @@ msgstr "mots-clés"
 msgid "instruments"
 msgstr "instruments"
 
-#: models/media.py:505 templates/telemeta/mediaitem_detail.html:305
+#: models/media.py:505
 msgid "item size"
 msgstr "taille de l'item"
 
@@ -934,10 +936,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:222
+#: templates/telemeta/collection_detail.html:224
 #: templates/telemeta/collection_detail_dc.html:25
 #: templates/telemeta/lists.html:58
-#: templates/telemeta/mediaitem_detail.html:354
+#: templates/telemeta/mediaitem_detail.html:356
 #: templates/telemeta/mediaitem_detail_dc.html:20
 #: templates/telemeta/resource_detail.html:105
 #: templates/telemeta/resource_detail_dc.html:17
@@ -1344,7 +1346,7 @@ msgid "Related documentation"
 msgstr "Documentation associée"
 
 #: templates/telemeta/collection_detail.html:156
-#: templates/telemeta/mediaitem_detail.html:316
+#: templates/telemeta/mediaitem_detail.html:318
 msgid "Comments"
 msgstr "Commentaires"
 
@@ -1359,7 +1361,11 @@ msgstr "Dernière modification de la fiche"
 msgid "Technical data"
 msgstr "Données techniques"
 
-#: templates/telemeta/collection_detail.html:187
+#: templates/telemeta/collection_detail.html:184
+msgid "Collection size"
+msgstr "Volume de la collection"
+
+#: templates/telemeta/collection_detail.html:188
 #: templates/telemeta/geo_countries.html:16
 msgid "Number of items"
 msgstr "Nombre d'items"
@@ -1788,6 +1794,12 @@ msgstr "Références éditées"
 msgid "Remarks"
 msgstr "Remarques"
 
+#: templates/telemeta/mediaitem_detail.html:306
+#, fuzzy
+#| msgid "item size"
+msgid "Item size"
+msgstr "taille de l'item"
+
 #: templates/telemeta/mediaitem_detail_dc.html:13
 msgid "No such item"
 msgstr "Item introuvable"
diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo
index c36c278b..2ef30aa1 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 ec2b77f6..91ba1b28 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:26+0100\n"
+"POT-Creation-Date: 2014-11-10 17:31+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"
@@ -536,7 +536,7 @@ msgstr "计算估计时长"
 #: models/media.py:320
 #, fuzzy
 #| msgid "collections"
-msgid "collection size (Mo)"
+msgid "collection size"
 msgstr "选集"
 
 #: models/media.py:328 models/media.py:334 models/media.py:351
@@ -673,7 +673,7 @@ msgstr "关键词"
 msgid "instruments"
 msgstr "仪器"
 
-#: models/media.py:505 templates/telemeta/mediaitem_detail.html:305
+#: models/media.py:505
 #, fuzzy
 #| msgid "collections"
 msgid "item size"
@@ -963,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:222
+#: templates/telemeta/collection_detail.html:224
 #: templates/telemeta/collection_detail_dc.html:25
 #: templates/telemeta/lists.html:58
-#: templates/telemeta/mediaitem_detail.html:354
+#: templates/telemeta/mediaitem_detail.html:356
 #: 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:316
+#: templates/telemeta/mediaitem_detail.html:318
 msgid "Comments"
 msgstr "注解"
 
@@ -1392,7 +1392,13 @@ msgstr "上次修改"
 msgid "Technical data"
 msgstr "专业数据"
 
-#: templates/telemeta/collection_detail.html:187
+#: templates/telemeta/collection_detail.html:184
+#, fuzzy
+#| msgid "Collections"
+msgid "Collection size"
+msgstr "选集"
+
+#: templates/telemeta/collection_detail.html:188
 #: templates/telemeta/geo_countries.html:16
 msgid "Number of items"
 msgstr "项数目"
@@ -1819,6 +1825,12 @@ msgstr "已出版参考资料"
 msgid "Remarks"
 msgstr "评论"
 
+#: templates/telemeta/mediaitem_detail.html:306
+#, fuzzy
+#| msgid "collections"
+msgid "Item size"
+msgstr "选集"
+
 #: templates/telemeta/mediaitem_detail_dc.html:13
 msgid "No such item"
 msgstr "无该项"
diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 81504ebc..9bb25b74 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -312,12 +312,12 @@ class MediaCollection(MediaResource):
     computed_duration.verbose_name = _('computed duration')
 
     def computed_size(self):
-        "Return the total size of a collection in Mo"
+        "Return the total size of a collection"
         size = 0
         for item in self.items.all():
             size += item.size()
-        return round(size/1024**2,2)
-    computed_size.verbose_name = _('collection size (Mo)')
+        return size
+    computed_size.verbose_name = _('collection size')
 
     def save(self, force_insert=False, force_update=False, user=None, code=None):
         super(MediaCollection, self).save(force_insert, force_update)
diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index d052ca3a..583aea8d 100644
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -181,10 +181,12 @@
                         {% dl_field collection "approx_duration" %}
                         {% endif %}
                         {% dl_field collection "computed_duration" %}
-                        {% dl_field collection "computed_size" %}
+                        <dt>{% trans "Collection size" %}</dt>
+                            <dd>{{ collection.computed_size|filesizeformat }}</dd>
                         {% dl_field collection "physical_items_num" %}
                         <div class="wazing"></div>
-                        <dt>{% trans "Number of items" %}</dt><dd>{{ collection.items.count }}</dd>
+                        <dt>{% trans "Number of items" %}</dt>
+                            <dd>{{ collection.items.count }}</dd>
                         {% if collection.physical_format %}
                         {% dl_field collection "physical_format" %}
                         {% endif %}
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 4c94f121..716661c7 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -303,7 +303,7 @@ Item : <a href="{% url "telemeta-item-detail" item.public_id %}">{{ item }}</a>
                 <dl class="listing">
                     {% dl_field item "approx_duration" %}
                     {% if item.size %}
-                    <dt>{% trans "item size" %}</dt>
+                    <dt>{% trans "Item size" %}</dt>
                      <dd>{{ item.size|filesizeformat }}</dd>
                     {% endif %}
                     <!-- {% if format %}