fix caching, allow path= to override last path component (for LCD picons or different...

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

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 51ee91422aa83fe3f27f1d481fac25088c22bef5..6a224c8ac0bda2a05b219b3068d4e09c67246f85 100644 (file)
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -1,27 +1,44 @@
 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
-               self.lang = []
+               self.lang = {}
+               self.langlist = []
                # FIXME make list dynamically
                # 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(_("Spanish"), "es", "ES")
+               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")
+
                self.callbacks = []
 
        def addLanguage(self, name, lang, country):
                try:
-                       self.lang.append((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
+                       self.lang[str(lang + "_" + country)] = ((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
+                       self.langlist.append(str(lang + "_" + country))
                except:
                        print "Language " + str(name) + " not found"
 
@@ -37,14 +54,20 @@ class Language:
 
        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
-       
+
+       def getActiveLanguage(self):
+               return self.activeLanguage
+
        def getLanguage(self):
-               return str(self.lang[self.activeLanguage][2]) + "_" + str(self.lang[self.activeLanguage][3])
-       
+               try:
+                       return str(self.lang[self.activeLanguage][2]) + "_" + str(self.lang[self.activeLanguage][3])
+               except:
+                       return ''
+
        def addCallback(self, callback):
                self.callbacks.append(callback)
-               
+
 language = Language()