git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't change language on pressing EXIT
[enigma2.git]
/
lib
/
python
/
Screens
/
LanguageSelection.py
diff --git
a/lib/python/Screens/LanguageSelection.py
b/lib/python/Screens/LanguageSelection.py
index e5be57ef63da5f1480547eb65718b065120d1dc6..83d03403782bf63c517385026e68622230721ad0 100644
(file)
--- 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)
def __init__(self, session):
Screen.__init__(self, session)
+ self.oldActiveLanguage = language.getActiveLanguage()
+
self.list = []
self["list"] = LanguageList(self.list)
self.updateList()
self.list = []
self["list"] = LanguageList(self.list)
self.updateList()
@@
-19,7
+21,7
@@
class LanguageSelection(Screen):
self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"],
{
"ok": self.save,
self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"],
{
"ok": self.save,
- "cancel": self.c
lose
,
+ "cancel": self.c
ancel
,
"up": self.up,
"down": self.down,
"left": self.left,
"up": self.up,
"down": self.down,
"left": self.left,
@@
-39,6
+41,10
@@
class LanguageSelection(Screen):
self.run()
self.close()
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]
def run(self):
language.activateLanguage(self["list"].l.getCurrentSelection()[0])
config.osd.language.value = self["list"].l.getCurrentSelection()[0]