From 0d6c6fbfdc97242e54dccae5446977432f1eaf61 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 13 Nov 2014 11:36:17 +0100 Subject: [PATCH] modify list orders, add a loudspeaker icon for digitized resources --- telemeta/locale/de/LC_MESSAGES/django.mo | Bin 24241 -> 24241 bytes telemeta/locale/de/LC_MESSAGES/django.po | 39 ++++++++++-------- telemeta/locale/es/LC_MESSAGES/django.mo | Bin 420 -> 420 bytes telemeta/locale/es/LC_MESSAGES/django.po | 35 +++++++++------- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 20903 -> 20964 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 39 ++++++++++-------- telemeta/locale/zh_CN/LC_MESSAGES/django.mo | Bin 22785 -> 22785 bytes telemeta/locale/zh_CN/LC_MESSAGES/django.po | 39 ++++++++++-------- .../templates/telemeta/collection_list.html | 2 +- telemeta/templates/telemeta/home.html | 2 + .../templates/telemeta/inc/children_list.html | 8 ++-- .../telemeta/inc/collection_list.html | 13 +++--- .../telemeta/inc/mediaitem_list.html | 19 +++++---- .../templates/telemeta/inc/resource_list.html | 10 +++-- .../templates/telemeta/mediaitem_list.html | 2 +- 15 files changed, 113 insertions(+), 95 deletions(-) diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 74af69d37ddcdf7a7eab2898485a400a1ccf42c4..9e089eb42dd46e8f29f6059c6cf5e5ef86bddccc 100644 GIT binary patch delta 17 ZcmdnEmvQ4>#to}&n2b#}ueD)O0suuE2B81| delta 17 ZcmdnEmvQ4>#to}&m<&xfueD)O0suu62A}`{ diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po index 4b23a63e..ebcdf115 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-13 11:15+0100\n" +"POT-Creation-Date: 2014-11-13 11:34+0100\n" "PO-Revision-Date: 2012-12-22 21:24+0100\n" "Last-Translator: Patrik Tschudin \n" "Language-Team: LANGUAGE \n" @@ -866,10 +866,10 @@ msgstr "Ablaufdatum" msgid "key" msgstr "Schlüssel" -#: models/system.py:117 templates/telemeta/inc/children_list.html:16 +#: models/system.py:117 templates/telemeta/inc/children_list.html:17 #: templates/telemeta/inc/collection_related.html:39 #: templates/telemeta/inc/mediaitem_related.html:39 -#: templates/telemeta/inc/resource_list.html:9 +#: templates/telemeta/inc/resource_list.html:10 #: templates/telemeta/inc/resource_related.html:39 msgid "Description" msgstr "Beschreibung" @@ -1605,7 +1605,7 @@ msgid_plural "%(counter)s items " msgstr[0] "1 Element" msgstr[1] "%(counter)s Elemente" -#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:65 +#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:67 msgid "Musical selection" msgstr "Musikauswahl" @@ -1613,7 +1613,7 @@ msgstr "Musikauswahl" msgid "Open the geographic navigator" msgstr "GeoNavigation öffnen" -#: templates/telemeta/home.html:39 +#: templates/telemeta/home.html:41 msgid "Partners" msgstr "Partners" @@ -1626,30 +1626,27 @@ msgstr "" "%(resource.children_type|capitalize)s %(first_on_page)s bis %(last_on_page)s " "von %(hits)s" -#: templates/telemeta/inc/children_list.html:17 +#: templates/telemeta/inc/children_list.html:16 #: templates/telemeta/inc/collection_list.html:9 #: templates/telemeta/inc/mediaitem_list.html:9 -#: templates/telemeta/inc/resource_list.html:10 -#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40 -msgid "Code" -msgstr "Code" +#: templates/telemeta/inc/resource_list.html:9 +msgid "Digitized" +msgstr "" #: templates/telemeta/inc/children_list.html:18 #: templates/telemeta/inc/collection_list.html:13 #: templates/telemeta/inc/mediaitem_list.html:17 #: templates/telemeta/inc/resource_list.html:11 -#: templates/telemeta/lists.html:74 -#: templates/telemeta/search_criteria.html:143 -#: templates/telemeta/search_results.html:70 -msgid "Sound" -msgstr "Ton" +#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40 +msgid "Code" +msgstr "Code" #: templates/telemeta/inc/children_list.html:39 -#: templates/telemeta/inc/resource_list.html:29 +#: templates/telemeta/inc/resource_list.html:31 msgid "No resource" msgstr "keine Ressource" -#: templates/telemeta/inc/collection_list.html:42 +#: templates/telemeta/inc/collection_list.html:43 msgid "No collection" msgstr "keine Sammlung" @@ -1684,7 +1681,7 @@ msgstr "Land / Kontinent" msgid "Year of recording" msgstr "Aufnahmejahr" -#: templates/telemeta/inc/mediaitem_list.html:52 +#: templates/telemeta/inc/mediaitem_list.html:53 msgid "No item" msgstr "kein Element" @@ -1743,6 +1740,12 @@ msgstr "Diese Instrumentenliste ist leer" msgid "My playlists" msgstr "Meine Wiedergabeliste" +#: templates/telemeta/lists.html:74 +#: templates/telemeta/search_criteria.html:143 +#: templates/telemeta/search_results.html:70 +msgid "Sound" +msgstr "Ton" + #: templates/telemeta/login.html:21 msgid "User authentication" msgstr "Authentifizierung" diff --git a/telemeta/locale/es/LC_MESSAGES/django.mo b/telemeta/locale/es/LC_MESSAGES/django.mo index f5d241fb2047d14ecee7629ee86928a9bd3d4bdb..e868184974a0ae8b43be59b60a167ef196556345 100644 GIT binary patch delta 13 UcmZ3&yo7neR3>ASjnjD<0U%EVGXMYp delta 13 UcmZ3&yo7neR3<~yjnjD<0U$^OG5`Po diff --git a/telemeta/locale/es/LC_MESSAGES/django.po b/telemeta/locale/es/LC_MESSAGES/django.po index fdcd1a54..e97b55ff 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-13 11:15+0100\n" +"POT-Creation-Date: 2014-11-13 11:34+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -836,10 +836,10 @@ msgstr "" msgid "key" msgstr "" -#: models/system.py:117 templates/telemeta/inc/children_list.html:16 +#: models/system.py:117 templates/telemeta/inc/children_list.html:17 #: templates/telemeta/inc/collection_related.html:39 #: templates/telemeta/inc/mediaitem_related.html:39 -#: templates/telemeta/inc/resource_list.html:9 +#: templates/telemeta/inc/resource_list.html:10 #: templates/telemeta/inc/resource_related.html:39 msgid "Description" msgstr "" @@ -1554,7 +1554,7 @@ msgid_plural "%(counter)s items " msgstr[0] "" msgstr[1] "" -#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:65 +#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:67 msgid "Musical selection" msgstr "" @@ -1562,7 +1562,7 @@ msgstr "" msgid "Open the geographic navigator" msgstr "" -#: templates/telemeta/home.html:39 +#: templates/telemeta/home.html:41 msgid "Partners" msgstr "" @@ -1573,30 +1573,27 @@ msgid "" "on %(hits)s" msgstr "" -#: templates/telemeta/inc/children_list.html:17 +#: templates/telemeta/inc/children_list.html:16 #: templates/telemeta/inc/collection_list.html:9 #: templates/telemeta/inc/mediaitem_list.html:9 -#: templates/telemeta/inc/resource_list.html:10 -#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40 -msgid "Code" +#: templates/telemeta/inc/resource_list.html:9 +msgid "Digitized" msgstr "" #: templates/telemeta/inc/children_list.html:18 #: templates/telemeta/inc/collection_list.html:13 #: templates/telemeta/inc/mediaitem_list.html:17 #: templates/telemeta/inc/resource_list.html:11 -#: templates/telemeta/lists.html:74 -#: templates/telemeta/search_criteria.html:143 -#: templates/telemeta/search_results.html:70 -msgid "Sound" +#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40 +msgid "Code" msgstr "" #: templates/telemeta/inc/children_list.html:39 -#: templates/telemeta/inc/resource_list.html:29 +#: templates/telemeta/inc/resource_list.html:31 msgid "No resource" msgstr "" -#: templates/telemeta/inc/collection_list.html:42 +#: templates/telemeta/inc/collection_list.html:43 msgid "No collection" msgstr "" @@ -1631,7 +1628,7 @@ msgstr "" msgid "Year of recording" msgstr "" -#: templates/telemeta/inc/mediaitem_list.html:52 +#: templates/telemeta/inc/mediaitem_list.html:53 msgid "No item" msgstr "" @@ -1690,6 +1687,12 @@ msgstr "" msgid "My playlists" msgstr "" +#: templates/telemeta/lists.html:74 +#: templates/telemeta/search_criteria.html:143 +#: templates/telemeta/search_results.html:70 +msgid "Sound" +msgstr "" + #: templates/telemeta/login.html:21 msgid "User authentication" msgstr "" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 40f5ef0833a6bf5e9cad10dd2a7f772c14a60566..bffbe31048ba62161b4ec84aebc808513844f9f0 100644 GIT binary patch delta 8196 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\n" "Language-Team: LANGUAGE \n" @@ -835,10 +835,10 @@ msgstr "Date d'expiration" msgid "key" msgstr "clé" -#: models/system.py:117 templates/telemeta/inc/children_list.html:16 +#: models/system.py:117 templates/telemeta/inc/children_list.html:17 #: templates/telemeta/inc/collection_related.html:39 #: templates/telemeta/inc/mediaitem_related.html:39 -#: templates/telemeta/inc/resource_list.html:9 +#: templates/telemeta/inc/resource_list.html:10 #: templates/telemeta/inc/resource_related.html:39 msgid "Description" msgstr "Description" @@ -1556,7 +1556,7 @@ msgid_plural "%(counter)s items " msgstr[0] "1 item" msgstr[1] "%(counter)s items " -#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:65 +#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:67 msgid "Musical selection" msgstr "Sélection musicale" @@ -1564,7 +1564,7 @@ msgstr "Sélection musicale" msgid "Open the geographic navigator" msgstr "Accéder au navigateur géographique" -#: templates/telemeta/home.html:39 +#: templates/telemeta/home.html:41 msgid "Partners" msgstr "Partenaires" @@ -1577,30 +1577,27 @@ msgstr "" "%(resource.children_type|capitalize)s %(first_on_page)s à %(last_on_page)s " "sur %(hits)s" -#: templates/telemeta/inc/children_list.html:17 +#: templates/telemeta/inc/children_list.html:16 #: templates/telemeta/inc/collection_list.html:9 #: templates/telemeta/inc/mediaitem_list.html:9 -#: templates/telemeta/inc/resource_list.html:10 -#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40 -msgid "Code" -msgstr "Cote" +#: templates/telemeta/inc/resource_list.html:9 +msgid "Digitized" +msgstr "Numérisé" #: templates/telemeta/inc/children_list.html:18 #: templates/telemeta/inc/collection_list.html:13 #: templates/telemeta/inc/mediaitem_list.html:17 #: templates/telemeta/inc/resource_list.html:11 -#: templates/telemeta/lists.html:74 -#: templates/telemeta/search_criteria.html:143 -#: templates/telemeta/search_results.html:70 -msgid "Sound" -msgstr "Sonore" +#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40 +msgid "Code" +msgstr "Cote" #: templates/telemeta/inc/children_list.html:39 -#: templates/telemeta/inc/resource_list.html:29 +#: templates/telemeta/inc/resource_list.html:31 msgid "No resource" msgstr "Aucune ressource" -#: templates/telemeta/inc/collection_list.html:42 +#: templates/telemeta/inc/collection_list.html:43 msgid "No collection" msgstr "Aucune collection" @@ -1635,7 +1632,7 @@ msgstr "Etat/Continent" msgid "Year of recording" msgstr "Année d'enregistrement" -#: templates/telemeta/inc/mediaitem_list.html:52 +#: templates/telemeta/inc/mediaitem_list.html:53 msgid "No item" msgstr "Aucun item" @@ -1694,6 +1691,12 @@ msgstr "Cette énumération est vide" msgid "My playlists" msgstr "Mes listes de lecture" +#: templates/telemeta/lists.html:74 +#: templates/telemeta/search_criteria.html:143 +#: templates/telemeta/search_results.html:70 +msgid "Sound" +msgstr "Sonore" + #: templates/telemeta/login.html:21 msgid "User authentication" msgstr "Identification" diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo index 0d8e6ea478e1f63ca2bb3e9c6b59b1ed79934d9e..6e14356464d8ffd7abf005130763a00cbc84eb6f 100644 GIT binary patch delta 17 YcmZqN#MroraYK|Hld;L>7`vrX06OsoCIA2c delta 17 YcmZqN#MroraYK|HlcDM67`vrX06OUgB>(^b diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.po b/telemeta/locale/zh_CN/LC_MESSAGES/django.po index a97db344..c2c103a5 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-13 11:15+0100\n" +"POT-Creation-Date: 2014-11-13 11:34+0100\n" "PO-Revision-Date: 2014-09-02 16:18+2\n" "Last-Translator: Zaichao XIA \n" "Language-Team: zh_CN \n" @@ -866,10 +866,10 @@ msgstr "过期日期" msgid "key" msgstr "键" -#: models/system.py:117 templates/telemeta/inc/children_list.html:16 +#: models/system.py:117 templates/telemeta/inc/children_list.html:17 #: templates/telemeta/inc/collection_related.html:39 #: templates/telemeta/inc/mediaitem_related.html:39 -#: templates/telemeta/inc/resource_list.html:9 +#: templates/telemeta/inc/resource_list.html:10 #: templates/telemeta/inc/resource_related.html:39 msgid "Description" msgstr "描述" @@ -1594,7 +1594,7 @@ msgid_plural "%(counter)s items " msgstr[0] "" msgstr[1] "" -#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:65 +#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:67 msgid "Musical selection" msgstr "音乐选择" @@ -1602,7 +1602,7 @@ msgstr "音乐选择" msgid "Open the geographic navigator" msgstr "打开地图导航" -#: templates/telemeta/home.html:39 +#: templates/telemeta/home.html:41 msgid "Partners" msgstr "合作伙伴" @@ -1613,30 +1613,27 @@ msgid "" "on %(hits)s" msgstr "" -#: templates/telemeta/inc/children_list.html:17 +#: templates/telemeta/inc/children_list.html:16 #: templates/telemeta/inc/collection_list.html:9 #: templates/telemeta/inc/mediaitem_list.html:9 -#: templates/telemeta/inc/resource_list.html:10 -#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40 -msgid "Code" -msgstr "密码" +#: templates/telemeta/inc/resource_list.html:9 +msgid "Digitized" +msgstr "" #: templates/telemeta/inc/children_list.html:18 #: templates/telemeta/inc/collection_list.html:13 #: templates/telemeta/inc/mediaitem_list.html:17 #: templates/telemeta/inc/resource_list.html:11 -#: templates/telemeta/lists.html:74 -#: templates/telemeta/search_criteria.html:143 -#: templates/telemeta/search_results.html:70 -msgid "Sound" -msgstr "声音" +#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40 +msgid "Code" +msgstr "密码" #: templates/telemeta/inc/children_list.html:39 -#: templates/telemeta/inc/resource_list.html:29 +#: templates/telemeta/inc/resource_list.html:31 msgid "No resource" msgstr "无资源" -#: templates/telemeta/inc/collection_list.html:42 +#: templates/telemeta/inc/collection_list.html:43 msgid "No collection" msgstr "无选集" @@ -1671,7 +1668,7 @@ msgstr "国家/洲" msgid "Year of recording" msgstr "录音年份" -#: templates/telemeta/inc/mediaitem_list.html:52 +#: templates/telemeta/inc/mediaitem_list.html:53 msgid "No item" msgstr "无项目" @@ -1730,6 +1727,12 @@ msgstr "该仪器列表为空" msgid "My playlists" msgstr "我的播放列表" +#: templates/telemeta/lists.html:74 +#: templates/telemeta/search_criteria.html:143 +#: templates/telemeta/search_results.html:70 +msgid "Sound" +msgstr "声音" + #: templates/telemeta/login.html:21 msgid "User authentication" msgstr "用户认证" diff --git a/telemeta/templates/telemeta/collection_list.html b/telemeta/templates/telemeta/collection_list.html index 6235f5ea..72c3465c 100644 --- a/telemeta/templates/telemeta/collection_list.html +++ b/telemeta/templates/telemeta/collection_list.html @@ -28,7 +28,7 @@
  • {% trans "All" %}
  • {% trans "Unpublished" %}
  • {% trans "Published" %}
  • -
  • {% trans "Sounds" %}
  • +
  • {% trans "Digitized" %}
  • diff --git a/telemeta/templates/telemeta/home.html b/telemeta/templates/telemeta/home.html index 47700d09..9c068428 100644 --- a/telemeta/templates/telemeta/home.html +++ b/telemeta/templates/telemeta/home.html @@ -29,9 +29,11 @@ + {{ block.super }}
    diff --git a/telemeta/templates/telemeta/inc/children_list.html b/telemeta/templates/telemeta/inc/children_list.html index 17fe187e..b356f60d 100644 --- a/telemeta/templates/telemeta/inc/children_list.html +++ b/telemeta/templates/telemeta/inc/children_list.html @@ -13,9 +13,9 @@ + - {% for child in children %} {% if child.code %} @@ -23,13 +23,13 @@ - - + + {% endif %} {% endfor %} diff --git a/telemeta/templates/telemeta/inc/collection_list.html b/telemeta/templates/telemeta/inc/collection_list.html index d215e818..da275b01 100644 --- a/telemeta/templates/telemeta/inc/collection_list.html +++ b/telemeta/templates/telemeta/inc/collection_list.html @@ -6,11 +6,11 @@
    {% trans "Title" %}{% trans "Digitized" %} {% trans "Description" %} {% trans "Code" %}{% trans "Sound" %}
    {{ child.title }} {{ child.descriptions }}{{ child.code }} {% if child.has_mediafile %} - yes +
    {% endif %}
    {{ child.descriptions }}{{ child.code }}
    - + - + {% for collection in collections %} @@ -18,8 +18,11 @@ {{ collection.title }} + {% endfor %} diff --git a/telemeta/templates/telemeta/inc/mediaitem_list.html b/telemeta/templates/telemeta/inc/mediaitem_list.html index bcd53d3c..e958b4b0 100644 --- a/telemeta/templates/telemeta/inc/mediaitem_list.html +++ b/telemeta/templates/telemeta/inc/mediaitem_list.html @@ -6,7 +6,7 @@
    {% trans "Title" %}{% trans "Code" %}{% trans "Digitized" %} {% field_label "MediaCollection" "creator" %} {% trans "Recordist" %} {% trans "Recording period" %}{% trans "Sound" %}{% trans "Code" %}
    - {{ collection.code|default:collection.old_code }} + {% if collection.has_mediafile %} +
    + {% endif %}
    {{ collection.creator }} {{ collection.apparent_collector }} @@ -31,9 +34,7 @@ {% endif %} - {% if collection.has_mediafile %} - yes - {% endif %} + {{ collection.code|default:collection.old_code }}
    - + {% if location_name %} @@ -14,16 +14,20 @@ {% endif %} - + {% for item in items %} - + {% if location_name %} @@ -38,11 +42,8 @@ {% endif %} {% endif %} - {% endfor %} diff --git a/telemeta/templates/telemeta/inc/resource_list.html b/telemeta/templates/telemeta/inc/resource_list.html index 3dcec5a4..683b63ac 100644 --- a/telemeta/templates/telemeta/inc/resource_list.html +++ b/telemeta/templates/telemeta/inc/resource_list.html @@ -6,21 +6,23 @@
    {% trans "Title" %}{% trans "Code" %}{% trans "Digitized" %} {% trans "Recordist" %}{% trans "Location" %}{% trans "Country/Continent" %}{% trans "Year of recording" %}{% trans "Sound" %}{% trans "Code" %}
    {{ item }} - {{ item.code|default:item.old_code }} + + {% if item.file %} + +
    + {% endif %}
    {{ item.collector }}{{ item.location.name }} - {% if item.file %} - - yes - {% endif %} + + {{ item.code|default:item.old_code }}
    + - + {% for resource in object_list %} - - + + + {% endfor %}
    {% trans "Title" %}{% trans "Digitized" %} {% trans "Description" %} {% trans "Code" %}{% trans "Sound" %}
    {{ resource.title }} {{ resource.descriptions }}{{ resource.code }} {% if resource.has_mediafile %} - yes +
    {% endif %}
    {{ resource.descriptions }}{{ resource.code }}
    diff --git a/telemeta/templates/telemeta/mediaitem_list.html b/telemeta/templates/telemeta/mediaitem_list.html index 69016b79..15c23435 100644 --- a/telemeta/templates/telemeta/mediaitem_list.html +++ b/telemeta/templates/telemeta/mediaitem_list.html @@ -27,7 +27,7 @@
  • {% trans "All" %}
  • {% trans "Unpublished" %}
  • {% trans "Published" %}
  • -
  • {% trans "Sounds" %}
  • +
  • {% trans "Digitized" %}
  • -- 2.39.5