use callbacks to signal the change of language

[vuplus_dvbapp] / lib / python / Components / Language.py

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index c60b39b..08bcfec 100644 (file)
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -5,16 +5,22 @@ from Tools.Directories import *
 
 class Language:
        def __init__(self):
-               gettext.install('enigma2', '/enigma2/po', unicode=1)
+               gettext.install('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), unicode=0, codeset="utf-8")
                self.activeLanguage = 0
                self.lang = []
                # FIXME make list dynamically
-               self.addLanguage(_("English"), "en")
-               self.addLanguage(_("German"), "de")
+               # name, iso-639 language, iso-3166 country. Please don't mix language&country!
+               self.addLanguage(_("English"), "en", "EN")
+               self.addLanguage(_("German"), "de", "DE")
+               self.addLanguage(_("Arabic"), "ar", "AE")
+               self.addLanguage(_("Dutch"), "nl", "NL")
+               self.addLanguage(_("Spanish"), "es", "ES")
+               
+               self.callbacks = []
 
-       def addLanguage(self, name, lang):
+       def addLanguage(self, name, lang, country):
                try:
-                       self.lang.append((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang))
+                       self.lang.append((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
                except:
                        print "Language " + str(name) + " not found"
 
@@ -23,6 +29,8 @@ 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!"
                
@@ -31,5 +39,11 @@ class Language:
                for x in self.lang:
                        list.append(x[0])
                return list
-
+       
+       def getLanguage(self):
+               return str(self.lang[self.activeLanguage][3]) + "_" + str(self.lang[self.activeLanguage][4])
+       
+       def addCallback(self, callback):
+               self.callbacks.append(callback)
+               
 language = Language()