X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a9a5762212343755d01839f520b853a2e78eca0e..a80c8953ab5dafd0eb96b9cc19f8c5cb84dcd8e2:/lib/python/Components/Language.py

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 51ee9142..bf211cf6 100644
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -7,7 +7,7 @@ class Language:
 	def __init__(self):
 		gettext.install('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), unicode=0, codeset="utf-8")
 		self.activeLanguage = 0
-		self.lang = []
+		self.lang = {}
 		# FIXME make list dynamically
 		# name, iso-639 language, iso-3166 country. Please don't mix language&country!
 		self.addLanguage(_("English"), "en", "EN")
@@ -21,7 +21,7 @@ class Language:
 
 	def addLanguage(self, name, lang, country):
 		try:
-			self.lang.append((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
+			self.lang[str(lang + "_" + country)] = ((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
 		except:
 			print "Language " + str(name) + " not found"
 
@@ -37,10 +37,13 @@ class Language:
 
 	def getLanguageList(self):
 		list = []
-		for x in self.lang:
-			list.append(x[0])
+		for x in self.lang.keys():
+			list.append((x, self.lang[x]))
 		return list
 	
+	def getActiveLanguage(self):
+		return self.activeLanguage
+	
 	def getLanguage(self):
 		return str(self.lang[self.activeLanguage][2]) + "_" + str(self.lang[self.activeLanguage][3])