fixes to language activation callbacks and using the callbacks in mytest for setting...

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 08bcfec4b73ccc29184f4425b9caa66fa33480a7..00577b19e1128afcf5c71fa499eaa8dacf290f31 100644 (file)
--- 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 448076c6ad58b2fe8a38eea86505917201471afd..e65f8ff159d776047f95af1824c490ce1883ed46 100644 (file)
--- 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