Home Explore Help
Sign In
FFDN
/
celutz
3
1
Fork 2
Files Issues 18 Pull Requests 0 Wiki
Browse Source

mise en place des traductions

julpec 8 years ago
parent
994ea9d5e2
commit
5d5b7c9641
5 changed files with 44 additions and 39 deletions
Unified View Show Diff Stats
  1. 9 8
      panorama/models.py
  2. 1 0
      panorama/templates/panorama/base.html
  3. 5 4
      panorama/templates/panorama/main.html
  4. 10 9
      panorama/templates/panorama/sidebar.html
  5. 19 18
      panorama/templates/panorama/view.html

+ 9 - 8
panorama/models.py
View File 

@@ -11,6 +11,7 @@ from django.core.exceptions import ValidationError
 
 from django.core.validators import MinValueValidator, MaxValueValidator
 
 from django.core.validators import MinValueValidator, MaxValueValidator
 
 from django.core.urlresolvers import reverse
 
 from django.core.urlresolvers import reverse
 
 from django.utils.encoding import python_2_unicode_compatible
 
 from django.utils.encoding import python_2_unicode_compatible
 
+from django.utils.translation import ugettext as _
 
 
 
 from .tasks import generate_tiles
 
 from .tasks import generate_tiles
 
 from .utils import makedirs, path_exists
 
 from .utils import makedirs, path_exists
 
@@ -21,13 +22,13 @@ EARTH_RADIUS = 6371009
 
 
 
 class Point(models.Model):
 
 class Point(models.Model):
 
     """Geographical point, with altitude."""
 
     """Geographical point, with altitude."""
 
-    latitude = models.FloatField(verbose_name="latitude", help_text="In degrees",
 
+    latitude = models.FloatField(verbose_name=_("latitude"), help_text=_("In degrees"),
 
                                  validators=[MinValueValidator(-90),
 
                                  validators=[MinValueValidator(-90),
 
                                              MaxValueValidator(90)])
 
                                              MaxValueValidator(90)])
 
-    longitude = models.FloatField(verbose_name="longitude", help_text="In degrees",
 
+    longitude = models.FloatField(verbose_name=_("longitude"), help_text=_("In degrees"),
 
                                  validators=[MinValueValidator(-180),
 
                                  validators=[MinValueValidator(-180),
 
                                              MaxValueValidator(180)])
 
                                              MaxValueValidator(180)])
 
-    altitude = models.FloatField(verbose_name="altitude", help_text="In meters",
 
+    altitude = models.FloatField(verbose_name=_("altitude"), help_text=_("In meters"),
 
                                  validators=[MinValueValidator(0.)])
 
                                  validators=[MinValueValidator(0.)])
 
 
 
     @property
 
     @property
 
@@ -103,17 +104,17 @@ class Point(models.Model):
 
 @python_2_unicode_compatible
 
 @python_2_unicode_compatible
 
 class ReferencePoint(Point):
 
 class ReferencePoint(Point):
 
     """Reference point, to be used"""
 
     """Reference point, to be used"""
 
-    name = models.CharField(verbose_name="name", max_length=255,
 
-                            help_text="Name of the point")
 
+    name = models.CharField(verbose_name=_("name"), max_length=255,
 
+                            help_text=_("Name of the point"))
 
 
 
     def __str__(self):
 
     def __str__(self):
 
         return self.name
 
         return self.name
 
 
 
 
 
 class Panorama(ReferencePoint):
 
 class Panorama(ReferencePoint):
 
-    loop = models.BooleanField(default=False, verbose_name="360° panorama",
 
-                               help_text="Whether the panorama loops around the edges")
 
-    image = models.ImageField(verbose_name="image", upload_to="pano",
 
+    loop = models.BooleanField(default=False, verbose_name=_("360° panorama"),
 
+                               help_text=_("Whether the panorama loops around the edges"))
 
+    image = models.ImageField(verbose_name=_("image"), upload_to="pano",
 
                               width_field="image_width",
 
                               width_field="image_width",
 
                               height_field="image_height")
 
                               height_field="image_height")
 
     image_width = models.PositiveIntegerField(default=0)
 
     image_width = models.PositiveIntegerField(default=0)

+ 1 - 0
panorama/templates/panorama/base.html
View File 

@@ -1,5 +1,6 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 {% load staticfiles %}
 
 {% load staticfiles %}
 
+{% load i18n %}
 
 
 
 {# TODO: change lang? #}
 
 {# TODO: change lang? #}
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">

+ 5 - 4
panorama/templates/panorama/main.html
View File 

@@ -1,8 +1,9 @@
 
 {% extends "panorama/base.html" %}
 
 {% extends "panorama/base.html" %}
 
 {% load panorama_url %}
 
 {% load panorama_url %}
 
 {% load distance_filter %}
 
 {% load distance_filter %}
 
+{% load i18n %}
 
 
 
-{% block title %}Celutz, a panorama viewer{% endblock title %}
 
+{% block title %}{% trans "Celutz, a panorama viewer"%}{% endblock title %}
 
 
 
 {% block top-menu-title %} 
 {% block top-menu-title %} 
     <a class="navbar-brand" href="{% url 'panorama:main' %}">Celutz</a> 
     <a class="navbar-brand" href="{% url 'panorama:main' %}">Celutz</a> 
@@ -11,11 +12,11 @@
 
 {% block top-menu-items %}
 
 {% block top-menu-items %}
 
 <ul class="nav navbar-right top-nav">
 
 <ul class="nav navbar-right top-nav">
 
     <li class="dropdown">
 
     <li class="dropdown">
 
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-info-circle"></i>  à propos<b class="caret"></b></a>
 
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-info-circle"></i>  {% trans "About" %}<b class="caret"></b></a>
 
         <ul class="dropdown-menu">
 
         <ul class="dropdown-menu">
 
             <li>
 
             <li>
 
-               <p>Celutz is a tool for managing and referencing panoramic photos.
 
-               <a href="https://code.ffdn.org/FFDN/celutz/">Project homepage</a>
 
+               <p>{% blocktrans %}Celutz is a tool for managing and referencing panoramic photos{% endblocktrans %}.
 
+               <a href="https://code.ffdn.org/FFDN/celutz/">{% trans "Project homepage" %}</a>
 
             </li>
 
             </li>
 
         </ul>
 
         </ul>
 
     </li>
 
     </li>

+ 10 - 9
panorama/templates/panorama/sidebar.html
View File 

@@ -1,10 +1,11 @@
 
+{% load i18n %}
 
 <div class="collapse navbar-collapse navbar-ex1-collapse">
 
 <div class="collapse navbar-collapse navbar-ex1-collapse">
 
     <ul class="nav navbar-nav side-nav">
 
     <ul class="nav navbar-nav side-nav">
 
         <li>
 
         <li>
 
-            <a href="{% url 'panorama:main' %}"><i class="fa fa-fw fa-home"></i> Map</a>
 
+            <a href="{% url 'panorama:main' %}"><i class="fa fa-fw fa-home"></i> {% trans "Map" %}</a>
 
         </li>
 
         </li>
 
         <li>
 
         <li>
 
-            <a href="javascript:;" data-toggle="collapse" data-target="#panos"><i class="fa fa-fw fa-image"></i> Panoramas<i class="fa fa-fw fa-caret-down"></i></a>
 
+            <a href="javascript:;" data-toggle="collapse" data-target="#panos"><i class="fa fa-fw fa-image"></i> {% trans "Panoramas" %}<i class="fa fa-fw fa-caret-down"></i></a>
 
             <ul id="panos" class="collapse">
 
             <ul id="panos" class="collapse">
 
               {% for pano in panoramas %}
 
               {% for pano in panoramas %}
 
               <li><a href="{% url 'panorama:view_pano' pano.id %}"><i class="fa fa-fw fa-eye"></i> {{ pano.name }}</a></li>
 
               <li><a href="{% url 'panorama:view_pano' pano.id %}"><i class="fa fa-fw fa-eye"></i> {{ pano.name }}</a></li>
 
@@ -12,18 +13,18 @@
 
             </ul>
 
             </ul>
 
         </li>
 
         </li>
 
         <li>
 
         <li>
 
-            <a href="javascript:;" data-toggle="collapse" data-target="#locate-existing"><i class="fa fa-fw fa-location-arrow"></i> Locate existing point<i class="fa fa-fw fa-caret-down"></i></a>
 
+            <a href="javascript:;" data-toggle="collapse" data-target="#locate-existing"><i class="fa fa-fw fa-location-arrow"></i> {% trans "Locate existing point" %}<i class="fa fa-fw fa-caret-down"></i></a>
 
             <ul id="locate-existing" class="collapse">
 
             <ul id="locate-existing" class="collapse">
 
                 <li>
 
                 <li>
 
                     <form action="{% url 'panorama:locate_refpoint' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
 
                     <form action="{% url 'panorama:locate_refpoint' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
 
                       {{ refpoints_form.as_p }}
 
                       {{ refpoints_form.as_p }}
 
-                      <input type="submit" value="Locate" />
 
+                      <input type="submit" value={% trans "Locate" %} />
 
                     </form>
 
                     </form>
 
                 </li>
 
                 </li>
 
             </ul>
 
             </ul>
 
         </li>
 
         </li>
 
         <li>
 
         <li>
 
-            <a href="javascript:;" data-toggle="collapse" data-target="#locate-gps"><i class="fa fa-fw fa-circle-thin"></i> Locate GPS point<i class="fa fa-fw fa-caret-down"></i></a>
 
+            <a href="javascript:;" data-toggle="collapse" data-target="#locate-gps"><i class="fa fa-fw fa-circle-thin"></i> {% trans "Locate GPS point" %}<i class="fa fa-fw fa-caret-down"></i></a>
 
             <ul id="locate-gps" class="collapse">
 
             <ul id="locate-gps" class="collapse">
 
                 <li>
 
                 <li>
 
                     <form action="{% url 'panorama:locate_custompoint' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
 
                     <form action="{% url 'panorama:locate_custompoint' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
 
@@ -31,23 +32,23 @@
 
                         {{ custom_point_form.longitude.label_tag }}{{ custom_point_form.longitude }}
 
                         {{ custom_point_form.longitude.label_tag }}{{ custom_point_form.longitude }}
 
                         {{ custom_point_form.altitude.label_tag }}{{ custom_point_form.altitude }}
 
                         {{ custom_point_form.altitude.label_tag }}{{ custom_point_form.altitude }}
 
                         </br>
 
                         </br>
 
-                        <input type="submit" value="Locate" />
 
+                        <input type="submit" value={% trans "Locate" %} />
 
                     </form>
 
                     </form>
 
                 </li>
 
                 </li>
 
             </ul>
 
             </ul>
 
         </li>
 
         </li>
 
         <li>
 
         <li>
 
-            <a href="javascript:;" data-toggle="collapse" data-target="#new-pano"><i class="fa fa-fw fa-plus-square"></i> Add new panorama<i class="fa fa-fw fa-caret-down"></i></a>
 
+            <a href="javascript:;" data-toggle="collapse" data-target="#new-pano"><i class="fa fa-fw fa-plus-square"></i> {% trans "Add new panorama" %}<i class="fa fa-fw fa-caret-down"></i></a>
 
             <ul id="new-pano" class="collapse">
 
             <ul id="new-pano" class="collapse">
 
                 <li>
 
                 <li>
 
                     <form action="{% url 'panorama:new' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
 
                     <form action="{% url 'panorama:new' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
 
                         {{ newpanorama_form.name.label_tag }}{{ newpanorama_form.name }}
 
                         {{ newpanorama_form.name.label_tag }}{{ newpanorama_form.name }}
 
                         {{ newpanorama_form.image.label_tag }}{{ newpanorama_form.image }}
 
                         {{ newpanorama_form.image.label_tag }}{{ newpanorama_form.image }}
 
-                        <label for="{{ newpanorama_form.loop.id_for_label }}">{{ newpanorama_form.loop }} 360° panorama</label>
 
+                        <label for="{{ newpanorama_form.loop.id_for_label }}">{{ newpanorama_form.loop }} {% trans "360° panorama" %}</label>
 
                         {{ newpanorama_form.latitude.label_tag }}{{ newpanorama_form.latitude }}
 
                         {{ newpanorama_form.latitude.label_tag }}{{ newpanorama_form.latitude }}
 
                         {{ newpanorama_form.longitude.label_tag }}{{ newpanorama_form.longitude }}
 
                         {{ newpanorama_form.longitude.label_tag }}{{ newpanorama_form.longitude }}
 
                         {{ newpanorama_form.altitude.label_tag }}{{ newpanorama_form.altitude }}
 
                         {{ newpanorama_form.altitude.label_tag }}{{ newpanorama_form.altitude }}
 
-                        <input type="submit" value="Add" />
 
+                        <input type="submit" value={% trans "Add" %} />
 
                     </form>
 
                     </form>
 
                 </li>
 
                 </li>
 
             </ul>
 
             </ul>

+ 19 - 18
panorama/templates/panorama/view.html
View File 

@@ -1,6 +1,7 @@
 
 {% extends "panorama/base.html" %}
 
 {% extends "panorama/base.html" %}
 
 {% load staticfiles %}
 
 {% load staticfiles %}
 
 {% load distance_filter %}
 
 {% load distance_filter %}
 
+{% load i18n %}
 
 
 
 {% block title %}{{ panorama.name }}{% endblock title %}
 
 {% block title %}{{ panorama.name }}{% endblock title %}
 
 
 
@@ -84,36 +85,36 @@
 
 
 
 {% block top-menu-items %}
 
 {% block top-menu-items %}
 
     <li class="dropdown">
 
     <li class="dropdown">
 
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-question-circle"></i>  Params<b class="caret"></b></a>
 
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-question-circle"></i>  {% trans "Parameters" %}<b class="caret"></b></a>
 
         <ul class="dropdown-menu">
 
         <ul class="dropdown-menu">
 
             <li>
 
             <li>
 
                 <div>
 
                 <div>
 
-                  <p>latitude :   <em><span id="pos_lat">{{ panorama.latitude }}</span>°</em></p>
 
-                  <p>longitude : <em><span id="pos_lon">{{ panorama.longitude }}</span>°</em></p>
 
-                  <p>altitude : <em><span id="pos_alt">{{ panorama.altitude }}</span> m</em></p>
 
+                  <p>{% trans "latitude" %} :   <em><span id="pos_lat">{{ panorama.latitude }}</span>°</em></p>
 
+                  <p>{% trans "longitude" %} : <em><span id="pos_lon">{{ panorama.longitude }}</span>°</em></p>
 
+                  <p>{% trans "altitude" %} : <em><span id="pos_alt">{{ panorama.altitude }}</span> m</em></p>
 
                 </div>
 
                 </div>
 
             </li>
 
             </li>
 
         </ul>
 
         </ul>
 
     </li>
 
     </li>
 
     <li class="dropdown">
 
     <li class="dropdown">
 
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-gears"></i>  Controls<b class="caret"></b></a>
 
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-gears"></i>  {% trans "Controls" %}<b class="caret"></b></a>
 
         <ul class="dropdown-menu">
 
         <ul class="dropdown-menu">
 
             <li>
 
             <li>
 
-                  <label>Zoom : <input type="range" min="0" max="2" value="2" id="zoom_ctrl"/></label>
 
-                  <label>Cap : <input type="number" min="0" max="360" step="10" value="0" autofocus="" id="angle_ctrl"/></label>
 
-                  <label>Élévation : <input type="number" min="-90" max="90" step="1" value="0" autofocus="" id="elvtn_ctrl"/></label>
 
+                  <label>{% trans "Zoom" %} : <input type="range" min="0" max="2" value="2" id="zoom_ctrl"/></label>
 
+                  <label>{% trans "Cap" %} : <input type="number" min="0" max="360" step="10" value="0" autofocus="" id="angle_ctrl"/></label>
 
+                  <label>{% trans "Élévation" %} : <input type="number" min="-90" max="90" step="1" value="0" autofocus="" id="elvtn_ctrl"/></label>
 
             </li>
 
             </li>
 
         </ul>
 
         </ul>
 
     </li>
 
     </li>
 
     <li class="dropdown">
 
     <li class="dropdown">
 
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-search"></i>  Localiser<b class="caret"></b></a>
 
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-search"></i>  {% trans "Localize" %}<b class="caret"></b></a>
 
         <ul class="dropdown-menu">
 
         <ul class="dropdown-menu">
 
             <li>
 
             <li>
 
-                  <label class="form_col" title="La latitude ϵ [-90°, 90°]. Ex: 12.55257">Latitude :
 
+                  <label class="form_col" title="La latitude ϵ [-90°, 90°]. Ex: 12.55257">{% trans "Latitude" %} :
 
                     <input  name="loca_latitude" type="number" min="-90" max="90"  id="loca_latitude"/></label>
 
                     <input  name="loca_latitude" type="number" min="-90" max="90"  id="loca_latitude"/></label>
 
-                  <label class="form_col" title="La longitude ϵ [-180°, 180°]. Ex: 144.14723">Longitude :
 
+                  <label class="form_col" title="La longitude ϵ [-180°, 180°]. Ex: 144.14723">{% trans "Longitude" %} :
 
                     <input name="loca_longitude" type="number" min="-180" max="180" id="loca_longitude"/></label>
 
                     <input name="loca_longitude" type="number" min="-180" max="180" id="loca_longitude"/></label>
 
-                  <label class="form_col" title="L'altitude positive Ex: 170">Altitude :
 
+                  <label class="form_col" title="L'altitude positive Ex: 170">{% trans "Altitude" %} :
 
                     <input  name="loca_altitude" type="number" min="-400" id="loca_altitude"/></label>
 
                     <input  name="loca_altitude" type="number" min="-400" id="loca_altitude"/></label>
 
                   <div class="answer">
 
                   <div class="answer">
 
                     <input type="button" value="Localiser" id="loca_button"/>
 
                     <input type="button" value="Localiser" id="loca_button"/>
 
@@ -123,11 +124,11 @@
 
         </ul>
 
         </ul>
 
     </li>
 
     </li>
 
     <li class="dropdown">
 
     <li class="dropdown">
 
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-info-circle"></i>  à propos<b class="caret"></b></a>
 
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-info-circle"></i>  {% trans "About" %}<b class="caret"></b></a>
 
         <ul class="dropdown-menu">
 
         <ul class="dropdown-menu">
 
             <li>
 
             <li>
 
-               <p>Celutz is a tool for managing and referencing panoramic photos.
 
-               <a href="https://code.ffdn.org/FFDN/celutz/">Project homepage</a>
 
+               <p>{% blocktrans %}Celutz is a tool for managing and referencing panoramic photos{% endblocktrans %}.
 
+               <a href="https://code.ffdn.org/FFDN/celutz/">{% trans "Project homepage" %}</a>
 
             </li>
 
             </li>
 
         </ul>
 
         </ul>
 
     </li>
 
     </li>
 
@@ -157,9 +158,9 @@ style="padding-left:0px"
 
         <option>{{ refpoint.name }}</option>
 
         <option>{{ refpoint.name }}</option>
 
         {% endfor %}
 
         {% endfor %}
 
       </select>
 
       </select>
 
-      <input type="button" id="do-insert" value="insérer"/>
 
-      <input type="button" id="do-delete" value="supprimer"/>
 
-      <input type="button" id="do-cancel" value="annuler"/>
 
+      <input type="button" id="do-insert" value={% trans "insert" %}/>
 
+      <input type="button" id="do-delete" value={% trans "delete" %}/>
 
+      <input type="button" id="do-cancel" value={% trans "cancel" %}/>
 
     </p>
 
     </p>
 
     <p id="res"></p>
 
     <p id="res"></p>
 
     <div id="mapid"></div>
 
     <div id="mapid"></div>