small fix

[enigma2.git] / lib / python / Components / Language.py

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 4ec28081b0956f96b8063713c8cde3613246f38e..e0094c7b7190961a83d1df7ba9d3376960bbeb6e 100644 (file)
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -1,37 +1,84 @@
 import gettext
 import gettext

-import os

 
 

-from Tools.Directories import *
+from Tools.Directories import SCOPE_LANGUAGE, resolveFilename

 
 class Language:
        def __init__(self):
                gettext.install('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), unicode=0, codeset="utf-8")
                self.activeLanguage = 0
 
 class Language:
        def __init__(self):
                gettext.install('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), unicode=0, codeset="utf-8")
                self.activeLanguage = 0

-               self.lang = []
+               self.lang = {}
+               self.langlist = []

                # FIXME make list dynamically
                # FIXME make list dynamically

-               self.addLanguage(_("English"), "en")
-               self.addLanguage(_("German"), "de")
-               self.addLanguage(_("Arabic"), "ar")
-               self.addLanguage(_("Dutch"), "nl")
+               # 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(_("Catalan"), "ca", "AD")
+               self.addLanguage(_("Croatian"), "hr", "HR")
+               self.addLanguage(_("Czech"), "cs", "CZ")
+               self.addLanguage(_("Danish"), "da", "DK")
+               self.addLanguage(_("Dutch"), "nl", "NL")
+               self.addLanguage(_("Finnish"), "fi", "FI")
+               self.addLanguage(_("French"), "fr", "FR")
+               self.addLanguage(_("Greek"), "el", "GR")
+               self.addLanguage(_("Hungarian"), "hu", "HU")
+               self.addLanguage(_("Lithuanian"), "lt", "LT")
+               self.addLanguage(_("Icelandic"), "is", "IS")
+               self.addLanguage(_("Italian"), "it", "IT")
+               self.addLanguage(_("Norwegian"), "no", "NO")
+               self.addLanguage(_("Polish"), "pl", "PL")
+               self.addLanguage(_("Portuguese"), "pt", "PT")
+               self.addLanguage(_("Russian"), "ru", "RU")
+               self.addLanguage(_("Spanish"), "es", "ES")
+               self.addLanguage(_("Swedish"), "sv", "SE")
+               self.addLanguage(_("Turkish"), "tr", "TR")

 
 

-       def addLanguage(self, name, lang):
+               self.callbacks = []
+
+       def addLanguage(self, name, lang, country):

                try:
                try:

-                       self.lang.append((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang))
+                       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:
                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
                        self.activeLanguage = index

+                       for x in self.callbacks:
+                               x()

                except:
                        print "Selected language does not exist!"
                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 = []
        def getLanguageList(self):
                list = []

-               for x in self.lang:
-                       list.append(x[0])
+               for x in self.langlist:
+                       list.append((x, self.lang[x]))

                return list
 
                return list
 

+       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][1]) + "_" + str(self.lang[self.activeLanguage][2])
+               except:
+                       return ''
+
+       def addCallback(self, callback):
+               self.callbacks.append(callback)
+

 language = Language()
 language = Language()