fix po/Makefile.am to copy .mo files instead of .po

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

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 42f54207224dfcbe4c3f1ab03e8ad070033ef96a..79cd25fcb3bb0a304a8228bdd34aa6da4ad570df 100644 (file)
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -4,6 +4,7 @@ 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):
@@ -11,19 +12,16 @@ class LanguageSelection(Screen):
                Screen.__init__(self, session)
                
                self.list = []
-               list = language.getLanguageList()
-               for x in language.lang:
-                       print x
-                       self.list.append(LanguageEntryComponent(x[2], x[0]))
-
                self["list"] = LanguageList(self.list)
+               self.updateList()
                
-               self["actions"] = ActionMap(["OkCancelActions"], 
+               self["actions"] = ActionMap(["WizardActions"], 
                {
                        "ok": self.save,
-                       "cancel": self.close
-               })
-               print "INIT LANGUAGESELECTION"
+                       "back": self.close,
+                       "up": self.up,
+                       "down": self.down
+               }, -1)
                
        def save(self):
                self.run()
@@ -31,3 +29,25 @@ class LanguageSelection(Screen):
        
        def run(self):
                language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
+               config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
+               config.osd.language.save()
+
+       def updateList(self):
+               self.list = []
+               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"].l.setList(self.list)
+               
+       def up(self):
+               self["list"].instance.moveSelection(self["list"].instance.moveUp)
+               self.run()
+               self.updateList()
+               
+       def down(self):
+               self["list"].instance.moveSelection(self["list"].instance.moveDown)
+               self.run()
+               self.updateList()