Merge branch 'master' into carte-ouverte

4 files changed, 21 insertions, 2 deletions

diff --git a/chimere/main/templatetags/unlocalize_point.py b/chimere/main/templatetags/unlocalize_point.py
new file mode 100644
index 0000000..f52a90a
--- /dev/null
+++ b/chimere/main/templatetags/unlocalize_point.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from django import template
+import re
+
+register = template.Library()
+
+def unlocalize_point(value):
+    """
+    Basic unlocalize filter for django 1.2
+    """
+    return unicode(value).replace(',', '.')
+
+register.filter(unlocalize_point)
+
diff --git a/chimere/templates/main_map.html b/chimere/templates/main_map.html
index 526bf32..8b8cc2e 100644
--- a/chimere/templates/main_map.html
+++ b/chimere/templates/main_map.html
@@ -1,5 +1,6 @@
 {% extends "base_user.html" %}
 {% load i18n %}
+{% load unlocalize_point %}
 {% block message_edit %}{% endblock %}
 {% block sidebar %}{{ block.super }}
 <div id='panel'>
@@ -14,7 +15,7 @@
 {%if areas%}<div id='areas'>
 <h2>{% trans "Shortcuts"%}</h2>
 <ul>{% for area in areas%}
-<li><img class='zoom_image' alt='{% trans "Zoom to" %} {{area.name}}' src='{{media_path}}icons/zoom.png' onclick='zoomToArea({{area.upper_left_corner.x}}, {{area.upper_left_corner.y}}, {{area.lower_right_corner.x}}, {{area.lower_right_corner.y}}); loadGeoObjects();'/> {{area.name}}</li>{%endfor%}
+<li><img class='zoom_image' alt='{% trans "Zoom to" %} {{area.name}}' src='{{media_path}}icons/zoom.png' onclick='zoomToArea({{area.upper_left_corner.x|unlocalize_point}}, {{area.upper_left_corner.y|unlocalize_point}}, {{area.lower_right_corner.x|unlocalize_point}}, {{area.lower_right_corner.y|unlocalize_point}}); loadGeoObjects();'/> {{area.name}}</li>{%endfor%}
 </ul>
 </div>{%endif%}
 
diff --git a/docs/en/INSTALL.t2t b/docs/en/INSTALL.t2t
index a15c2dd..831b406 100644
--- a/docs/en/INSTALL.t2t
+++ b/docs/en/INSTALL.t2t
@@ -15,6 +15,7 @@ Last update: %%date(%m-%d-%Y)
 - [gettext http://www.gnu.org/software/gettext/]
 - [psycopg2 http://freshmeat.net/projects/psycopg/]
 - [Python Imaging Library http://www.pythonware.com/products/pil/]
+- [Beautiful Soup http://www.crummy.com/software/BeautifulSoup/]
 
 
 geodjango is a part of django version 1.0 but it has some specific (geographically related) additionnal dependencies:
@@ -30,7 +31,7 @@ Optionaly (but recommanded):
  - [tinymce http://tinymce.moxiecode.com/]
 
 
-The simpliest way to obtain these packages is to get them from your favorite Linux distribution repositories (for instance python, python-django, tinymce, apache2, libapache2-mod-python, libgeos-3.2.0, proj, gdal-bin, python-psycopg2, python-imaging, postgresql-8.4 and postgresql-8.4-postgis packages for Debian Squeeze). If these packages do not exist in your distribution's repository, please refer to the applications' websites.
+The simpliest way to obtain these packages is to get them from your favorite Linux distribution repositories (for instance python, python-django, python-beautifulsoup, tinymce, apache2, libapache2-mod-python, libgeos-3.2.0, proj, gdal-bin, python-psycopg2, python-imaging, postgresql-8.4 and postgresql-8.4-postgis packages for Debian Squeeze). If these packages do not exist in your distribution's repository, please refer to the applications' websites.
 
 +++ Database configuration +++
 
diff --git a/docs/en/UPGRADE.t2t b/docs/en/UPGRADE.t2t
index 0f5a068..e57faad 100644
--- a/docs/en/UPGRADE.t2t
+++ b/docs/en/UPGRADE.t2t
@@ -8,6 +8,7 @@ Last update: %%date(%m-%d-%Y)
 ++ From version prior to 1.1 to 1.1 ++
 
 Upgrade Django to the 1.2 version.
+Install the [Beautiful Soup http://www.crummy.com/software/BeautifulSoup/] library.
 
 + Get the new version +