From 5521f70289babe4442c83756f07d24da76e01eba Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 18 Jul 2012 14:18:32 +0200
Subject: [PATCH] Website: Add i18n language detection (of browser language)
 and language

---
 extras/website/website/settings.py         | 3 ++-
 extras/website/website/templates/base.html | 6 ++++--
 extras/website/website/urls.py             | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/extras/website/website/settings.py b/extras/website/website/settings.py
index 34f449087..78c5f5ee3 100644
--- a/extras/website/website/settings.py
+++ b/extras/website/website/settings.py
@@ -98,8 +98,9 @@ TEMPLATE_LOADERS = (
 )
 
 MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
+    'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
diff --git a/extras/website/website/templates/base.html b/extras/website/website/templates/base.html
index b4e9a5ccd..ef10e90c2 100644
--- a/extras/website/website/templates/base.html
+++ b/extras/website/website/templates/base.html
@@ -47,7 +47,9 @@
             {% get_available_languages as languages %}
             {% for lang_code, lang_name in languages %}
                 {% language lang_code %}
-                <li {% if LANGUAGE_CODE == lang_code %}class="active"{% endif %}><a href="{{lang_code}}"><i class="icon-flag icon-white"></i> {{ lang_name }}</a></li>
+                <li {% if LANGUAGE_CODE == lang_code %}class="active"{% endif %}>
+                  <a href="{% url home %}"><i class="icon-flag icon-white"></i> {{ lang_name }}</a>
+                </li>
                 {% endlanguage %}
             {% endfor %}
         </ul>
@@ -125,4 +127,4 @@
 </footer>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/extras/website/website/urls.py b/extras/website/website/urls.py
index 1911684ca..f7cc764e8 100644
--- a/extras/website/website/urls.py
+++ b/extras/website/website/urls.py
@@ -7,7 +7,8 @@ from django.views.generic import TemplateView
 # from django.contrib import admin
 # admin.autodiscover()
 
-urlpatterns = patterns('',
+urlpatterns = i18n_patterns('',
+    url(r'^i18n/', include('django.conf.urls.i18n')),
     url(r'^$', TemplateView.as_view(template_name="home.html"), name='home',),
     url(r'^about/$', TemplateView.as_view(template_name="about.html"), name='about',),
     url(r'^about/features$', TemplateView.as_view(template_name="features.html"), name='features',),