Add traductions

diff --git a/env/debug.env b/env/debug.env
index fb6db5528d91956548680031ccf49f8e48e1a2ab..f43f7d26c85c43fa8e4d859932316f4eab91db5a 100644 (file)
--- a/env/debug.env
+++ b/env/debug.env
@@ -18,5 +18,5 @@ BROKER_URL=redis://broker:6379/0
 # If this is True, all tasks will be executed locally by blocking until the task returns.
 CELERY_ALWAYS_EAGER=False
 
-REINDEX=True
+REINDEX=False
 DATASTART=False

diff --git a/telemeta/locale b/telemeta/locale
index 0790c8f8c2df57d782176710d73795734d034111..7a7911895b106d17b0167d7740e5b3c2b7c54e89 160000 (submodule)
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit 0790c8f8c2df57d782176710d73795734d034111
+Subproject commit 7a7911895b106d17b0167d7740e5b3c2b7c54e89

diff --git a/telemeta/static/telemeta/css/search.css b/telemeta/static/telemeta/css/search.css
index 2c69cdaafc8bfc0a1ea767a8d4affa1ecef7e3ce..3b81a62bd91a835d7436f35f5861d21a175a948d 100644 (file)
--- a/telemeta/static/telemeta/css/search.css
+++ b/telemeta/static/telemeta/css/search.css
@@ -1,43 +1,56 @@
-.overflow{
-       max-height:200px;
+.overflow {
+    max-height: 200px;
 }
 
 .module ul, li {
-       border-radius: 0px 0px 0px 0px;
+    border-radius: 0px 0px 0px 0px;
 }
 
-.ui-selectmenu-button.ui-widget.ui-state-default{
-       background-image:none;
-       background-color:#6a0307;
-       border-color:#6a0307;
-       color:white;
+.ui-selectmenu-button.ui-widget.ui-state-default {
+    background-image: none;
+    background-color: #6a0307;
+    border-color: #6a0307;
+    color: white;
 }
 
-.ui-selectmenu-button.ui-widget.ui-state-hover{
-       background-image:none;
-       background-color:#6a0307;
-       border-color:#6a0307;
-       color:white;
+.ui-selectmenu-button.ui-widget.ui-state-hover {
+    background-image: none;
+    background-color: #6a0307;
+    border-color: #6a0307;
+    color: white;
 }
 
-.ui-selectmenu-button.ui-widget.ui-state-focus{
-       background-image:none;
-       background-color:#6a0307;
-       border-color:#6a0307;
-       color:white;
+.ui-selectmenu-button.ui-widget.ui-state-focus {
+    background-image: none;
+    background-color: #6a0307;
+    border-color: #6a0307;
+    color: white;
 }
 
-.ui-selectmenu-button.ui-widget.ui-state-default .ui-icon{
-       background-image:url("images/ui-icons_ffffff_256x240.png");
+.ui-selectmenu-button.ui-widget.ui-state-default .ui-icon {
+    background-image: url("images/ui-icons_ffffff_256x240.png");
 }
 
-.ui-menu-item{
-       background-color:white;
+.ui-menu-item {
+    background-color: white;
 }
 
-.ui-menu-item.ui-state-focus{
-       background-image:none;
-       background-color:#6a0307;
-       border-color:#6a0307;
-       color:white;
+.ui-menu-item.ui-state-focus {
+    background-image: none;
+    background-color: #6a0307;
+    border-color: #6a0307;
+    color: white;
 }
+
+form p {
+    display: inline-block;
+}
+
+.ui-front {
+    z-index: 1000;
+}
+
+select[name*="startBracket"] {
+    text-align: right;
+}
+

diff --git a/telemeta/static/telemeta/js/locale.js b/telemeta/static/telemeta/js/locale.js
index 3f737535e73f5f7e29d61905d60099b19448fef0..28b62eee12c352f303aef6f4e7b72cb8f2ed3b74 100644 (file)
--- a/telemeta/static/telemeta/js/locale.js
+++ b/telemeta/static/telemeta/js/locale.js
@@ -14,6 +14,9 @@ var localeStrings = {
     'delete the collection permanently?' : gettext('delete the collection permanently?'),
     'delete the playlist permanently?' : gettext('delete the playlist permanently?'),
     'delete the resource from the playlist permanently?' : gettext('delete the resource from the playlist permanently?'),
+    'delete field' : gettext('delete field'),
+    'final query' : gettext('final query'),
+    '(playlisted)' : gettext('(playlisted)'),
 };
 
 function gettrans(str){

diff --git a/telemeta/templates/search/advanceSearch.html b/telemeta/templates/search/advanceSearch.html
index 146536a3ce2cfe959b3f68dc5f44ea3848e4cad7..6b553bc6a3c1c12ce0e5d43efe63fe5220055428 100644 (file)
--- a/telemeta/templates/search/advanceSearch.html
+++ b/telemeta/templates/search/advanceSearch.html
@@ -11,21 +11,6 @@
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/jquery-ui.css" />
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/search.css" />
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/lists_sorttable.css" media="print, projection, screen"/>
-    <style>
-
-        form p{
-            display: inline-block;
-        }
-
-        .ui-front{
-            z-index: 1000;
-        }
-
-        select[name*="startBracket"]{
-            text-align: right;
-        }
-
-    </style>
 {% endblock %}
 {% block content %}
     <form method="get" action=".">
@@ -55,7 +40,7 @@
                     {{form.instruments.errors}}
                     {% trans form.instruments.label_tag %}
                     {{form.instruments}}
-                    <a href="#" id="btn" class="col-md-5 btn btn-default" style="width: 100%; margin-top: 1%">Instruments : Recherche booléenne</a>
+                    <a href="#" id="btn" class="col-md-5 btn btn-default" style="width: 100%; margin-top: 1%">{% trans "Instruments : Boolean Search" %}</a>
                 </div>
 
                 <div class="fieldWrapper">
@@ -271,8 +256,8 @@
                     {% endif %}
 
                 {% endfor %}
-                <a class="btn btn-default" id="ajout" href="#">Ajouter champ</a>
-                <br/><input type="submit" value="Valider la requête">
+                <a class="btn btn-default" id="ajout" href="#">{% trans "Add field" %}</a>
+                <br/><input type="submit" value="{% trans "Validate the query" %}">
 
 
             </form>
@@ -387,7 +372,7 @@ $(function() {
         $('#dialog').dialog("open");
     });
 
-    var supprButton = '<a class="btn btn-default" id="suppr" href="#">Supprimer champ</a><br/>';
+    var supprButton = '<a class="btn btn-default" id="suppr" href="#">'+gettrans('delete field')+'</a><br/>';
 
     var balise = $('#copy').clone();
     $(balise).children().each(function () {
@@ -437,7 +422,7 @@ $(function() {
                     $("#dialog").dialog("close");
                     $('#id_instruments').val(donnees.result);
                 }
-                $('#res').html("Requête formée :<br/><strong>"+donnees.result+'</strong>');
+                $('#res').html(gettrans('final query')+" :<br/><strong>"+gettrans(donnees.result)+'</strong>');
             },
         });
     });

diff --git a/telemeta/templates/telemeta/instrument_alias_edit.html b/telemeta/templates/telemeta/instrument_alias_edit.html
index db8e4c2f0db6c3b9b10a2eca878e42b2784180a3..f10fcd911e267a7f18ef0a4b70c4041075c78e2b 100644 (file)
--- a/telemeta/templates/telemeta/instrument_alias_edit.html
+++ b/telemeta/templates/telemeta/instrument_alias_edit.html
@@ -27,7 +27,7 @@
  <form id="_updateinstru" method="POST" action="{% url "telemeta-instrument-alias-update" %}">{% csrf_token %}
   <table class="listing">
    <thead>
-    <tr><th class="sel">&nbsp;</th><th>{% trans "Name"%}</th><th>Nombre d'items associés</th></tr>
+    <tr><th class="sel">&nbsp;</th><th>{% trans "Name"%}</th><th>{% trans "Associated items" %}</th></tr>
    </thead><tbody>
     {% for record in instruments %}
     <tr>

diff --git a/telemeta/templates/telemeta/instrument_edit.html b/telemeta/templates/telemeta/instrument_edit.html
index 2c3d59f1be091346d9a55c606a917e23e25f12f0..49fffe1f8e79a25c97ed79e32c6c63ec1476a72c 100644 (file)
--- a/telemeta/templates/telemeta/instrument_edit.html
+++ b/telemeta/templates/telemeta/instrument_edit.html
@@ -27,7 +27,7 @@
  <form id="_updateinstru" method="POST" action="{% url "telemeta-instrument-update" %}">{% csrf_token %}
   <table class="listing">
    <thead>
-    <tr><th class="sel">&nbsp;</th><th>{% trans "Name"%}</th><th>Nombre d'items associés</th></tr>
+    <tr><th class="sel">&nbsp;</th><th>{% trans "Name"%}</th><th>{% trans "Associated items" %}</th></tr>
    </thead><tbody>
     {% for record in instruments %}
     <tr>

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 71e9e19c6f65dcbbf4df048e2ab7dd564e1dff72..1684a29a7b27697cbf1cfd149e60583795ce8633 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -62,7 +62,7 @@
     {% if user.is_authenticated %}
         {% for playlist in playlists %}
                {% if forloop.counter0 in rang_item_playliste %}
-                           playlistUtils.addPlaylist('{{ playlist.playlist.title }} (déjà listé)','{{playlist.playlist.public_id}}');
+                           playlistUtils.addPlaylist('{{ playlist.playlist.title }}'+ gettrans('(playlisted)'),'{{playlist.playlist.public_id}}');
                {% else %}
                            playlistUtils.addPlaylist('{{ playlist.playlist.title }}','{{playlist.playlist.public_id}}');
                {% endif %}

diff --git a/telemeta/util/backend.py b/telemeta/util/backend.py
index 04b299505611e24cfc75e0d3908fdb21dfb4801b..d969c1a2edb510b13f170b088f1dd3d1398d1944 100644 (file)
--- a/telemeta/util/backend.py
+++ b/telemeta/util/backend.py
@@ -25,7 +25,7 @@ class CustomElasticSearchQuery(ElasticsearchSearchQuery):
     def build_query_fragment(self, field, filter_type, value):
         if isinstance(value, bool):
                value = str(value)
-       if field !='code':
+       if not isinstance(value, int) and field !='code':
                value = re.sub(regexSpacePunc, " ", value)
         valeur = super(CustomElasticSearchQuery, self).build_query_fragment(field, filter_type, value)
         return valeur