From 46a1cf3a2c2b6930f69b7976912e598bbfada7d7 Mon Sep 17 00:00:00 2001
From: Toby <toby.junk@gmail.com>
Date: Tue, 28 Feb 2012 16:06:24 +0000
Subject: [PATCH] lang fixes

---
 ckan/config/middleware.py | 3 ++-
 ckan/lib/helpers.py       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ckan/config/middleware.py b/ckan/config/middleware.py
index 16613bf78e1..62a4dcde86b 100644
--- a/ckan/config/middleware.py
+++ b/ckan/config/middleware.py
@@ -168,7 +168,8 @@ def __call__(self, environ, start_response):
                 cookie_lang = self.get_cookie_lang(environ)
                 if cookie_lang:
                     environ['CKAN_LANG'] = cookie_lang
-                    environ['CKAN_LANG_IS_DEFAULT'] = False
+                    default = (cookie_lang == self.default_locale)
+                    environ['CKAN_LANG_IS_DEFAULT'] = default
                 else:
                     environ['CKAN_LANG'] = self.default_locale
                     environ['CKAN_LANG_IS_DEFAULT'] = True
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index 0a19353590e..ad544419194 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -96,7 +96,8 @@ def _add_i18n_to_url(url_to_amend, **kw):
     except TypeError:
         root = ''
     if default_locale:
-        url = '%s%s' % (root, url_to_amend)
+        url = url_to_amend[len(root):]
+        url = '%s%s' % (root, url)
     else:
         # we need to strip the root from the url and the add it before
         # the language specification.