refs bug #429

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

diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index acb50e5137c60f72a5227f4228905528b8a60442..e95c6dfbcf1db136ec2f2600bbf2a7eec3ae0c7e 100644 (file)
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -21,20 +21,27 @@ class Language:
                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(_("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(_("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(_("Ukrainian"), "uk", "UA")
+               self.addLanguage(_("Frisian"), "fy", "x-FY") # there is no separate country for frisian
 
                self.callbacks = []
 
@@ -61,18 +68,17 @@ class Language:
                        self.activateLanguage(self.langlist[index])
 
        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):
-               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):