don't sort language list

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

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 41857375d9512233b4f7cf1f8fcd17e3e9ee3cb1..e5be57ef63da5f1480547eb65718b065120d1dc6 100644 (file)
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -14,7 +14,8 @@ class LanguageSelection(Screen):
                self.list = []
                self["list"] = LanguageList(self.list)
                self.updateList()
-               
+               self.onLayoutFinish.append(self.selectActiveLanguage)
+                               
                self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"], 
                {
                        "ok": self.save,
@@ -25,24 +26,35 @@ class LanguageSelection(Screen):
                        "right": self.right
                }, -1)
                
+       def selectActiveLanguage(self):
+               activeLanguage = language.getActiveLanguage()
+               pos = 0
+               for x in self.list:
+                       if x[0] == activeLanguage:
+                               self["list"].instance.moveSelectionTo(pos)
+                               break
+                       pos += 1
+               
        def save(self):
                self.run()
                self.close()
        
        def run(self):
-               language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
-               config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
+               language.activateLanguage(self["list"].l.getCurrentSelection()[0])
+               config.osd.language.value = self["list"].l.getCurrentSelection()[0]
                config.osd.language.save()
-               self.session.currentDialog.instance.setTitle(_("Language selection"))
+               config.misc.languageselected.value = 0
+               config.misc.languageselected.save()
+               self.setTitle(_("Language selection"))
 
        def updateList(self):
                self.list = []
-               if len(language.lang) == 0: # no language available => display only english
-                       self.list.append(LanguageEntryComponent("en", _("English")))
+               if len(language.getLanguageList()) == 0: # no language available => display only english
+                       self.list.append(LanguageEntryComponent("en", _("English"), "en_EN"))
                else:
-                       for x in language.lang:
-                               self.list.append(LanguageEntryComponent(x[3].lower(), _(x[0])))
-               
+                       for x in language.getLanguageList():
+                               self.list.append(LanguageEntryComponent(file = x[1][3].lower(), name = _(x[1][0]), index = x[0]))
+               #self.list.sort(key=lambda x: x[1][7])
                self["list"].l.setList(self.list)
 
        def up(self):