fix inverted setting (meaning was inverted too)

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

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index 8d966b68653bb76e33889d9f101d4b0ca697447f..076977158aef295f1ccc6359dc46983a14cfa79a 100644 (file)
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -1,23 +1,34 @@
 import gettext
 import os
 
+from Tools.Directories import *
+
 class Language:
        def __init__(self):
-               gettext.install('enigma2', '/enigma2/po')
+               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")
 
-       def addLanguage(self, name, lang):
+       def addLanguage(self, name, lang, country):
                try:
-                       self.lang.append((_(name), gettext.translation('enigma2', '/enigma2/po', languages=[lang])))
+                       self.lang.append((_(name), gettext.translation('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), languages=[lang]), lang, country))
                except:
                        print "Language " + str(name) + " not found"
 
        def activateLanguage(self, index):
-               print "Activating language " + str(self.lang[index][0])
-               self.lang[index][1].install()
+               try:
+                       print "Activating language " + str(self.lang[index][0])
+                       self.lang[index][1].install()
+                       self.activeLanguage = index
+               except:
+                       print "Selected language does not exist!"
                
        def getLanguageList(self):
                list = []
@@ -25,4 +36,4 @@ class Language:
                        list.append(x[0])
                return list
 
-language = Language()
\ No newline at end of file
+language = Language()