add trans in template

diff --git a/examples/sandbox/src/django-haystack b/examples/sandbox/src/django-haystack
index cecb459ff4468a79a43cead3d09e213d0980c080..bd60745ce82318b1819768c9a31db0579228654d 160000 (submodule)
--- a/examples/sandbox/src/django-haystack
+++ b/examples/sandbox/src/django-haystack
@@ -1 +1 @@
-Subproject commit cecb459ff4468a79a43cead3d09e213d0980c080
+Subproject commit bd60745ce82318b1819768c9a31db0579228654d

diff --git a/telemeta/templates/search/advanceSearch.html b/telemeta/templates/search/advanceSearch.html
index 22173f2daff0623507d69c92dfc2f18c378d7316..af7e68b13930cf07f71a146bfacfac259ed16aba 100644 (file)
--- a/telemeta/templates/search/advanceSearch.html
+++ b/telemeta/templates/search/advanceSearch.html
@@ -60,46 +60,46 @@
             <div class="col-md-5" id="left-form">
                 <div class="fieldWrapper">
                     {{form.q.errors}}
-                    {{form.q.label_tag}}</br>
+                    {% trans form.q.label_tag %}</br>
                     {{form.q}}
                 </div>
                 <div class="fieldWrapper">
                     {{form.location.errors}}
-                    {{form.location.label_tag}}</br>
+                    {% trans form.location.label_tag %}</br>
                     {{form.location}}
                 </div>
                 <div class="fieldWrapper">
                     {{form.ethnic_group.errors}}
-                    {{form.ethnic_group.label_tag}}</br>
+                    {% trans form.ethnic_group.label_tag %}</br>
                     {{form.ethnic_group}}
                 </div>
                 <div class="fieldWrapper">
                     {{form.instruments.errors}}
-                    {{form.instruments.label_tag}}</br>
+                    {% trans form.instruments.label_tag %}</br>
                     {{form.instruments}}
                 </div>
                 <div class="fieldWrapper">
                     {{form.year_published_from.errors}} {{form.year_published_to.errors}}
-                    <label>Year Published :</label></br>
+                    <label> {% trans "Year Published" %} :</label></br>
                     {{form.year_published_from}} <span style="font-size:3em" aria-hidden="true">-</span> {{form.year_published_to}}
                 </div>
                 <div class="fieldWrapper">
                     {{form.media_type.errors}}
-                    <label>Media Type :</label></br>
+                    <label>{% trans "Media Type" %} :</label></br>
                     <ul id="id_media_type" style="margin-left:-40px">
                         {%ifequal query.media_type 'audio'%}
-                            <li><label for="id_media_type_0">no preference</label><input id="id_media_type_0" type="radio" value="1" name="media_type"></input></li>
-                            <li><label for="id_media_type_1">audio</label><input id="id_media_type_1" type="radio" value="audio" name="media_type" checked="checked"></input></li>
-                            <li><label for="id_media_type_2">video</label><input id="id_media_type_2" type="radio" value="video" name="media_type"></input></li>
+                            <li><label for="id_media_type_0">{% trans "no preference" %}</label><input id="id_media_type_0" type="radio" value="1" name="media_type"></input></li>
+                            <li><label for="id_media_type_1">{% trans "audio" %}</label><input id="id_media_type_1" type="radio" value="audio" name="media_type" checked="checked"></input></li>
+                            <li><label for="id_media_type_2">{% trans "video" %}</label><input id="id_media_type_2" type="radio" value="video" name="media_type"></input></li>
                         {%else%}
                             {%ifequal query.media_type 'video'%}
-                                <li><label for="id_media_type_0">no preference</label><input id="id_media_type_0" type="radio" value="1" name="media_type"></input></li>
-                                <li><label for="id_media_type_1">audio</label><input id="id_media_type_1" type="radio" value="audio" name="media_type"></input></li>
-                                <li><label for="id_media_type_2">video</label><input id="id_media_type_2" type="radio" value="video" name="media_type" checked="checked"></input></li>
+                                <li><label for="id_media_type_0">{% trans "no preference" %}</label><input id="id_media_type_0" type="radio" value="1" name="media_type"></input></li>
+                                <li><label for="id_media_type_1">{% trans "audio" %}</label><input id="id_media_type_1" type="radio" value="audio" name="media_type"></input></li>
+                                <li><label for="id_media_type_2">{% trans "video" %}</label><input id="id_media_type_2" type="radio" value="video" name="media_type" checked="checked"></input></li>
                             {%else%}
-                                <li><label for="id_media_type_0">no preference</label><input id="id_media_type_0" type="radio" value="1" name="media_type" checked="checked"></input></li>
-                                <li><label for="id_media_type_1">audio</label><input id="id_media_type_1" type="radio" value="audio" name="media_type"></input></li>
-                                <li><label for="id_media_type_2">video</label><input id="id_media_type_2" type="radio" value="video" name="media_type"></input></li>
+                                <li><label for="id_media_type_0">{% trans "no preference" %}</label><input id="id_media_type_0" type="radio" value="1" name="media_type" checked="checked"></input></li>
+                                <li><label for="id_media_type_1">{% trans "audio" %}</label><input id="id_media_type_1" type="radio" value="audio" name="media_type"></input></li>
+                                <li><label for="id_media_type_2">{% trans "video" %}</label><input id="id_media_type_2" type="radio" value="video" name="media_type"></input></li>
                             {%endifequal%}
                         {%endifequal%}
                     </ul>
@@ -107,21 +107,21 @@
                 </div>
                 <div class="fieldWrapper">
                     {{form.viewable_errors}}
-                    <label>Viewable : </label></br>
+                    <label>{% trans "Viewable" %} : </label></br>
                     <ul id="id_viewable" style="margin-left:-40px">
                         {%ifequal query.viewable '2'%}
-                            <li><label for="id_viewable_0">no preference</label><input id="id_viewable_0" type="radio" value="1" name="viewable"></input></li>
-                            <li><label for="id_viewable_1">fichier dans le player + full</label><input id="id_viewable_1" type="radio" value="2" name="viewable" checked="checked"></input></li>
-                            <li><label for="id_viewable_2">fichier dans le player (j'ai un compte)</label><input id="id_viewable_2" type="radio" value="3" name="viewable"></input></li>
+                            <li><label for="id_viewable_0">{% trans "no preference" %}</label><input id="id_viewable_0" type="radio" value="1" name="viewable"></input></li>
+                            <li><label for="id_viewable_1">{% trans "fichier dans le player + full" %}</label><input id="id_viewable_1" type="radio" value="2" name="viewable" checked="checked"></input></li>
+                            <li><label for="id_viewable_2">{% trans "fichier dans le player (j'ai un compte)" %}</label><input id="id_viewable_2" type="radio" value="3" name="viewable"></input></li>
                         {%else%}
                             {%ifequal query.viewable '3'%}
-                                <li><label for="id_viewable_0">no preference</label><input id="id_viewable_0" type="radio" value="1" name="viewable"></input></li>
-                                <li><label for="id_viewable_1">fichier dans le player + full</label><input id="id_viewable_1" type="radio" value="2" name="viewable"></input></li>
-                                <li><label for="id_viewable_2">fichier dans le player (j'ai un compte)</label><input id="id_viewable_2" type="radio" value="3" name="viewable" checked="checked"></input></li>
+                                <li><label for="id_viewable_0">{% trans "no preference" %}</label><input id="id_viewable_0" type="radio" value="1" name="viewable"></input></li>
+                                <li><label for="id_viewable_1">{% trans "fichier dans le player + full" %}</label><input id="id_viewable_1" type="radio" value="2" name="viewable"></input></li>
+                                <li><label for="id_viewable_2">{% trans "fichier dans le player (j'ai un compte)" %}</label><input id="id_viewable_2" type="radio" value="3" name="viewable" checked="checked"></input></li>
                             {%else%}
-                                <li><label for="id_viewable_0">no preference</label><input id="id_viewable_0" type="radio" value="1" name="viewable" checked="checked"></input></li>
-                                <li><label for="id_viewable_1">fichier dans le player + full</label><input id="id_viewable_1" type="radio" value="2" name="viewable"></input></li>
-                                <li><label for="id_viewable_2">fichier dans le player (j'ai un compte) </label><input id="id_viewable_2" type="radio" value="3" name="viewable"></input></li>
+                                <li><label for="id_viewable_0">{% trans "no preference" %}</label><input id="id_viewable_0" type="radio" value="1" name="viewable" checked="checked"></input></li>
+                                <li><label for="id_viewable_1">{% trans "fichier dans le player + full" %}</label><input id="id_viewable_1" type="radio" value="2" name="viewable"></input></li>
+                                <li><label for="id_viewable_2">{% trans "fichier dans le player (j'ai un compte)" %} </label><input id="id_viewable_2" type="radio" value="3" name="viewable"></input></li>
                             {%endifequal%}
                         {%endifequal%}
                     </ul>
@@ -130,48 +130,48 @@
             <div class="col-md-5" id="right-form" style="margin-left:13%">
                 <div class="fieldWrapper">
                     {{form.collectors.errors}}
-                    {{form.collectors.label_tag}}</br>
+                    {% trans form.collectors.label_tag %}</br>
                     {{form.collectors}}
                 </div>
                 <div class="fieldWrapper">
                     {{form.recorded_from_date.errors}} {{form.recorded_to_date.errors}}
-                    <label>Recording date:</label></br>
+                    <label>{% trans "Recording date" %}:</label></br>
                     {{form.recorded_from_date}} <span style="font-size:3em" aria-hidden="true">-</span> {{form.recorded_to_date}}
                 </div>
                 <div class="fieldWrapper">
                     {{form.item_status_errors}}
-                    <label>Item status : </label></br>
+                    <label>{% trans "Item status" %} : </label></br>
                     <ul id="id_item_status" style="margin-left:-40px">
                         {%ifequal query.item_status 'pub'%}
-                            <li><label for="id_item_status_0">no preference</label><input id="id_item_status_0" type="radio" value="1" name="item_status"></input></li>
-                            <li><label for="id_item_status_1">Published</label><input id="id_item_status_1" type="radio" value="pub" name="item_status" checked="checked"></input></li>
-                            <li><label for="id_item_status_2">Unpublished</label><input id="id_item_status_2" type="radio" value="unpub" name="item_status"></input></li>
+                            <li><label for="id_item_status_0">{% trans "no preference" %}</label><input id="id_item_status_0" type="radio" value="1" name="item_status"></input></li>
+                            <li><label for="id_item_status_1">{% trans "Published" %}</label><input id="id_item_status_1" type="radio" value="pub" name="item_status" checked="checked"></input></li>
+                            <li><label for="id_item_status_2">{% trans "Unpublished" %}</label><input id="id_item_status_2" type="radio" value="unpub" name="item_status"></input></li>
                         {%else%}
                             {%ifequal query.item_status 'unpub'%}
-                                <li><label for="id_item_status_0">no preference</label><input id="id_item_status_0" type="radio" value="1" name="item_status"></input></li>
-                                <li><label for="id_item_status_1">Published</label><input id="id_item_status_1" type="radio" value="pub" name="item_status"></input></li>
-                                <li><label for="id_item_status_2">Unpublished</label><input id="id_item_status_2" type="radio" value="unpub" name="item_status" checked="checked"></input></li>
+                                <li><label for="id_item_status_0">{% trans "no preference" %}</label><input id="id_item_status_0" type="radio" value="1" name="item_status"></input></li>
+                                <li><label for="id_item_status_1">{% trans "Published" %}</label><input id="id_item_status_1" type="radio" value="pub" name="item_status"></input></li>
+                                <li><label for="id_item_status_2">{% trans "Unpublished" %}</label><input id="id_item_status_2" type="radio" value="unpub" name="item_status" checked="checked"></input></li>
                             {%else%}
-                                <li><label for="id_item_status_0">no preference</label><input id="id_item_status_0" type="radio" value="1" name="item_status" checked="checked"></input></li>
-                                <li><label for="id_item_status_1">Published</label><input id="id_item_status_1" type="radio" value="pub" name="item_status"></input></li>
-                                <li><label for="id_item_status_2">Unpublished</label><input id="id_item_status_2" type="radio" value="unpub" name="item_status"></input></li>
+                                <li><label for="id_item_status_0">{% trans "no preference" %}</label><input id="id_item_status_0" type="radio" value="1" name="item_status" checked="checked"></input></li>
+                                <li><label for="id_item_status_1">{% trans "Published" %}</label><input id="id_item_status_1" type="radio" value="pub" name="item_status"></input></li>
+                                <li><label for="id_item_status_2">{% trans "Unpublished" %}</label><input id="id_item_status_2" type="radio" value="unpub" name="item_status"></input></li>
                             {%endifequal%}
                         {%endifequal%}
                     </ul>
                 </div>
                 <div class="fieldWrapper">
                     {{form.recording_context.errors}}
-                    {{form.recording_context.label_tag}}</br>
+                    {% trans form.recording_context.label_tag %}</br>
                     {{form.recording_context}}
                 </div>
                 <div class="fieldWrapper">
                     {{form.physical_format.errors}}
-                    {{form.physical_format.label_tag}}</br>
+                    {% trans form.physical_format.label_tag %}</br>
                     {{form.physical_format}}
                 </div>
                 <div class="fieldWrapper">
                     {{form.code.errors}}
-                    {{form.code.label_tag}}</br>
+                    {% trans form.code.label_tag %}</br>
                     {{form.code}}
                 </div>
             </div>

diff --git a/telemeta/templates/search/filters.html b/telemeta/templates/search/filters.html
index dcb575a9ae7812a2d40ea98bbf1879e8f3c30cd8..54a54d8c1808eb2ceac2d904844d927d727d1a56 100644 (file)
--- a/telemeta/templates/search/filters.html
+++ b/telemeta/templates/search/filters.html
@@ -1,50 +1,51 @@
-
+{% load telemeta_utils %}
+{% load i18n %}
 
 <div id="accordeon" style="margin-bottom:20px">
-    <div><a href="#">Filters</a></div>
+    <div><a href="#">{% trans "Filters" %}</a></div>
     <div>
         <table class="table" style="font-size:0.9em">
                 <tr>
                     {% if facets.fields.item_status %}
-                        <td>Item Status</td>
+                        <td>{% trans "Item Status" %}</td>
                         {% for item_status in facets.fields.item_status %}
                             <td><a href="{{ request.get_full_path }}&amp;selected_facets=item_status_exact:{{ item_status.0|urlencode }}">{{ item_status.0 }}</a> <span style="background-color:#6a0307" class="badge">{{ item_status.1 }}</span></td>
                         {% endfor %}
                         {% if Published_count == 0 %}
-                            <td> Published <span class="badge">0</span></td><td></td>
+                            <td> {% trans "Published" %} <span class="badge">0</span></td><td></td>
                         {% endif %}
                         {% if Unpublished_count == 0 %}
-                            <td> Unpublished <span class="badge">0</span></td><td></td>
+                            <td> {% trans "Unpublished" %} <span class="badge">0</span></td><td></td>
                         {% endif %}
                     {% else %}
-                        <td>Item Status</td>
-                        <td>None</td>
+                        <td>{% trans "Item Status" %}</td>
+                        <td>{% trans "None" %}</td>
                     {% endif %}
                 </tr>
                 <tr>
                 {% if facets.fields.digitized %}
-                    <td>Player Status</td>
+                    <td>{% trans "Player Status" %}</td>
                     {% for digitized in facets.fields.digitized %}
                         {% ifequal digitized.0 'T' %}
                             <td><a href="{{ request.get_full_path }}&amp;selected_facets=digitized_exact:{{ digitized.0|urlencode }}">Sound</a> <span style="background-color:#6a0307" class="badge">{{ digitized.1 }}</span></td><td></td>
                         {% endifequal %}
                     {% endfor %}
                     {% if digitized_count == 0 %}
-                        <td> Sound <span class="badge">0</span></td><td></td>
+                        <td> {% trans "Sound" %} <span class="badge">0</span></td><td></td>
                     {% endif %}
                 {% else %}
-                    <td>Player Status</td>
-                    <td>None</td>
+                    <td>{% trans "Player Status" %}</td>
+                    <td>{% trans "None" %}</td>
                 {% endif %}
             </tr>
             <tr>
                 {% if facets.fields.item_acces %}
-                    <td>Access Right</td>
+                    <td>{% trans "Access Right" %}</td>
                     {% if viewable_count != 0 %}
                         <td><a href="{{ request.get_full_path }}&amp;selected_facets=item_acces_exact:{{ 'viewable'|urlencode }}">viewable</a> <span style="background-color:#6a0307" class="badge">{{viewable_count}}</span></td><td></td>
                     {% endif %}
                     {% if viewable_count == 0 %}
-                        <td>viewable <span class="badge">{{viewable_count}}</span></td><td></td>
+                        <td>{% trans "viewable" %} <span class="badge">{{viewable_count}}</span></td><td></td>
                     {% endif %}
                     {% comment %}
                         {% for item_acces in facets.fields.item_acces %}
@@ -55,19 +56,19 @@
                         {% endfor %}
                     {%endcomment%}
                 {% else %}
-                    <td>Access Right</td>
-                    <td>None</td>
+                    <td>{% trans "Access Right" %}</td>
+                    <td>{% trans "None" %}</td>
                 {% endif %}
             </tr>
         </table>
     </div>
 
-    <div><a href="#">Other Filters</a></div>
+    <div><a href="#">{% trans "Other Filters" %}</a></div>
     <div>
         <table class="table" style="font-size:0.9em">
                     <tr>
                         {% if facets.fields.media_type %}
-                            <td>Media Type</td>
+                            <td>{% trans "Media Type" %}</td>
                             {% for media_type in facets.fields.media_type %}
                                 {% ifequal media_type.0 'Audio'%}
                                     <td><a href="{{ request.get_full_path }}&amp;selected_facets=media_type_exact:{{ media_type.0|urlencode }}">{{ media_type.0 }}</a> <span style="background-color:#6a0307" class="badge">{{ media_type.1 }}</span></td>
@@ -77,17 +78,17 @@
                                 {% endifequal %}
                             {% endfor %}
                             {% if Video_count == 0 %}
-                                <td> Video <span class="badge">0</span></td><td></td>
+                                <td> {% trans "Video" %} <span class="badge">0</span></td><td></td>
                             {% endif %}
                             {% if Audio_count == 0 %}
-                                <td> Audio <span class="badge">0</span></td><td></td>
+                                <td> {% trans "Audio" %} <span class="badge">0</span></td><td></td>
                             {% endif %}
                         {% endif %}
                     </tr>
                     <tr>
                     <tr>
                         {% if facets.fields.recording_context %}
-                            <td>Recording Context</td>
+                            <td>{% trans "Recording Context" %}</td>
                             {% for recording_context in facets.fields.recording_context %}
                                 {% ifequal recording_context.0 'Studio'%}
                                     <td><a href="{{ request.get_full_path }}&amp;selected_facets=recording_context_exact:{{ recording_context.0|urlencode }}">{{ recording_context.0 }}</a> <span style="background-color:#6a0307" class="badge">{{ recording_context.1 }}</span></td>
@@ -100,19 +101,19 @@
                                 {% endifequal %}
                             {% endfor %}
                             {% if Terrain_count == 0 %}
-                                <td> Terrain <span class="badge">0</span></td><td></td>
+                                <td> {% trans "Terrain" %} <span class="badge">0</span></td><td></td>
                             {% endif %}
                             {% if Radio_count == 0 %}
-                                <td> Radio <span class="badge">0</span></td><td></td>
+                                <td> {% trans "Radio" %} <span class="badge">0</span></td><td></td>
                             {% endif %}
                             {% if Studio_count == 0 %}
-                                <td> Studio <span class="badge">0</span></td><td></td>
+                                <td> {% trans "Studio" %} <span class="badge">0</span></td><td></td>
                             {% endif %}
                         {% endif %}
                     </tr>
                     <tr>
                         {% if facets.fields.physical_format %}
-                            <td>Physical Format</td>
+                            <td>{% trans "Physical Format" %}</td>
                             {% for physical_format in facets.fields.physical_format %}
                                 {% ifequal physical_format.0 'CDR'%}
                                     <td><a href="{{ request.get_full_path }}&amp;selected_facets=physical_format_exact:{{ physical_format.0|urlencode }}">{{ physical_format.0 }}</a> <span style="background-color:#6a0307" class="badge">{{ physical_format.1 }}</span></td>
@@ -125,13 +126,13 @@
                                 {% endifequal %}
                             {% endfor %}
                             {% if CDR_count == 0 %}
-                                <td> CDR <span class="badge">0</span></td><td></td>
+                                <td> {% trans "CDR" %} <span class="badge">0</span></td><td></td>
                             {% endif %}
                             {% if Disque_count == 0 %}
-                                <td> Disque <span class="badge">0</span></td><td></td>
+                                <td> {% trans "Disque" %} <span class="badge">0</span></td><td></td>
                             {% endif %}
                             {% if Cylindre_count == 0 %}
-                                <td> Cylindre <span class="badge">0</span></a></td><td></td>
+                                <td> {% trans "Cylindre" %} <span class="badge">0</span></a></td><td></td>
                             {% endif %}
                         {% endif %}
                     </tr>