Merge branch 'integration'

Conflicts:
	www/templates/maposmatic/index.html

www/locale/fr/LC_MESSAGES/django.po

@@ -368,7 +368,11 @@ msgstr "Vos cartes de villes libres !"
 msgid "Jobs"
 msgstr "Rendus"
 
-#: templates/maposmatic/base.html:61
+#: templates/maposmatic/base.html:64
+msgid "Language:"
+msgstr "Langue :"
+
+#: templates/maposmatic/base.html:81
 msgid "Random map"
 msgstr "Carte au hasard"
 

www/media/style.css

@@ -156,22 +156,40 @@ form ul {
     list-style-type: none;
 }
 
-input {
+.submitmap input {
     background: #FFF6BF;
     border: 3px solid #CCC;
     width: 300px;
     padding: 3px;
 }
 
-input:hover {
+.submitmap input:hover {
     border: 3px solid #AAA;
 }
 
-input[type="submit"]
+.submitmap input[type="submit"]
 {
     width: 300px;
 }
 
+.langsel {
+    text-align: right;
+}
+
+.langsel input {
+    background: #FFF6BF;
+    border: 3px solid #CCC;
+    padding: 3px;
+}
+
+.langsel input:hover {
+    border: 3px solid #AAA;
+}
+
+.langsel input[type="submit"]
+{
+}
+
 table.list
 {
   margin: 1em;

www/settings.py

@@ -104,6 +104,8 @@ INSTALLED_APPS = (
 
 formatter = logging.Formatter("%(name)s - %(asctime)s - %(levelname)s - %(message)s")
 
+LANGUAGES = (("fr", u"Français"),
+             ("en", u"English"))
 
 LOG = logging.getLogger(os.environ.get("MAPOSMATIC_LOG_TARGET",
                                        "maposmatic"))

www/templates/maposmatic/base.html

@@ -41,6 +41,7 @@
 <div id="header">
 <h1>MapOSMatic</h1>
 <h2>{% trans "Your free city maps!" %}</h2>
+
  <div id="menu">
   <ul id="nav">
    <li {% block menu-home %}{% endblock %}><a href="/">{% trans "Home" %}</a></li>
@@ -56,6 +57,25 @@
 </div>
 
 <div id="left">
+
+  <div class="box">
+    <form name="langsel" action="/i18n/setlang/" method="post" class="langsel">
+      <label for="language">{%trans "Language:" %}</label>
+      <select name="language" onChange="document.langsel.submit();">
+	{% for lang in LANGUAGES %}
+	<option
+	   {% ifequal lang.0 LANGUAGE_CODE %}
+	   selected
+	   {% endifequal %}
+	   value="{{ lang.0 }}">
+	  {{ lang.1 }}
+	</option>
+	{% endfor %}
+      </select>
+      <input type="submit" value="Go" />
+    </form>
+  </div>
+
 <div class="box">
   <h2>{% trans "Random map" %}</h2>
   {% if randommap %}

www/templates/maposmatic/index.html

@@ -142,7 +142,7 @@ rendering is completed (that might take some time depending on the queue
 length), this page will contain links to the generated
 map.{%endblocktrans%}</p>
 
-<form method="post" action="">
+<form method="post" action="" class="submitmap">
 
 <table id="mapform" style="margin: auto; border: 1px solid #CCC; padding: 10px; width: 70%;">
   <tr>
@@ -172,7 +172,9 @@ map.{%endblocktrans%}</p>
   </tr>
   <tr>
     <td></td>
-    <td colspan="2"><input type="submit" value="{% trans 'Generate' %}"/></td>
+    <td colspan="2">
+      <input type="submit" value="{% trans 'Generate' %}"/>
+    </td>
   </tr>
 </table>
 

www/urls.py

@@ -40,7 +40,7 @@ urlpatterns = patterns('',
     (r'^jobs/$', maposmatic.views.all_jobs),
     (r'^maps/$', maposmatic.views.all_maps),
     (r'^about/$', maposmatic.views.about),
-
+    (r'^i18n/', include('django.conf.urls.i18n')),
 
     (r'^results/(?P<path>.*)$',
      'django.views.static.serve',