some language-work

[enigma2.git] / lib / python / Screens / LanguageSelection.py

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index a0441b6d6aa49a2b389f4abc8707c22d58a2995a..a53bb97e37616ea4b208fc8925ac0f06ce53b8f6 100644 (file)
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -3,17 +3,22 @@ from Screen import Screen
 from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.Language import language
+from Components.LanguageList import *
+from Components.config import config
+
 
 class LanguageSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
                
                self.list = []
-               list = language.getLanguageList()
-               for x in list:
-                       self.list.append((x, None))
+               if len(language.lang) == 0: # no language available => display only english
+                       self.list.append(LanguageEntryComponent("en", _("English")))
+               else:
+                       for x in language.lang:
+                               self.list.append(LanguageEntryComponent(x[2], x[0]))
 
-               self["list"] = MenuList(self.list)
+               self["list"] = LanguageList(self.list)
                
                self["actions"] = ActionMap(["OkCancelActions"], 
                {
@@ -27,3 +32,5 @@ class LanguageSelection(Screen):
        
        def run(self):
                language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
+               config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
+               config.osd.language.save()