aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>2006-10-19 13:31:35 +0000
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>2006-10-19 13:31:35 +0000
commit4e81b86a327fd71320b97413145a969f2071ee8e (patch)
tree5a9248d2637c4c0562a416be5f828db166e56d89 /lib/python
parent60c53dd7a61f52be0641ef1fbf5ee4a8bb5309ee (diff)
downloadenigma2-4e81b86a327fd71320b97413145a969f2071ee8e.tar.gz
enigma2-4e81b86a327fd71320b97413145a969f2071ee8e.zip
don't change language on pressing EXIT
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/LanguageSelection.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index e5be57ef..83d03403 100644
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -11,6 +11,8 @@ class LanguageSelection(Screen):
def __init__(self, session):
Screen.__init__(self, session)
+ self.oldActiveLanguage = language.getActiveLanguage()
+
self.list = []
self["list"] = LanguageList(self.list)
self.updateList()
@@ -19,7 +21,7 @@ class LanguageSelection(Screen):
self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"],
{
"ok": self.save,
- "cancel": self.close,
+ "cancel": self.cancel,
"up": self.up,
"down": self.down,
"left": self.left,
@@ -39,6 +41,10 @@ class LanguageSelection(Screen):
self.run()
self.close()
+ def cancel(self):
+ language.activateLanguage(self.oldActiveLanguage)
+ self.close()
+
def run(self):
language.activateLanguage(self["list"].l.getCurrentSelection()[0])
config.osd.language.value = self["list"].l.getCurrentSelection()[0]