From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 28 Mar 2014 14:07:31 +0000 (+0100)
Subject: Only use browser locale.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0bdced93f201cfff487532c35d52ff5832413d2;p=ipfire.org.git

Only use browser locale.
---

diff --git a/templates/base.html b/templates/base.html
index daf9aa55..88567c57 100644
--- 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 ddf19129..8b0b95d2 100644
--- 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()