From: Guillaume Pellerin Date: Thu, 13 Nov 2014 10:36:17 +0000 (+0100) Subject: modify list orders, add a loudspeaker icon for digitized resources X-Git-Tag: 1.5.0rc1~27^2~39 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0d6c6fbfdc97242e54dccae5446977432f1eaf61;p=telemeta.git modify list orders, add a loudspeaker icon for digitized resources --- diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 74af69d3..9e089eb4 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 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 f5d241fb..e8681849 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 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 40f5ef08..bffbe310 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 1817d343..e756f907 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-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: Guillaume Pellerin \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 0d8e6ea4..6e143564 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 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" %}