fixes to language activation callbacks and using the callbacks in mytest for setting epg language (uncomment for implementation)

2 files changed, 9 insertions, 3 deletions

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 08bcfec4..00577b19 100644
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -29,10 +29,10 @@ class Language:
 			print "Activating language " + str(self.lang[index][0])
 			self.lang[index][1].install()
 			self.activeLanguage = index
-			for x in callback:
-				callback()
 		except:
 			print "Selected language does not exist!"
+		for x in self.callbacks:
+			x()
 		
 	def getLanguageList(self):
 		list = []
@@ -41,7 +41,7 @@ class Language:
 		return list
 	
 	def getLanguage(self):
-		return str(self.lang[self.activeLanguage][3]) + "_" + str(self.lang[self.activeLanguage][4])
+		return str(self.lang[self.activeLanguage][2]) + "_" + str(self.lang[self.activeLanguage][3])
 	
 	def addCallback(self, callback):
 		self.callbacks.append(callback)
diff --git a/mytest.py b/mytest.py
index 448076c6..e65f8ff1 100644
--- a/mytest.py
+++ b/mytest.py
@@ -4,6 +4,12 @@ from tools import *
 
 from Components.Language import language
 
+def setEPGLanguage():
+	#eServiceEvent.setEPGLanguage(language.getLanguage())
+	print "language set to", language.getLanguage()
+	
+language.addCallback(setEPGLanguage)
+
 import traceback
 import Screens.InfoBar
 from Screens.SimpleSummary import SimpleSummary