Only use browser locale.

diff --git a/templates/base.html b/templates/base.html
index daf9aa5501fb58c33b3a87f2574969c835a11048..88567c57a0d19b0bb05ec95bfbdf687f95fc1e56 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -70,19 +70,6 @@
                                                                <a href="/terms">{{ _("Terms & Conditions") }}</a>
                                                        </li>
                                                {% end %}
-
-                                               {% if not hostname == "planet.ipfire.org" %}
-                                                       {% for l in ("en", "de") %}
-                                                               {% if not l == lang %}
-                                                                       <li class="text-muted">&middot;</li>
-                                                                       <li>
-                                                                               <a href="?locale={{ l }}">
-                                                                                       <img src="{{ static_url("images/flags/%s.png" % l) }}" alt="{{ l }}">
-                                                                               </a>
-                                                                       </li>
-                                                               {% end %}
-                                                       {% end %}
-                                               {% end %}
                                        </ul>
 
                                        <p>

diff --git a/webapp/handlers_base.py b/webapp/handlers_base.py
index ddf19129adc42b95308226408802b19862af7a46..8b0b95d2ed7fb43a691d651c2b8e7d6db32bffd0 100644 (file)
--- a/webapp/handlers_base.py
+++ b/webapp/handlers_base.py
@@ -26,34 +26,11 @@ class BaseHandler(tornado.web.RequestHandler):
                # Find the name of the author
                return self.accounts.find(uid)
 
-       def get_query_locale(self):
-               locale = self.get_argument("locale", None)
-
-               if locale is None:
-                       return
-
-               return tornado.locale.get(locale)
-
-       def prepare(self):
-               locale = self.get_query_locale()
-               if locale:
-                       self.set_cookie("locale", locale.code)
-
        def get_user_locale(self):
                # The planet is always in english.
                if self.request.host == "planet.ipfire.org":
                        return tornado.locale.get("en_US")
 
-               # Get the locale from the query.
-               locale = self.get_query_locale()
-               if locale:
-                       return locale
-
-               # Read the locale from the cookies.
-               locale = self.get_cookie("locale", None)
-               if locale:
-                       return tornado.locale.get(locale)
-
                # Otherwise take the browser locale.
                return self.get_browser_locale()