X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1b2fe6621d12df28e2e2cd12e0b8db004d3ff513..2a8ecd871020fdd668cf5500460e5a6e7851b4b0:/lib/python/Components/Language.py

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 6a224c8a..e0094c7b 100644
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -37,21 +37,26 @@ class Language:
 
 	def addLanguage(self, name, lang, country):
 		try:
-			self.lang[str(lang + "_" + country)] = ((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
+			self.lang[str(lang + "_" + country)] = ((_(name), lang, country))
 			self.langlist.append(str(lang + "_" + country))
 		except:
 			print "Language " + str(name) + " not found"
 
 	def activateLanguage(self, index):
 		try:
-			print "Activating language " + str(self.lang[index][0])
-			self.lang[index][1].install()
+			lang = self.lang[index]
+			print "Activating language " + lang[0]
+			gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang[1]]).install()
 			self.activeLanguage = index
 			for x in self.callbacks:
 				x()
 		except:
 			print "Selected language does not exist!"
 
+	def activateLanguageIndex(self, index):
+		if index < len(self.langlist):
+			self.activateLanguage(self.langlist[index])
+
 	def getLanguageList(self):
 		list = []
 		for x in self.langlist:
@@ -60,10 +65,16 @@ class Language:
 
 	def getActiveLanguage(self):
 		return self.activeLanguage
+	
+	def getActiveLanguageIndex(self):
+		for count in range(len(self.langlist)):
+			if self.langlist[count] == self.activeLanguage:
+				return count
+		return None			
 
 	def getLanguage(self):
 		try:
-			return str(self.lang[self.activeLanguage][2]) + "_" + str(self.lang[self.activeLanguage][3])
+			return str(self.lang[self.activeLanguage][1]) + "_" + str(self.lang[self.activeLanguage][2])
 		except:
 			return ''