improve translation

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index 0868964df5e72573a17f6cc46ff0650b96321020..1e7f60f02cfbca3e1de532d8ae2444f8b48c64ec 100644 (file)
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 e4ae38f271306ddfbe60a2a7dfdbf206b1bd2f2d..4a25c52a4b222f2d2248c57ae46f36bf8042249a 100644 (file)
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -764,3 +764,68 @@ msgid "%(count)d collection"
 msgid_plural "%(count)d collections"
 msgstr[0] "%(count)d collection"
 msgstr[1] "%(count)d collections"
+
+#: templates/telemeta_default/mediaitem_detail.html:45
+msgid "Edit"
+msgstr "Editer"
+
+#: templates/telemeta_default/mediaitem_detail.html:46
+msgid "Copy"
+msgstr "Copier"
+
+#: templates/telemeta_default/mediaitem_detail.html:48
+msgid "Previous"
+msgstr "Précédent"
+
+#: templates/telemeta_default/mediaitem_detail.html:49
+msgid "Next"
+msgstr "Suivant"
+
+#: templates/telemeta_default/mediaitem_detail.html:127
+msgid "Property"
+msgstr "Propriété"
+
+#: templates/telemeta_default/mediaitem_detail.html:128
+msgid "Unit"
+msgstr "Unité"
+
+#: templates/telemeta_default/mediaitem_detail.html:129
+msgid "Analysis"
+msgstr "Analyse"
+
+#: templates/telemeta_default/mediaitem_detail.html:130
+msgid "Markers"
+msgstr "Marqueurs"
+
+#: templates/telemeta_default/home.html:13
+msgid "Last changes"
+msgstr "Dernières modifications"
+
+#: templates/telemeta_default/home.html:50
+msgid "Playlists"
+msgstr "Listes de lecture"
+
+#: templates/telemeta_default/home.html:52
+msgid "Sound"
+msgstr "Son"
+
+#: templates/telemeta_default/base.html:50
+msgid "Account"
+msgstr "Compte"
+
+#: templates/telemeta_default/base.html:50
+msgid "Help"
+msgstr "Aide"
+
+#: templates/telemeta_default/base.html:49
+msgid "Welcome"
+msgstr "Bienvenue"
+
+#: templates/telemeta_default/admin.html:10
+msgid "General administration"
+msgstr "Administration générale"
+
+#: templates/telemeta_default/admin.html:12
+msgid "Enumerations"
+msgstr "Énumérations"
+

diff --git a/telemeta/templates/telemeta_default/admin.html b/telemeta/templates/telemeta_default/admin.html
index ed307093867a63910e71c9d61db05a5a365e1fbb..61626c3a9db35e41788fb1fbfd3553064a116e03 100644 (file)
--- a/telemeta/templates/telemeta_default/admin.html
+++ b/telemeta/templates/telemeta_default/admin.html
@@ -1,4 +1,6 @@
 {% extends "telemeta/base.html" %}
+{% load telemeta_utils %}
+{% load i18n %}
 
 {% block stylesheets %}
 {{ block.super }}
@@ -6,13 +8,13 @@
 {% endblock %}
 
 {% block content %}
-<h3>Administration</h3>
+<h3>{% trans "Administration" %}</h3>
 <br />
 <div class="tabs">
 <ul>
-<li><a href="/admin/general/">Administration générale</a></li>
-<li><a href="/admin/enumerations/">Enumerations</a></li>
-<li><a href="/admin/instruments/">Instruments</a></li>
+<li><a href="/admin/general/">{% trans "General administration" %}</a></li>
+<li><a href="/admin/enumerations/">{% trans "Enumerations" %}</a></li>
+<li><a href="/admin/instruments/">{% trans "Instruments" %}</a></li>
 </ul>
 </div>
 {% block tab %}

diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html
index 7b5d286d687d3b96d98cca4fb5aa6a4ee9d1580a..63953f453fdf4361641c51458f40f7b743485f7c 100644 (file)
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -33,13 +33,13 @@
 <div id="auth_info">
 {% if user.is_authenticated %}
 <img src="images/user_red.png" style="vertical-align:middle" />
-Welcome, 
+{% trans "Welcome" %}, 
 {% if user.first_name and user.last_name %}
 {{ user.first_name }} {{ user.last_name }} 
 {% else %}
 {{ user.username }}.
 {% endif %}
-Account | Help | 
+{% trans "Account" %} | {% trans "Help" %} | 
 <a href="{% url telemeta-logout %}">{% trans "Sign out" %}
 <img src="images/logout.png" style="vertical-align:middle" /></a>
 {% else %}
@@ -59,7 +59,7 @@ Help |
 {% block menu %}
 <ul>
 {# spaces between li and a elements breaks layout #}
-<li class="darkblue"><a href="/">Home</a></li>
+<li class="darkblue"><a href="/">{% trans "Home" %}</a></li>
 <li class="blue"><a href="{% url telemeta-collections %}">{% trans "Collections" %}</a></li>
 <li class="green"><a href="{% url telemeta-items %}">{% trans "Items" %}</a></li>
 <li class="yellow" {% if not user.is_authenticated %} class="last" {% endif %}><a href="{% url telemeta-geo-continents %}">{% trans "Geo Navigator" %}</a></li>

diff --git a/telemeta/templates/telemeta_default/collection_add.html b/telemeta/templates/telemeta_default/collection_add.html
index 9a2402382908e248bf9e3264315f3c750957a41d..0313f019acc5b5c8854233d5ebd06ff101eeb59b 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_add.html
+++ b/telemeta/templates/telemeta_default/collection_add.html
@@ -1,11 +1,11 @@
 {% extends "telemeta/collection_detail.html" %}
+{% load i18n %}
+{% load telemeta_utils %}
 
 {% block submenu %}
     <div>    
      {% block tools %}
-<!--     <a href="{% url telemeta-collections %}">
-          <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>-->
-<a href="{% url telemeta-collections %}" class="mediaitem_button mediaitem_button_cancel">Cancel</a>
+      <a href="{% url telemeta-collections %}" class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
      {% endblock tools %}
     </div>
 {% endblock %}
@@ -25,12 +25,9 @@
         {% endfor %}
         </table>
         <div align="center">
-<!--         <a href="{% url telemeta-collections %}">
-          <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
-         <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save"/>-->
-<a href="{% url telemeta-collections %}" class="mediaitem_button mediaitem_button_cancel">Cancel</a>
-         <a href="#" class="mediaitem_button mediaitem_button_save"
-   onclick="document.getElementById('_addCollectionForm').submit(); return false;">Save</a>
+            <a href="{% url telemeta-collections %}" class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
+            <a href="#" class="mediaitem_button mediaitem_button_save"
+                onclick="document.getElementById('_addCollectionForm').submit(); return false;">{% trans "Save" %}</a>
         </div>
         </form>
         </div>

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index b02796cebcb4d1fc791ee82acbec835b95463f07..0c4f343be4b02f47cc9ab22b33d5db0e53273807 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -1,6 +1,6 @@
 {% extends "telemeta/base.html" %}
-{% load telemeta_utils %}
 {% load i18n %}
+{% load telemeta_utils %}
 
 {% block head_title %}{% trans "Collection" %}{{collection|prepend:': '}} - {{ block.super }}{% endblock %}
 
@@ -13,16 +13,10 @@
 {% block submenu %}
     <div>
     {% block tools %}
-    <!--<a href="{% url telemeta-collection-dublincore collection.public_id %}">Dublin Core</a>-->
-    <a href="{% url telemeta-collection-dublincore collection.public_id %}" class="mediaitem_button mediaitem_button_dublin_core">Dublin Core</a>
-    
+      <a href="{% url telemeta-collection-dublincore collection.public_id %}" class="mediaitem_button mediaitem_button_dublin_core">Dublin Core</a>
     {% if user.is_authenticated and perms.telemeta.change_mediacollection %}
-    <!-- <a href="{% url telemeta-collection-edit collection.public_id %}">
-      <img src="images/edit_page.png" alt="EDIT" style="vertical-align:middle" /></a>
-      <button><a href="{% url telemeta-collection-copy collection.public_id %}">Copy</a></button>-->
-
-       <a href="{% url telemeta-collection-edit collection.public_id %}" class="mediaitem_button mediaitem_button_edit">Edit</a>
-      <a href="{% url telemeta-collection-copy collection.public_id %}" class="mediaitem_button mediaitem_button_copy">Copy</a>
+      <a href="{% url telemeta-collection-edit collection.public_id %}" class="mediaitem_button mediaitem_button_edit">{% trans "Edit" %}</a>
+      <a href="{% url telemeta-collection-copy collection.public_id %}" class="mediaitem_button mediaitem_button_copy">{% trans "Copy" %}</a>
      {% endif %}
      {% endblock tools %}
     

diff --git a/telemeta/templates/telemeta_default/collection_edit.html b/telemeta/templates/telemeta_default/collection_edit.html
index 2b50d12288e8bda8a69d5c0d780ba0ef49af3562..a619de96d1fc98f7e2cd360c405c42708b21f115 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_edit.html
+++ b/telemeta/templates/telemeta_default/collection_edit.html
@@ -1,9 +1,11 @@
 {% extends "telemeta/collection_detail.html" %}
+{% load i18n %}
+{% load telemeta_utils %}
 
 {% block tools %}
 <!--    <a href="{% url telemeta-collection-detail collection.public_id %}">
      <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>-->
-     <a href="{% url telemeta-collection-detail collection.public_id %}" class="mediaitem_button mediaitem_button_cancel">Cancel</a>
+     <a href="{% url telemeta-collection-detail collection.public_id %}" class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
 {% endblock %}
 
 {% block infos %}
@@ -23,9 +25,9 @@
 <!--         <a href="{% url telemeta-collection-detail collection.public_id %}">
           <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
          <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save"/>-->
-         <a href="{% url telemeta-collection-detail collection.public_id %}" class="mediaitem_button mediaitem_button_cancel">Cancel</a>
+         <a href="{% url telemeta-collection-detail collection.public_id %}" class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
          <a href="#" class="mediaitem_button mediaitem_button_save"
-   onclick="document.getElementById('_editCollectionForm').submit(); return false;">Save</a>
+   onclick="document.getElementById('_editCollectionForm').submit(); return false;">{% trans "Save" %}</a>
         </div>
         </form>
         </div>

diff --git a/telemeta/templates/telemeta_default/collection_list.html b/telemeta/templates/telemeta_default/collection_list.html
index 1528c0491fd5d0d6ae3d5c28178b9a65f18cd059..5f795a0cd9b93fcc5f40899ebda52a9c6262791e 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_list.html
+++ b/telemeta/templates/telemeta_default/collection_list.html
@@ -7,9 +7,7 @@
 {% block submenu %}
     <div class="buttons">  
     {% if user.is_authenticated and perms.telemeta.add_mediacollection %}
-<!--     <button><a href="{% url telemeta-collection-add %}">Add</a></button>-->
-      <a href="{% url telemeta-collection-add %}" class="mediaitem_button mediaitem_button_add">Add</a>
-
+      <a href="{% url telemeta-collection-add %}" class="mediaitem_button mediaitem_button_add">{% trans "Add" %}</a>
     {% endif %}
     </div>
 {% endblock %}

diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index 643cf36fc426f5fd739f1a75d35ca655af7f3148..ce924d1b176c8c29327a81e529bd2cc76fda9fd3 100644 (file)
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -47,7 +47,7 @@
 </div>
 
 <div class="home-description">
-<h3>Playlists</h3>
+<h3>{% trans "Playlists" %}</h3>
   {% for playlist in playlists %}
   <h2>{{ playlist.name }} {% if playlist.is_current %}(current){% endif %}</h2>
     <table class="listing" width="90%">

diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html
index 2bc1a027162fe8e937203ca4bc3a0fd80db3dff7..7410f2f16b5976f0376aa02ab4e83afba0a505f9 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_add.html
+++ b/telemeta/templates/telemeta_default/mediaitem_add.html
@@ -13,7 +13,7 @@
 <!--     <a href="{% url telemeta-item-detail item.public_id %}">
          <img src="images/edit_cancel.png" /></a>-->
  <a href="{% url telemeta-item-detail item.public_id %}"
-           class="roundBorder6 mediaitem_button mediaitem_button_cancel">Cancel</a>
+           class="roundBorder6 mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
     {% endblock tools %}
     
     {% endif %}
@@ -37,13 +37,10 @@
        {% endfor %}
        </table>
        <div align="center">
-<!--        <a href="{% url telemeta-item-detail item.public_id %}">
-         <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
-        <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save" />-->
         <a href="{% url telemeta-item-detail item.public_id %}"
-           class="mediaitem_button mediaitem_button_cancel">Cancel</a>
-<a href="#" class="mediaitem_button mediaitem_button_save"
-   onclick="document.getElementById('_addItemForm').submit(); return false;">Save</a>
+           class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
+        <a href="#" class="mediaitem_button mediaitem_button_save"
+   onclick="document.getElementById('_addItemForm').submit(); return false;">{% trans "Save" %}</a>
        </div>
      </form>
     </div>

diff --git a/telemeta/templates/telemeta_default/mediaitem_copy.html b/telemeta/templates/telemeta_default/mediaitem_copy.html
index 88aa569070f6e573f758af0e2b5a3d3930f3f573..b97add5dd782fbef56d12607ccd543390ae00ac8 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_copy.html
+++ b/telemeta/templates/telemeta_default/mediaitem_copy.html
@@ -13,7 +13,7 @@
     {% block tools %}
 <!--     <a href="{% url telemeta-item-detail item.public_id %}">
      <img src="images/edit_cancel.png" /></a>-->
-    <a href="{% url telemeta-item-detail item.public_id %}" class="mediaitem_button mediaitem_button_cancel">Cancel</a>
+    <a href="{% url telemeta-item-detail item.public_id %}" class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
     {% endblock tools %}
     {% endif %}
 </div>
@@ -36,12 +36,9 @@
        {% endfor %}
        </table>
        <div align="center">
-<!--        <a href="{% url telemeta-item-detail item.public_id %}">
-         <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
-        <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save" />-->
-<a href="{% url telemeta-item-detail item.public_id %}" class="mediaitem_button mediaitem_button_cancel">Cancel</a>
-         <a href="#" class="mediaitem_button mediaitem_button_save"
-   onclick="document.getElementById('_mediaItemCopyForm').submit(); return false;">Save</a>
+           <a href="{% url telemeta-item-detail item.public_id %}" class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
+         <a href="#" class="mediaitem_button mediaitem_button_save" 
+            onclick="document.getElementById('_mediaItemCopyForm').submit(); return false;">{% trans "Save" %}</a>
        </div>
      </form>
     </div>

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 41f4aad4776f22f4e11c8e20e664bfcf4d0a822e..e55d1a29bfc2f3d10991471e8d96ab35c4df2551 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -40,21 +40,13 @@
 {% block submenu %}
 <div>
     {% block tools %}
-    <!--<a href="{% url telemeta-item-dublincore item.public_id %}">Dublin Core</a>-->
-    <a href="{% url telemeta-item-dublincore item.public_id %}" class="mediaitem_button mediaitem_button_dublin_core">Dublin Core</a>
+     <a href="{% url telemeta-item-dublincore item.public_id %}" class="mediaitem_button mediaitem_button_dublin_core">Dublin Core</a>
     {% if user.is_authenticated and perms.telemeta.change_mediaitem %}
-
-    <!--<a href="{% url telemeta-item-edit item.public_id %}"><img src="images/edit_page.png" style="vertical-align:middle" alt="EDIT" /></a>
-    <button><a href="{% url telemeta-item-copy item.public_id %}">Copy</a></button>-->
-    <a href="{% url telemeta-item-edit item.public_id %}" class="mediaitem_button mediaitem_button_edit">Edit</a>
-    <a href="{% url telemeta-item-copy item.public_id %}" class="mediaitem_button mediaitem_button_copy">Copy</a>
-
-
+     <a href="{% url telemeta-item-edit item.public_id %}" class="mediaitem_button mediaitem_button_edit">{% trans "Edit" %}</a>
+     <a href="{% url telemeta-item-copy item.public_id %}" class="mediaitem_button mediaitem_button_copy">{% trans "Copy" %}</a>
     {% endif %}
-    <!--<a href="{% url telemeta-item-detail previous %}"><img src="images/previous.png" style="vertical-align:middle" alt="PREVIOUS" /></a>
-    <a href="{% url telemeta-item-detail next %}"><img src="images/next.png" style="vertical-align:middle" alt="NEXT" /></a>-->
-     <a href="{% url telemeta-item-detail previous %}" class="mediaitem_button mediaitem_button_previous">Previous</a>
-    <a href="{% url telemeta-item-detail next %}" class="mediaitem_button mediaitem_button_next">Next</a>
+     <a href="{% url telemeta-item-detail previous %}" class="mediaitem_button mediaitem_button_previous">{% trans "Previous" %}</a>
+    <a href="{% url telemeta-item-detail next %}" class="mediaitem_button mediaitem_button_next">{% trans "Next" %}</a>
     {% endblock tools %}
 </div>
 {% endblock %}
@@ -114,8 +106,8 @@
                             <li><a href="#">Analysis</a></li>
                             <li><a href="#">Markers</a></li>
                         </ul>-->
-            <a id="tab_analysis" name ="analyzer_div_id" href="#">Analysis</a>
-            <a id="tab_markers" name="markers_div_id" href="#">Markers</a>
+            <a id="tab_analysis" name ="analyzer_div_id" href="#">{% trans "Analysis" %}</a>
+            <a id="tab_markers" name="markers_div_id" href="#">{% trans "Markers" %}</a>
         </div>
         <!--<div class="tab_container_">-->
         <!--        <div id="tab1" class="tab_content">
@@ -130,9 +122,9 @@
         <div class="analyzer" id="analyzer_div_id">
             <table width="100%">
                 <tr class="analyzer-title">
-                    <td>Property</td>
-                    <td>Value</td>
-                    <td>Unit</td>
+                    <td>{% trans "Property" %}</td>
+                    <td>{% trans "Value" %}</td>
+                    <td>{% trans "Unit" %}</td>
                 </tr>
                 {% for analyser in analysers %}
                 <tr class="analyzer-line">

diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html
index 1b320363d5ae103fdd6d833b2ef9bc38d099f88f..3d9adc176f97fc378b79ea0439424b161d89b375 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_edit.html
+++ b/telemeta/templates/telemeta_default/mediaitem_edit.html
@@ -1,9 +1,11 @@
 {% extends "telemeta/mediaitem_detail.html" %}
+{% load i18n %}
+{% load telemeta_utils %}
 
     {% block tools %}
 <!--     <a href="{% url telemeta-item-detail item.public_id %}">
          <img src="images/edit_cancel.png" /></a>-->
- <a href="{% url telemeta-item-detail item.public_id %}" class="mediaitem_button mediaitem_button_cancel">Cancel</a>
+ <a href="{% url telemeta-item-detail item.public_id %}" class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
     {% endblock tools %}
 
   {% block infos %}    
@@ -20,13 +22,11 @@
        {% endfor %}
        </table>
        <div align="center">
-<!--        <a href="{% url telemeta-item-detail item.public_id %}">
-         <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>-->
+
         <a href="{% url telemeta-item-detail item.public_id %}"
-           class="mediaitem_button mediaitem_button_cancel">Cancel</a>
-<a href="#" class="mediaitem_button mediaitem_button_save"
-   onclick="document.getElementById('_editItemForm').submit(); return false;">Save</a>
-<!--           <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save" />-->
+           class="mediaitem_button mediaitem_button_cancel">{% trans "Cancel" %}</a>
+        <a href="#" class="mediaitem_button mediaitem_button_save"
+   onclick="document.getElementById('_editItemForm').submit(); return false;">{% trans "Save" %}</a>
        </div>
      </form>
     </div>

diff --git a/telemeta/templates/telemeta_default/mediaitem_list.html b/telemeta/templates/telemeta_default/mediaitem_list.html
index 188bef52644acea97f8cd6ff33a0dc4e74e53bf7..6726302de11cdaffb169a387ebd58e82f3fa5820 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_list.html
+++ b/telemeta/templates/telemeta_default/mediaitem_list.html
@@ -8,8 +8,7 @@
 {% block submenu %}
     <div class="buttons">  
     {% if user.is_authenticated and perms.telemeta.add_mediaitem %}
-<!--     <button><a href="{% url telemeta-item-add %}">Add</a></button>-->
-<a href="{% url telemeta-item-add %}" class="mediaitem_button mediaitem_button_add">Add</a>
+      <a href="{% url telemeta-item-add %}" class="mediaitem_button mediaitem_button_add">{% trans "Add" %}</a>
     {% endif %}
     </div>
 {% endblock %}