Better labels - french traduction (fixes #65)

6 files changed, 126 insertions, 55 deletions

diff --git a/.gitignore b/.gitignore
index a02a417..b2d6d32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.pyc
 *.swp
+*.mo
 chimere/settings.py
 chimere/static/icons/*
 chimere/static/upload/*
diff --git a/chimere/locale/fr/LC_MESSAGES/django.po b/chimere/locale/fr/LC_MESSAGES/django.po
index 1b46b24..8563abf 100644
--- a/chimere/locale/fr/LC_MESSAGES/django.po
+++ b/chimere/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-19 03:17+0100\n"
+"POT-Creation-Date: 2010-11-20 02:16+0100\n"
 "PO-Revision-Date: 2010-03-20 20:00+0100\n"
 "Last-Translator: Étienne Loks <etienne.loks@peacefrogs.net>\n"
 "MIME-Version: 1.0\n"
@@ -30,47 +30,51 @@ msgstr "Ajout d'un point remarquable"
 msgid "Add a new route"
 msgstr "Ajout d'un nouveau trajet"
 
-#: main/actions.py:38
+#: main/actions.py:39
+msgid "RSS feeds"
+msgstr "Flux RSS"
+
+#: main/actions.py:42
 msgid "Contact us"
 msgstr "Nous contacter"
 
-#: main/forms.py:56
+#: main/forms.py:72
 msgid "New submission for"
 msgstr "Nouvelle proposition pour"
 
-#: main/forms.py:57
+#: main/forms.py:73
 #, python-format
 msgid "The new item \"%s\" has been submited in the category: "
 msgstr "Le nouvel élément « %s » a été proposé dans la catégorie : "
 
-#: main/forms.py:59
+#: main/forms.py:75
 msgid "To valid, precise or unvalid this item: "
 msgstr "Pour valider, préciser ou rejeter cet élément : "
 
-#: main/forms.py:68
+#: main/forms.py:84
 msgid "Email (optional)"
 msgstr "Courriel (optionnel) "
 
-#: main/forms.py:69
+#: main/forms.py:85
 msgid "Object"
 msgstr "Objet"
 
-#: main/forms.py:127
+#: main/forms.py:143
 msgid "End date has been set with no start date"
 msgstr "Une date de fin a été donnée sans date de début"
 
-#: main/forms.py:248 main/models.py:446
+#: main/forms.py:268 main/models.py:449
 msgid "Area"
 msgstr "Zone"
 
 #: main/models.py:37 main/models.py:90 main/models.py:111 main/models.py:124
-#: main/models.py:138 main/models.py:188 main/models.py:269 main/models.py:430
-#: main/models.py:472
+#: main/models.py:138 main/models.py:188 main/models.py:272 main/models.py:433
+#: main/models.py:475
 msgid "Name"
 msgstr "Nom"
 
 #: main/models.py:38 main/models.py:112 main/models.py:139 main/models.py:196
-#: main/models.py:277 main/models.py:434 main/models.py:474
+#: main/models.py:280 main/models.py:437 main/models.py:477
 msgid "Available"
 msgstr "Disponible"
 
@@ -98,8 +102,8 @@ msgstr "Thème de couleur"
 msgid "Code"
 msgstr "Code"
 
-#: main/models.py:100 main/models.py:113 main/models.py:144 main/models.py:433
-#: main/models.py:473
+#: main/models.py:100 main/models.py:113 main/models.py:144 main/models.py:436
+#: main/models.py:476
 msgid "Order"
 msgstr "Ordre"
 
@@ -111,16 +115,16 @@ msgstr "Couleur"
 msgid "Category"
 msgstr "Catégorie"
 
-#: main/models.py:125 main/models.py:191 main/models.py:272
+#: main/models.py:125 main/models.py:191 main/models.py:275
 #: templates/edit.html:35 templates/edit_route.html:35
 msgid "Image"
 msgstr "Image"
 
-#: main/models.py:127 main/models.py:193 main/models.py:274
+#: main/models.py:127 main/models.py:193 main/models.py:277
 msgid "Height"
 msgstr "Hauteur"
 
-#: main/models.py:128 main/models.py:194 main/models.py:275
+#: main/models.py:128 main/models.py:194 main/models.py:278
 msgid "Width"
 msgstr "Largeur"
 
@@ -132,7 +136,7 @@ msgstr "Icône"
 msgid "Marker"
 msgstr "Point d'intérêt"
 
-#: main/models.py:146 main/models.py:271 main/models.py:297
+#: main/models.py:146 main/models.py:274 main/models.py:300
 #: templates/edit_route.html:29
 msgid "Route"
 msgstr "Trajet"
@@ -153,82 +157,86 @@ msgstr "Sous-catégorie"
 msgid "Localisation"
 msgstr "Localisation"
 
-#: main/models.py:195 main/models.py:276
+#: main/models.py:195 main/models.py:279
 msgid "Submited"
 msgstr "Soumis"
 
-#: main/models.py:197 main/models.py:278
+#: main/models.py:197 main/models.py:281
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: main/models.py:201 main/models.py:289
+#: main/models.py:201 main/models.py:292
 msgid "Status"
 msgstr "État"
 
-#: main/models.py:203 main/models.py:283 templates/edit.html:41
+#: main/models.py:203 main/models.py:286 templates/edit.html:41
 #: templates/edit_route.html:41
 msgid "Start date"
 msgstr "Date de début"
 
-#: main/models.py:204 main/models.py:284
+#: main/models.py:204 main/models.py:287
 msgid "Not mandatory. Set it for dated item such as event. Format YYYY-MM-DD"
 msgstr ""
 "Optionnel. Précisez ce champ pour les éléments datés comme un événement. "
 "Format du champ : AAAA-MM-JJ"
 
-#: main/models.py:206 main/models.py:286 templates/edit.html:47
+#: main/models.py:206 main/models.py:289 templates/edit.html:47
 #: templates/edit_route.html:47
 msgid "End date"
 msgstr "Date de fin"
 
-#: main/models.py:207 main/models.py:287
+#: main/models.py:207 main/models.py:290
 msgid ""
 "Not mandatory. Set it only if you have a multi-day event. Format YYYY-MM-DD"
 msgstr ""
 "Optionnel. Précisez ce champ seulement pour des événements durant plusieurs "
 "jours. Format du champ : AAAA-MM-JJ"
 
-#: main/models.py:216 main/models.py:496
+#: main/models.py:210
+msgid "Available Date"
+msgstr "Date de mise en disponibilité"
+
+#: main/models.py:219 main/models.py:499
 msgid "Point of interest"
 msgstr "Point d'intérêt"
 
-#: main/models.py:431
+#: main/models.py:434
 msgid "Area urn"
 msgstr "Urn de la zone"
 
-#: main/models.py:435
+#: main/models.py:438
 msgid "Upper left corner"
 msgstr "Coin en haut à gauche"
 
-#: main/models.py:437
+#: main/models.py:440
 msgid "Lower right corner"
 msgstr "Coin en bas à droite"
 
-#: main/models.py:475
+#: main/models.py:478
 msgid "Text"
 msgstr "Texte"
 
-#: main/models.py:476
+#: main/models.py:479
 msgid "Long text"
 msgstr "Texte long"
 
-#: main/models.py:477
+#: main/models.py:480
 msgid "Password"
 msgstr "Mot de passe"
 
-#: main/models.py:481
+#: main/models.py:484
 msgid "Type"
 msgstr "Type"
 
-#: main/models.py:486 main/models.py:498
+#: main/models.py:489 main/models.py:501
 msgid "Property model"
 msgstr "Modèle de propriété"
 
-#: main/models.py:499
+#: main/models.py:502
 msgid "Value"
 msgstr "Valeur"
 
-#: main/models.py:503
+#: main/models.py:506
 msgid "Property"
 msgstr "Propriété"
 
@@ -249,7 +257,7 @@ msgstr ""
 msgid "Temporary error. Renew your message later."
 msgstr "Erreur temporaire. Réenvoyez votre message plus tard."
 
-#: main/views.py:338
+#: main/views.py:337
 msgid "No category available in this area."
 msgstr "Pas de catégorie disponible sur cette zone."
 
@@ -337,6 +345,66 @@ msgstr "Arrêter le tracé"
 msgid "Select..."
 msgstr "Sélectionner..."
 
+#: rss/feeds.py:132 rss/feeds.py:222
+msgid "Last points of interest"
+msgstr "Derniers points d'intérêt"
+
+#: rss/feeds.py:138
+msgid "Latest points of interest from "
+msgstr "Nouveaux points d'intérêt de "
+
+#: rss/feeds.py:184
+msgid "Last points of interest by area"
+msgstr "Nouveaux points d'intérêt par zone"
+
+#: rss/views.py:73
+msgid "Incorrect choice in the list"
+msgstr "Choix incorrect dans la liste"
+
+#: rss/templates/rss.html:10
+msgid "Subscribe to RSS feed"
+msgstr "Souscrire à un flux RSS"
+
+#: rss/templates/rss.html:17
+msgid "Type of RSS feed"
+msgstr "Type de flux RSS"
+
+#: rss/templates/rss.html:20
+msgid "All new points of interest"
+msgstr "Tous les nouveaux points d'intérêt"
+
+#: rss/templates/rss.html:21 rss/templates/rss.html.py:28
+msgid "New points of interest by category"
+msgstr "Les nouveaux points d'intérêt par catégorie"
+
+#: rss/templates/rss.html:22 rss/templates/rss.html.py:44
+msgid "New points of interest by area"
+msgstr "Les nouveaux points d'intérêt par zone"
+
+#: rss/templates/rss.html:30
+msgid "Choose a category"
+msgstr "Choisir une catégorie"
+
+#: rss/templates/rss.html:47
+msgid "Choose a pre-defined areas"
+msgstr "Choisir une zone pré-définie"
+
+#: rss/templates/rss.html:61
+msgid "Or select the area by zooming and panning this map"
+msgstr "Ou sélectionner une zone en zoomant et en se déplaçant sur cette carte"
+
+#: rss/templates/rss.html:66
+msgid "Validate"
+msgstr "Valider"
+
+#: templates/404.html:4
+msgid "Page not found"
+msgstr "Page non trouvée"
+
+#: templates/500.html:4
+msgid "Internal server error"
+msgstr "Erreur interne du serveur"
+
 #: templates/base.html:39
 msgid "This site uses Chimère"
 msgstr "Ce site utilise Chimère"
@@ -452,6 +520,3 @@ msgstr ""
 "fichier welcome.html dans le dossier de patrons de Chimère. En dessous de ce "
 "message toutes les nouvelles vont être affichées. Vous pouvez les ajouter "
 "dans les pages d'administration."
-
-#~ msgid "Description"
-#~ msgstr "Description"
diff --git a/chimere/main/actions.py b/chimere/main/actions.py
index b6ee06a..b383bb4 100644
--- a/chimere/main/actions.py
+++ b/chimere/main/actions.py
@@ -36,7 +36,7 @@ actions = [(Action('view', '', _('View')), []),
            ),]
 
 if 'chimere.rss' in INSTALLED_APPS:
-    actions.append((Action('rss', 'rss', _('Feeds')), []))
+    actions.append((Action('rss', 'rss', _('RSS feeds')), []))
 
 if EMAIL_HOST:
     actions.append((Action('contact', 'contact', _('Contact us')), []),)
diff --git a/chimere/rss/feeds.py b/chimere/rss/feeds.py
index 870d00c..1bb1a76 100644
--- a/chimere/rss/feeds.py
+++ b/chimere/rss/feeds.py
@@ -19,6 +19,7 @@
 
 # See the file COPYING for details.
 
+from django.utils.translation import ugettext as _
 from django.contrib.syndication.feeds import Feed
 from django.contrib.syndication.feeds import FeedDoesNotExist
 from chimere.main.models import Category, SubCategory, Marker, Area
@@ -128,13 +129,13 @@ class LatestPOIs(BaseFeed):
     description_template = "rss_descr.html"
 
     def title(self):
-        return u"%s - Last POIs" % settings.PROJECT_NAME
+        return settings.PROJECT_NAME + u" - " + _(u"Last points of interest")
 
     def link(self):
         return settings.BASE_URL + 'rss/categories/'
 
     def description(self):
-        return "Latest POIs from Chimere"
+        return _("Latest points of interest from ") + settings.PROJECT_NAME
 
     def items(self):
         q = Marker.objects.filter(status__exact='A',
@@ -179,7 +180,8 @@ class LatestPOIsByZone(BaseFeed):
         return areaBox
 
     def title(self, obj):
-        return u"%s - Last POIs by area" % settings.PROJECT_NAME
+        return settings.PROJECT_NAME + u" - " +\
+               _(u"Last points of interest by area")
 
     def link(self, obj):
         """
@@ -198,7 +200,6 @@ class LatestPOIsByZone(BaseFeed):
         which is requested.
         This returns a list of the 15 last markers/POIs ordering by date
         """
-        print obj
         q = Marker.objects.filter(point__contained=obj, status__exact='A',
                   available_date__isnull=False).order_by('-available_date')[:15]
         return q
@@ -216,7 +217,8 @@ class LatestPOIsByZoneID(BaseFeed):
         return Area.objects.get(id__exact=bits[0])
 
     def title(self, obj):
-        return u"%s - Last POIs of %s" % (settings.PROJECT_NAME, obj.name)
+        return settings.PROJECT_NAME + u" - " + \
+              _(u"Last points of interest") + u" - " + obj.name
 
     def link(self, obj):
         if not obj:
diff --git a/chimere/rss/templates/rss.html b/chimere/rss/templates/rss.html
index c28b3db..0c895ed 100644
--- a/chimere/rss/templates/rss.html
+++ b/chimere/rss/templates/rss.html
@@ -17,16 +17,17 @@
     <label for="rss_category">{% trans "Type of RSS feed" %}</label>
     <select name='rss_category' id='rss_category' onchange='document.forms["rss_form"].submit();'>
         <option value=""> ---- </option>
-        <option value="global">{% trans "All the new points of interest" %}</option>
-        <option value="poi">{% trans "Category of point of interest" %}</option>
-        <option value="area">{% trans "Area" %}</option>
+        <option value="global">{% trans "All new points of interest" %}</option>
+        <option value="poi">{% trans "New points of interest by category" %}</option>
+        <option value="area">{% trans "New points of interest by area" %}</option>
     </select>
 </div>
 {% endif %}
 
 {%ifequal category_rss_feed "category" %}
+<h3>{% trans "New points of interest by category" %}</h3>
 <div class="fieldWrapper">
-    <label for="id_subcategory">{% trans "Category of POI" %}</label>
+    <label for="id_subcategory">{% trans "Choose a category" %}</label>
     <select name='subcategory' id='subcategory' onchange='document.forms["rss_form"].submit();'>
         {% for cat_subcat in sub_categories %}
         <option value ="cat_{{cat_subcat.0.id}}"> ---- {{cat_subcat.0.name}}  ----
@@ -40,9 +41,10 @@
 {% endifequal %}
 
 {%ifequal category_rss_feed "area" %}
+<h3>{% trans "New points of interest by area" %}</h3>
 {% if area_id %}
 <div class="fieldWrapper">
-    <label for="id_area">{% trans "Pre-defined areas:" %}</label>
+    <label for="id_area">{% trans "Choose a pre-defined areas" %}</label>
     <select name='id_area' id='id_area' onchange='document.forms["rss_form"].submit();'>
         <option value="" selected="selected"> ---- </option>
         {% for areaID in area_id %}
@@ -55,12 +57,13 @@
 
 <form method='post' action=''>
 {% endif %}
+<div class='fieldWrapper'>
+<label>{% trans "Or select the area by zooming and panning this map" %}</label>
 <div class="map">
-
-<label>{% trans "Or select the area by zooming an panning this map:" %}</label>
    {{form.area}}
 </div>
-<p><input type="submit" value="{% trans "Submit" %}" /></p>
+</div>
+<p><input type="submit" value="{% trans "Validate" %}" /></p>
 {% endifequal %}
 
 </form>
diff --git a/chimere/rss/views.py b/chimere/rss/views.py
index 5dd9797..04d69dc 100644
--- a/chimere/rss/views.py
+++ b/chimere/rss/views.py
@@ -70,7 +70,7 @@ def rss(request, area_name=''):
                 return render_to_response('rss.html', response_dct)
             # Error when submitting the form
             else:
-                error = _("Please choose a correct choice in the list")
+                error = _("Incorrect choice in the list")
                 response_dct.update({'error_message':error,
                     'category_rss_feed':'category',
                     'sub_categories':SubCategory.getAvailable(['M', 'B'])})