Merge branch 'master' into experimental

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

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index cf30be82b6ed007429e224f5421f384b9c3d45e4..e95c6dfbcf1db136ec2f2600bbf2a7eec3ae0c7e 100644 (file)
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -2,6 +2,8 @@ import gettext
 
 from Tools.Directories import SCOPE_LANGUAGE, resolveFilename
 
 
 from Tools.Directories import SCOPE_LANGUAGE, resolveFilename
 

+import language_cache
+

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


@@ -10,6 +12,7 @@ class Language:
                self.langlist = []
                # FIXME make list dynamically
                # name, iso-639 language, iso-3166 country. Please don't mix language&country!
                self.langlist = []
                # FIXME make list dynamically
                # name, iso-639 language, iso-3166 country. Please don't mix language&country!

+               # also, see "precalcLanguageList" below on how to re-create the language cache after you added a language

                self.addLanguage(_("English"), "en", "EN")
                self.addLanguage(_("German"), "de", "DE")
                self.addLanguage(_("Arabic"), "ar", "AE")
                self.addLanguage(_("English"), "en", "EN")
                self.addLanguage(_("German"), "de", "DE")
                self.addLanguage(_("Arabic"), "ar", "AE")


@@ -18,20 +21,27 @@ class Language:
                self.addLanguage(_("Czech"), "cs", "CZ")
                self.addLanguage(_("Danish"), "da", "DK")
                self.addLanguage(_("Dutch"), "nl", "NL")
                self.addLanguage(_("Czech"), "cs", "CZ")
                self.addLanguage(_("Danish"), "da", "DK")
                self.addLanguage(_("Dutch"), "nl", "NL")

+               self.addLanguage(_("Estonian"), "et", "EE")

                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(_("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(_("Latvian"), "lv", "LV")

                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(_("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(_("Serbian"), "sr", "YU")
+               self.addLanguage(_("Slovakian"), "sk", "SK")
+               self.addLanguage(_("Slovenian"), "sl", "SI")

                self.addLanguage(_("Spanish"), "es", "ES")
                self.addLanguage(_("Swedish"), "sv", "SE")
                self.addLanguage(_("Turkish"), "tr", "TR")
                self.addLanguage(_("Spanish"), "es", "ES")
                self.addLanguage(_("Swedish"), "sv", "SE")
                self.addLanguage(_("Turkish"), "tr", "TR")

+               self.addLanguage(_("Ukrainian"), "uk", "UA")
+               self.addLanguage(_("Frisian"), "fy", "x-FY") # there is no separate country for frisian

 
                self.callbacks = []
 
 
                self.callbacks = []
 


@@ -54,21 +64,21 @@ class Language:
                        print "Selected language does not exist!"
 
        def activateLanguageIndex(self, index):
                        print "Selected language does not exist!"
 
        def activateLanguageIndex(self, index):

-               self.activateLanguage(self.langlist[index])
+               if index < len(self.langlist):
+                       self.activateLanguage(self.langlist[index])

 
        def getLanguageList(self):
 
        def getLanguageList(self):

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

 
        def getActiveLanguage(self):
                return self.activeLanguage
        
        def getActiveLanguageIndex(self):
 
        def getActiveLanguage(self):
                return self.activeLanguage
        
        def getActiveLanguageIndex(self):

-               for count in range(len(self.langlist)):
-                       if self.langlist[count] == self.activeLanguage:
-                               return count
+               idx = 0
+               for x in self.langlist:
+                       if x == self.activeLanguage:
+                               return idx
+                       idx += 1

                return None                     
 
        def getLanguage(self):
                return None                     
 
        def getLanguage(self):


@@ -80,4 +90,23 @@ class Language:
        def addCallback(self, callback):
                self.callbacks.append(callback)
 
        def addCallback(self, callback):
                self.callbacks.append(callback)
 

+       def precalcLanguageList(self):
+               # excuse me for those T1, T2 hacks please. The goal was to keep the language_cache.py as small as possible, *and* 
+               # don't duplicate these strings.
+               T1 = _("Please use the UP and DOWN keys to select your language. Afterwards press the OK button.")
+               T2 = _("Language selection")
+               l = open("language_cache.py", "w")
+               print >>l, "# -*- coding: UTF-8 -*-"
+               print >>l, "LANG_TEXT = {"
+               for language in self.langlist:
+                       self.activateLanguage(language)
+                       print >>l, '"%s": {' % language
+                       for name, lang, country in self.lang.values():
+                               print >>l, '\t"%s_%s": "%s",' % (lang, country, _(name))
+
+                       print >>l, '\t"T1": "%s",' % (_(T1))
+                       print >>l, '\t"T2": "%s",' % (_(T2))
+                       print >>l, '},'
+               print >>l, "}"
+

 language = Language()
 language = Language()