change some view terms

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index f6e1bb2820189e37c86413cb4b6d7993941939b8..e4ae38f271306ddfbe60a2a7dfdbf206b1bd2f2d 100644 (file)
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -57,7 +57,7 @@ msgid "recording context"
 msgstr "contexte d'enregistrement"
 
 #: models/enum.py:106 models/media.py:122
-msgid "A/D conversion"
+msgid "digitization"
 msgstr "numérisation"
 
 #: models/enum.py:113 models/media.py:231
@@ -347,12 +347,12 @@ msgid "item"
 msgstr "item"
 
 #: models/media.py:322
-msgid "scientific instrument"
-msgstr "instrument scientifique"
+msgid "composition"
+msgstr "formation"
 
 #: models/media.py:324
-msgid "vernacular instrument"
-msgstr "instrument vernaculaire"
+msgid "vernacular name"
+msgstr "nom vernaculaire"
 
 #: models/media.py:325
 msgid "number"
@@ -708,8 +708,8 @@ msgstr "à"
 
 #: templates/telemeta_default/search_criteria.html:114
 #: templates/telemeta_default/search_results.html:38
-msgid "Year of issue"
-msgstr "Année de parution"
+msgid "Year of publication"
+msgstr "Année de publication"
 
 #: templates/telemeta_default/search_results.html:5
 #: templates/telemeta_default/search_results.html:8

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index a33c519d9cc7dba1c5e3cb01f12f622e287781bf..a5003d89782c42c993029b5cb02789f0fc6bac77 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -119,7 +119,7 @@ class MediaCollection(MediaResource):
     items_done            = CharField(_('items finished'))
     a_informer_07_03      = CharField(_('a_informer_07_03'))
     ad_conversion         = WeakForeignKey('AdConversion', related_name='collections', 
-                                           verbose_name=_('A/D conversion'))
+                                           verbose_name=_('digitization'))
     public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, 
                                       max_length=16, default="metadata")
 
@@ -311,9 +311,9 @@ class MediaItemPerformance(ModelCore):
     media_item      = ForeignKey('MediaItem', related_name="performances", 
                                  verbose_name=_('item'))
     instrument      = WeakForeignKey('Instrument', related_name="performances", 
-                                     verbose_name=_('scientific instrument'))
+                                     verbose_name=_('composition'))
     alias           = WeakForeignKey('InstrumentAlias', related_name="performances", 
-                                     verbose_name=_('vernacular instrument'))
+                                     verbose_name=_('vernacular name'))
     instruments_num = CharField(_('number'))
     musicians       = CharField(_('interprets'))
 

diff --git a/telemeta/templates/telemeta_default/search_criteria.html b/telemeta/templates/telemeta_default/search_criteria.html
index 8e19a0bbd95ff6f14a5b5c44d2a9356918aa7fb8..49f739710dbadc499affc40a415582e863e1033f 100644 (file)
--- a/telemeta/templates/telemeta_default/search_criteria.html
+++ b/telemeta/templates/telemeta_default/search_criteria.html
@@ -111,7 +111,7 @@ $(document).ready(function () {
 
     {% if pub_years %} 
     <p>
-    <label for="pub_date_from">{% trans "Year of issue" %}</label>
+    <label for="pub_date_from">{% trans "Year of publication" %}</label>
     <select id="pub_year_from" name="pub_year_from" class="tiny">
         <option value="0"></option>
         {% for year in pub_years %}

diff --git a/telemeta/templates/telemeta_default/search_results.html b/telemeta/templates/telemeta_default/search_results.html
index 08262c1f8bc67f8cd17aba41b8a97c4ae3401a92..cb13f62feab81ea71749d65144c6ab074e6a0758 100644 (file)
--- a/telemeta/templates/telemeta_default/search_results.html
+++ b/telemeta/templates/telemeta_default/search_results.html
@@ -35,7 +35,7 @@
     </li>
   {% endif %}
   {% if criteria.pub_year_from %}
-    <li><b>{% trans "Year of issue" %}:</b> {{criteria.pub_year_from}}
+    <li><b>{% trans "Year of publication" %}:</b> {{criteria.pub_year_from}}
      {% ifnotequal criteria.pub_year_to criteria.pub_year_from %}
      {% trans "to" %} {{criteria.pub_year_to}}
      {% endifnotequal %}

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 835da5a1ce71def3f32cfa4798218a04e43db770..aa98265ae09b3e6d1a49e36d8beb72080157f7b9 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -125,7 +125,7 @@ class WebView:
         
         analyzers = [{'name':'','id':'','unit':'','value':''}]
         # TODO: override timeside analyzer process when caching : write results to XML file in data/
-        self.analyzer_mode = 0
+        self.analyzer_mode = 1
         
         if self.analyzer_mode:
             analyzers_sub = []