update locales, field places

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index 79ed806caec92a4afd90142999aae9408a5385ff..f1f1b396692cebbe264c1f4d457d5db7c00d8086 100644 (file)
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -76,7 +76,7 @@ msgstr "Mot-clé"
 
 #: models/enum.py:137
 msgid "publisher / status"
-msgstr "éditeur / statut"
+msgstr "statut"
 
 #: models/enum.py:143 models/media.py:226
 msgid "publisher"
@@ -129,23 +129,20 @@ msgid "topic"
 msgstr "discipline"
 
 #: models/enum.py:244
-#, fuzzy
 msgid "copy type"
-msgstr "type complet"
+msgstr "type d'exemplaire'"
 
 #: models/enum.py:252 models/media.py:267
-#, fuzzy
 msgid "media type"
-msgstr "Type de media"
+msgstr "support original"
 
 #: models/enum.py:260 models/media.py:672
 msgid "status"
 msgstr "état"
 
 #: models/enum.py:268
-#, fuzzy
 msgid "identifier type"
-msgstr "identifiant"
+msgstr "type d'identifiant"
 
 #: models/format.py:58 models/media.py:456 models/media.py:523
 #: models/media.py:550 models/media.py:561 models/media.py:577
@@ -417,7 +414,7 @@ msgstr "année de parution"
 
 #: models/media.py:217 models/media.py:393
 msgid "access status"
-msgstr "statut d'accès"
+msgstr "type d'accès"
 
 #: models/media.py:224 models/media.py:403
 msgid "recordist"
@@ -454,16 +451,15 @@ msgstr "déposant CNRS"
 
 #: models/media.py:244
 msgid "type of copy"
-msgstr ""
+msgstr "type de copie"
 
 #: models/media.py:247
 msgid "related documentation"
 msgstr "documentation associée"
 
 #: models/media.py:251
-#, fuzzy
 msgid "collection status"
-msgstr "collections"
+msgstr "status de la collection"
 
 #: models/media.py:252
 msgid "copies"
@@ -564,11 +560,11 @@ msgstr "Langue ISO"
 
 #: models/media.py:380
 msgid "comments / ethnographic context"
-msgstr "commentaires / contexte ethnographique"
+msgstr "contexte ethnographique"
 
 #: models/media.py:381
-msgid "moda_execut"
-msgstr "moda_execut"
+msgid "implementing rules"
+msgstr "modalités d'exécution"
 
 #: models/media.py:388
 msgid "author / compositor"
@@ -729,41 +725,35 @@ msgstr "média associés"
 
 #: models/media.py:864
 msgid "date of first attribution"
-msgstr ""
+msgstr "date de dpremière attribution"
 
 #: models/media.py:865
-#, fuzzy
 msgid "date of last attribution"
-msgstr "mode d'acquisition"
+msgstr "date de dernière attribution"
 
 #: models/media.py:866
-#, fuzzy
 msgid "date of last modification"
-msgstr "Dernière modification"
+msgstr "date de dernière modification"
 
 #: models/media.py:867
 msgid "notes"
-msgstr ""
+msgstr "notes"
 
 #: models/media.py:880
-#, fuzzy
 msgid "item identifier"
-msgstr "identifiant"
+msgstr "identifiant de l'item"
 
 #: models/media.py:881
-#, fuzzy
 msgid "item identifiers"
-msgstr "identifiant"
+msgstr "identifiants de l'item"
 
 #: models/media.py:892
-#, fuzzy
 msgid "collection identifier"
-msgstr "identifiant de l'élément"
+msgstr "identifiant de la collection"
 
 #: models/media.py:893
-#, fuzzy
 msgid "collection identifiers"
-msgstr "identifiant de l'élément"
+msgstr "identifiants de la collection"
 
 #: models/system.py:52
 msgid "element type"
@@ -927,18 +917,16 @@ msgid "Delete"
 msgstr "Supprimer"
 
 #: templates/postman/base_folder.html:50 templates/postman/view.html:26
-#, fuzzy
 msgid "Archive"
-msgstr "Archives"
+msgstr "Archive"
 
 #: templates/postman/base_folder.html:51
-#, fuzzy
 msgid "Undelete"
-msgstr "supprimé"
+msgstr "Récupéré"
 
 #: templates/postman/base_folder.html:57
 msgid "No messages."
-msgstr ""
+msgstr "Pas de messages"
 
 #: templates/postman/base_write.html:20
 #: templates/telemeta/inc/chat_room.html:14
@@ -1281,9 +1269,8 @@ msgstr "Ajouter à la liste"
 #: templates/telemeta/inc/collection_related.html:45
 #: templates/telemeta/inc/mediaitem_related.html:45
 #: templates/telemeta/inc/resource_related.html:45
-#, fuzzy
 msgid "Download"
-msgstr "Téléchargement:"
+msgstr "Téléchargement"
 
 #: templates/telemeta/collection_detail.html:68
 #: templates/telemeta/geo_continents.html:26
@@ -1330,7 +1317,7 @@ msgstr "Commentaires"
 #: templates/telemeta/mediaitem_detail.html:206
 #: templates/telemeta/resource_detail.html:74
 msgid "Last modification"
-msgstr "Dernière modification"
+msgstr "Dernière modification de la fiche"
 
 #: templates/telemeta/collection_detail.html:165
 #: templates/telemeta/mediaitem_detail.html:295
@@ -1372,9 +1359,8 @@ msgstr "Média associés"
 
 #: templates/telemeta/collection_edit.html:22
 #: templates/telemeta/mediaitem_edit.html:26
-#, fuzzy
 msgid "Identifier"
-msgstr "identifiant"
+msgstr "Identifiant"
 
 #: templates/telemeta/collection_edit.html:53
 #: templates/telemeta/collection_related_edit.html:14
@@ -1719,9 +1705,8 @@ msgid "Performance"
 msgstr "Composition"
 
 #: templates/telemeta/mediaitem_edit.html:25
-#, fuzzy
 msgid "Format"
-msgstr "format"
+msgstr "Format"
 
 #: templates/telemeta/mediaitem_keywords_edit.html:24
 msgid "Keyword"

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 8c58a0087a0fc740b86db5365c940890b736f730..dad83ffcdb2a5621d36a9bae0cccf79c20b95da5 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -206,14 +206,14 @@ class MediaCollection(MediaResource):
     # General informations
     title                 = CharField(_('title'), required=True)
     alt_title             = CharField(_('original title / translation'))
-    creator               = CharField(_('depositor / contributor'), help_text='First name, Last name; First name, Last name')
+    creator               = CharField(_('depositor / contributor'), help_text=_('First name, Last name; First name, Last name'))
     doctype_code          = IntegerField(_('document type'))
     description           = TextField(_('description'))
     recording_context     = WeakForeignKey('RecordingContext', related_name="collections",
                                            verbose_name=_('recording context'))
-    recorded_from_year    = IntegerField(_('recording year (from)'), help_text='YYYY')
-    recorded_to_year      = IntegerField(_('recording year (until)'), help_text='YYYY')
-    year_published        = IntegerField(_('year published'), help_text='YYYY')
+    recorded_from_year    = IntegerField(_('recording year (from)'), help_text=_('YYYY'))
+    recorded_to_year      = IntegerField(_('recording year (until)'), help_text=_('YYYY'))
+    year_published        = IntegerField(_('year published'), help_text=_('YYYY'))
     public_access         = CharField(_('access status'), choices=PUBLIC_ACCESS_CHOICES,
                                       max_length=16, default="metadata")
 
@@ -221,7 +221,7 @@ class MediaCollection(MediaResource):
     # See "countries" and "ethnic_groups" methods below
 
     # Legal notices
-    collector             = CharField(_('recordist'), help_text='First name, Last name; First name, Last name')
+    collector             = CharField(_('recordist'), help_text=_('First name, Last name; First name, Last name'))
     publisher             = WeakForeignKey('Publisher', related_name="collections",
                                            verbose_name=_('publisher'))
     publisher_collection  = WeakForeignKey('PublisherCollection', related_name="collections",
@@ -357,12 +357,11 @@ class MediaItem(MediaResource):
     # Main Informations
     title                 = CharField(_('title'))
     alt_title             = CharField(_('original title / translation'))
-    collection            = ForeignKey('MediaCollection', related_name="items",
-                                       verbose_name=_('collection'))
-    recorded_from_date    = DateField(_('recording date (from)'), help_text='YYYY-MM-DD')
-    recorded_to_date      = DateField(_('recording date (until)'), help_text='YYYY-MM-DD')
-
-    scientist             = CharField(_('scientist'), help_text='First name, Last name')
+    collection            = ForeignKey('MediaCollection', related_name="items", verbose_name=_('collection'))
+    recorded_from_date    = DateField(_('recording date (from)'), help_text=_('YYYY-MM-DD'))
+    recorded_to_date      = DateField(_('recording date (until)'), help_text=_('YYYY-MM-DD'))
+    public_access         = CharField(_('access status'), choices=ITEM_PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata")
+    scientist             = CharField(_('scientist'), help_text=_('First name, Last name; First name, Last name'))
     topic                 = WeakForeignKey('Topic', verbose_name=_('topic'))
     summary               = TextField(_('summary'))
     comment               = TextField(_('remarks'))
@@ -371,33 +370,26 @@ class MediaItem(MediaResource):
     location              = WeakForeignKey('Location', verbose_name=_('location'))
     location_comment      = CharField(_('location details'))
     cultural_area         = CharField(_('cultural area'))
-    ethnic_group          = WeakForeignKey('EthnicGroup', related_name="items",
-                                           verbose_name=_('population / social group'))
+    ethnic_group          = WeakForeignKey('EthnicGroup', related_name="items", verbose_name=_('population / social group'))
     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=_('ISO language'), blank=True, null=True, on_delete=models.SET_NULL)
     context_comment       = TextField(_('comments / ethnographic context'))
-    moda_execut           = CharField(_('moda_execut'))
+    moda_execut           = CharField(_('implementing rules'))
 
     # Musical informations
-    vernacular_style      = WeakForeignKey('VernacularStyle', related_name="items",
-                                           verbose_name=_('vernacular style'))
-    generic_style         = WeakForeignKey('GenericStyle', related_name="items",
-                                           verbose_name=_('generic style'))
-    author                = CharField(_('author / compositor'))
+    vernacular_style      = WeakForeignKey('VernacularStyle', related_name="items", verbose_name=_('vernacular style'))
+    generic_style         = WeakForeignKey('GenericStyle', related_name="items", verbose_name=_('generic style'))
+    author                = CharField(_('author / compositor'), help_text=_('First name, Last name; First name, Last name'))
     contributor           = CharField(_('contributor'))
 
     # Legal mentions
     organization          = WeakForeignKey('Organization', verbose_name=_('organization'))
-    public_access         = CharField(_('access status'), choices=ITEM_PUBLIC_ACCESS_CHOICES,
-                                      max_length=16, default="metadata")
     depositor             = CharField(_('depositor'))
     rights                = WeakForeignKey('Rights', verbose_name=_('rights'))
     auto_period_access    = BooleanField(_('automatic access after a rolling period'), default=True)
 
     # Archiving data
-    code                  = CharField(_('code'), unique=True, blank=True, required=True, help_text='CollectionCode-ItemCode')
+    code                  = CharField(_('code'), unique=True, blank=True, required=True, help_text=_('CollectionCode-ItemCode'))
     old_code              = CharField(_('original code'), unique=False, blank=True)
     track                 = CharField(_('item number'))
     recordist             = CharField(_('recordist'))
@@ -409,23 +401,22 @@ class MediaItem(MediaResource):
     publishing_date       = DateField(_('publishing date'))
     creator_reference     = CharField(_('creator reference'))
     external_references   = TextField(_('published references'))
-    copied_from_item      = WeakForeignKey('self', related_name="copies",
-                                           verbose_name=_('copy of'))
+    copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of'))
     mimetype              = CharField(_('mime type'), max_length=255, blank=True)
 
     # Media
-    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d',
-                                      db_column="filename", max_length=1024)
+    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename", max_length=1024)
     url                   = URLField(_('URL'), max_length=512, blank=True)
 
     # Technical data
-    approx_duration       = DurationField(_('approximative duration'), help_text='hh:mm:ss')
+    approx_duration       = DurationField(_('approximative duration'), help_text=_('hh:mm:ss'))
 
     # Manager
     objects               = MediaItemManager()
 
     def keywords(self):
         return ContextKeyword.objects.filter(item_relations__item = self)
+
     keywords.verbose_name = _('keywords')
 
     @property

diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index 63b3d9d96be1c0a969d2aabd68b454583d60df26..c0e4cec6f94a997825f917763e13bd81958ed6c0 100644 (file)
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -167,12 +167,12 @@
                     <dl class="listing">
                         {% dl_field collection "code" %}
                         {% dl_field collection "old_code" %}
-                        <dt>{% trans "Media type" %}</dt><dd>{% trans "Audio" %}</dd>
                         {% dl_field collection "approx_duration" %}
                         {% dl_field collection "computed_duration" %}
                         {% dl_field collection "physical_items_num" %}
                         <div class="wazing"></div>
                         <dt>{% trans "Number of items" %}</dt><dd>{{ collection.items.count }}</dd>
+                        {% dl_field collection "media_type" %}
                         {% dl_field collection "physical_format" %}
                         {% dl_field collection "ad_conversion" %}
                     </dl>

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index f486b730408b5dbf66e3f1c9d90692d755e50241..5e7b51c227682d1e69336c691d5813defd3a969c 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -197,16 +197,13 @@ Item : <a href="{% url "telemeta-item-detail" item.public_id %}">{{ item }}</a>
             {% dl_field item "alt_title" %}
             {% dl_field item "collector" placeholder %}
             <dt>{% field_label item "collection" %}</dt>
-            <dd><a href="{% url "telemeta-collection-detail" item.collection.public_id %}">{{ item.collection }}</a></dd>
+            <dd><a href="{% url "telemeta-collection-detail" item.collection.public_id %}">{{ item.collection.title }}</a></dd>
             <dt>{% trans "Recording date" %}</dt>
-
             <dd>{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}</dd>
-
-            {% if last_revision %}
-            <dt>{% trans "Last modification" %}</dt>
-            <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url "telemeta-profile-detail" last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd>
+            {% dl_field item "public_access" %}
+            {% if item.moda_exec %}
+            {% dl_field item "moda_exec" %}
             {% endif %}
-
         </dl>
         {% endblock general_info %}
     </div>
@@ -285,6 +282,10 @@ Item : <a href="{% url "telemeta-item-detail" item.public_id %}">{{ item }}</a>
                 {% endif %}
                 <dt>{% trans "Remarks" %}</dt>
                 <dd>{{ item.comment|html_line_break|safe }}</dd>
+                {% if last_revision %}
+                <dt>{% trans "Last modification" %}</dt>
+                <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url "telemeta-profile-detail" last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd>
+                {% endif %}
             </dl>
         </div>
         {% endblock archive_data %}

diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html
index f0e52fb423dbf18cbf0abc85dbf3fd8d33b2b4a0..9202e1898bd265e2c90f5814f0e0d11480c5796b 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_edit.html
@@ -4,7 +4,7 @@
 {% load bootstrap3 %}
 
 {% block title %}
-<img src="{{ STATIC_URL }}telemeta/images/item.png" style="vertical-align:middle" /> Item : {{ item }}
+<img src="{{ STATIC_URL }}telemeta/images/item.png" style="vertical-align:middle" /> Item : {% if item.title %}{{ item.title }}{% else %}{{ item.public_id }}{% endif %}
 {% endblock %}
 
 {% block title_buttons %}