X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/219beec914037da0010a11c563b97b16e6e227ef..f61b67c4f533d69e9a177a571959df493f7ce77c:/lib/python/Components/Language.py

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 00577b19..ffc6b2c9 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")
@@ -15,12 +15,14 @@ class Language:
 		self.addLanguage(_("Arabic"), "ar", "AE")
 		self.addLanguage(_("Dutch"), "nl", "NL")
 		self.addLanguage(_("Spanish"), "es", "ES")
+		self.addLanguage(_("Icelandic"), "is", "IS")
+		self.addLanguage(_("Italian"), "it", "IT")
 		
 		self.callbacks = []
 
 	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"
 
@@ -29,17 +31,20 @@ class Language:
 			print "Activating language " + str(self.lang[index][0])
 			self.lang[index][1].install()
 			self.activeLanguage = index
+			for x in self.callbacks:
+				x()
 		except:
 			print "Selected language does not exist!"
-		for x in self.callbacks:
-			x()
-		
+
 	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])