From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 13 Nov 2014 10:15:21 +0000 (+0100)
Subject: locales again and minor bugs
X-Git-Tag: 1.5.0rc1~27^2~40
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=440acd4cecf5a2996fcf02ebc3fdb238d1c57289;p=telemeta.git

locales again and minor bugs
---

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 748b7863..74af69d3 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 adb13ec4..4b23a63e 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 10:58+0100\n"
+"POT-Creation-Date: 2014-11-13 11:15+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"
@@ -143,9 +143,10 @@ msgstr "Medientyp"
 msgid "original format"
 msgstr "Herkunftsort"
 
-#: models/enum.py:290 models/media.py:656
-msgid "status"
-msgstr "Status"
+#: models/enum.py:290 models/media.py:238
+#, fuzzy
+msgid "collection status"
+msgstr "Sammlungen"
 
 #: models/enum.py:298
 #, fuzzy
@@ -473,11 +474,6 @@ msgstr "CNRS HinterlegerIn"
 msgid "related documentation"
 msgstr "verwandte Dokumentation"
 
-#: models/media.py:238
-#, fuzzy
-msgid "collection status"
-msgstr "Sammlungen"
-
 #: models/media.py:239
 msgid "copies"
 msgstr "Kopien"
@@ -575,9 +571,10 @@ msgstr "Kulturraum"
 msgid "language"
 msgstr "Sprache"
 
-#: models/media.py:361
-msgid "ISO language"
-msgstr "ISO Sprache"
+#: models/media.py:361 templates/telemeta/mediaitem_detail.html:222
+#, fuzzy
+msgid "Language (ISO norm)"
+msgstr "Sprache"
 
 #: models/media.py:363 templates/telemeta/mediaitem_detail.html:226
 #, fuzzy
@@ -744,6 +741,10 @@ msgstr "Zeit"
 msgid "author"
 msgstr "AutorIn"
 
+#: models/media.py:656
+msgid "status"
+msgstr "Status"
+
 #: models/media.py:690
 msgid "transcoded"
 msgstr "umgewandelt"
@@ -1822,11 +1823,6 @@ msgstr ""
 msgid "Recording date"
 msgstr "Aufnahmedatum"
 
-#: templates/telemeta/mediaitem_detail.html:222
-#, fuzzy
-msgid "Language ISO"
-msgstr "Sprache"
-
 #: templates/telemeta/mediaitem_detail.html:237
 #, fuzzy
 msgid "Musical informations"
@@ -2203,6 +2199,13 @@ msgstr "Listen"
 msgid "You have successfully updated your item."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Language ISO"
+#~ msgstr "Sprache"
+
+#~ msgid "ISO language"
+#~ msgstr "ISO Sprache"
+
 #~ msgid "Profile"
 #~ msgstr "Profil"
 
diff --git a/telemeta/locale/es/LC_MESSAGES/django.mo b/telemeta/locale/es/LC_MESSAGES/django.mo
index a3c8f54f..f5d241fb 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 d72122a4..fdcd1a54 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 10:58+0100\n"
+"POT-Creation-Date: 2014-11-13 11:15+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"
@@ -137,8 +137,8 @@ msgstr ""
 msgid "original format"
 msgstr ""
 
-#: models/enum.py:290 models/media.py:656
-msgid "status"
+#: models/enum.py:290 models/media.py:238
+msgid "collection status"
 msgstr ""
 
 #: models/enum.py:298
@@ -462,10 +462,6 @@ msgstr ""
 msgid "related documentation"
 msgstr ""
 
-#: models/media.py:238
-msgid "collection status"
-msgstr ""
-
 #: models/media.py:239
 msgid "copies"
 msgstr ""
@@ -559,8 +555,8 @@ msgstr ""
 msgid "language"
 msgstr ""
 
-#: models/media.py:361
-msgid "ISO language"
+#: models/media.py:361 templates/telemeta/mediaitem_detail.html:222
+msgid "Language (ISO norm)"
 msgstr ""
 
 #: models/media.py:363 templates/telemeta/mediaitem_detail.html:226
@@ -723,6 +719,10 @@ msgstr ""
 msgid "author"
 msgstr ""
 
+#: models/media.py:656
+msgid "status"
+msgstr ""
+
 #: models/media.py:690
 msgid "transcoded"
 msgstr ""
@@ -1764,10 +1764,6 @@ msgstr ""
 msgid "Recording date"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:222
-msgid "Language ISO"
-msgstr ""
-
 #: templates/telemeta/mediaitem_detail.html:237
 msgid "Musical informations"
 msgstr ""
diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index b798d38a..40f5ef08 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 c876ac26..1817d343 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 10:58+0100\n"
+"POT-Creation-Date: 2014-11-13 11:15+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"
@@ -126,7 +126,7 @@ msgstr "discipline"
 
 #: models/enum.py:266 models/media.py:234
 msgid "copy type"
-msgstr "type d'exemplaire'"
+msgstr "type d'exemplaire"
 
 #: models/enum.py:274 models/media.py:251 models/media.py:388
 msgid "media type"
@@ -136,9 +136,9 @@ msgstr "type de média"
 msgid "original format"
 msgstr "support original"
 
-#: models/enum.py:290 models/media.py:656
-msgid "status"
-msgstr "état"
+#: models/enum.py:290 models/media.py:238
+msgid "collection status"
+msgstr "statut de la collection"
 
 #: models/enum.py:298
 msgid "identifier type"
@@ -461,10 +461,6 @@ msgstr "déposant CNRS"
 msgid "related documentation"
 msgstr "documentation associée"
 
-#: models/media.py:238
-msgid "collection status"
-msgstr "statut de la collection"
-
 #: models/media.py:239
 msgid "copies"
 msgstr "autres exemplaires"
@@ -558,9 +554,9 @@ msgstr "aire culturelle"
 msgid "language"
 msgstr "langue"
 
-#: models/media.py:361
-msgid "ISO language"
-msgstr "Langue ISO"
+#: models/media.py:361 templates/telemeta/mediaitem_detail.html:222
+msgid "Language (ISO norm)"
+msgstr "Langue (norme ISO)"
 
 #: models/media.py:363 templates/telemeta/mediaitem_detail.html:226
 msgid "Ethnographic context"
@@ -722,6 +718,10 @@ msgstr "temps (s)"
 msgid "author"
 msgstr "auteur"
 
+#: models/media.py:656
+msgid "status"
+msgstr "état"
+
 #: models/media.py:690
 msgid "transcoded"
 msgstr "transcodé"
@@ -1769,10 +1769,6 @@ msgstr "Cliquez ici"
 msgid "Recording date"
 msgstr "Date d'enregistrement"
 
-#: templates/telemeta/mediaitem_detail.html:222
-msgid "Language ISO"
-msgstr "Langue ISO"
-
 #: templates/telemeta/mediaitem_detail.html:237
 msgid "Musical informations"
 msgstr "Informations sur la musique"
@@ -2131,6 +2127,12 @@ msgstr "Listes"
 msgid "You have successfully updated your item."
 msgstr ""
 
+#~ msgid "Language ISO"
+#~ msgstr "Langue ISO"
+
+#~ msgid "ISO language"
+#~ msgstr "Langue ISO"
+
 #~ msgid "Profile"
 #~ msgstr "Profil"
 
diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo
index a244c927..0d8e6ea4 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 0e7b42fd..a97db344 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 10:58+0100\n"
+"POT-Creation-Date: 2014-11-13 11:15+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"
@@ -143,9 +143,10 @@ msgstr "媒体类型"
 msgid "original format"
 msgstr "原始位置"
 
-#: models/enum.py:290 models/media.py:656
-msgid "status"
-msgstr "状态"
+#: models/enum.py:290 models/media.py:238
+#, fuzzy
+msgid "collection status"
+msgstr "选集"
 
 #: models/enum.py:298
 #, fuzzy
@@ -474,11 +475,6 @@ msgstr "CNRS寄存者"
 msgid "related documentation"
 msgstr "相关文献"
 
-#: models/media.py:238
-#, fuzzy
-msgid "collection status"
-msgstr "选集"
-
 #: models/media.py:239
 msgid "copies"
 msgstr "副本"
@@ -576,8 +572,10 @@ msgstr "文化区域"
 msgid "language"
 msgstr "语言"
 
-#: models/media.py:361
-msgid "ISO language"
+#: models/media.py:361 templates/telemeta/mediaitem_detail.html:222
+#, fuzzy
+#| msgid "Language ISO"
+msgid "Language (ISO norm)"
 msgstr "ISO语言"
 
 #: models/media.py:363 templates/telemeta/mediaitem_detail.html:226
@@ -743,6 +741,10 @@ msgstr "时间"
 msgid "author"
 msgstr "作者"
 
+#: models/media.py:656
+msgid "status"
+msgstr "状态"
+
 #: models/media.py:690
 msgid "transcoded"
 msgstr "已转换代码"
@@ -1802,10 +1804,6 @@ msgstr "点击这里"
 msgid "Recording date"
 msgstr "录音日期"
 
-#: templates/telemeta/mediaitem_detail.html:222
-msgid "Language ISO"
-msgstr "ISO语言"
-
 #: templates/telemeta/mediaitem_detail.html:237
 msgid "Musical informations"
 msgstr "音乐信息"
@@ -2169,6 +2167,12 @@ msgstr "列表"
 msgid "You have successfully updated your item."
 msgstr ""
 
+#~ msgid "Language ISO"
+#~ msgstr "ISO语言"
+
+#~ msgid "ISO language"
+#~ msgstr "ISO语言"
+
 #~ msgid "Profile"
 #~ msgstr "资料"
 
diff --git a/telemeta/models/enum.py b/telemeta/models/enum.py
index 3e27ed51..2f281b72 100644
--- a/telemeta/models/enum.py
+++ b/telemeta/models/enum.py
@@ -287,7 +287,7 @@ class Status(Enumeration):
 
     class Meta(MetaEnumeration):
         db_table = 'media_status'
-        verbose_name = _("status")
+        verbose_name = _("collection status")
 
 
 class IdentifierType(Enumeration):
diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index defaf004..e0aaeac1 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -358,7 +358,7 @@ class MediaItem(MediaResource):
     location_comment      = CharField(_('location details'))
     cultural_area         = CharField(_('cultural area'))
     language              = CharField(_('language'))
-    language_iso          = ForeignKey('Language', related_name="items", verbose_name=_('ISO language'), blank=True, null=True, on_delete=models.SET_NULL)
+    language_iso          = ForeignKey('Language', related_name="items", verbose_name=_('Language (ISO norm)'), blank=True, null=True, on_delete=models.SET_NULL)
     ethnic_group          = WeakForeignKey('EthnicGroup', related_name="items", verbose_name=_('population / social group'))
     context_comment       = TextField(_('Ethnographic context'))
 
diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index 419f31b3..62a68d76 100644
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -151,7 +151,7 @@
                         {% dl_field collection "publishing_status" %}
                         {% dl_field collection "status" %}
                         {% if collection.alt_ids %}
-                         {% dl_field collection "alt_ids" %}
+                         {% dl_field collection "alt_copies" %}
                         {% endif %}
                         <dt>{% trans "Comments" %}</dt>
                         <dd>{{ collection.comment|html_line_break|safe }}</dd>
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 0777fc47..25cd8889 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -219,7 +219,7 @@ Item : <a href="{% url "telemeta-item-detail" item.public_id %}">{{ item }}</a>
                 {% dl_field item "cultural_area" %}
                 {% dl_field item "language" %}
                 {% if item.language_iso %}
-                <dt>{% trans "Language ISO" %}</dt>
+                <dt>{% trans "Language (ISO norm)" %}</dt>
                 <dd>{{ item.language_iso.name|to_utf8 }}</dd>
                 {% endif %}
                 {% dl_field item "ethnic_group" placeholder %}
@@ -235,8 +235,8 @@ Item : <a href="{% url "telemeta-item-detail" item.public_id %}">{{ item }}</a>
         {% block musical_data %}
         <div>
             <h4><a href="#">{% trans "Musical informations" %}</a></h4>
-            {% if item.moda_exec %}
-            {% dl_field item "moda_exec" %}
+            {% if item.moda_execut %}
+            {% dl_field item "moda_execut" %}
             {% endif %}
             <dl class="listing">
                 {% dl_field item "vernacular_style" %}