aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>2005-12-18 23:21:59 +0000
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>2005-12-18 23:21:59 +0000
commit04a6ffad0d1bd64cda7270ba0fcad74c33a20a51 (patch)
tree8116a171ae8a38d3eb6658acc5e1ba53b4c4716a /lib/python
parent98208302bd3bdbf99ab801260bf8d023035d8d41 (diff)
downloadenigma2-04a6ffad0d1bd64cda7270ba0fcad74c33a20a51.tar.gz
enigma2-04a6ffad0d1bd64cda7270ba0fcad74c33a20a51.zip
fix not-a-string when using english
add some wizard-stuff
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Components/Language.py2
-rw-r--r--lib/python/Components/config.py2
-rw-r--r--lib/python/Screens/TutorialWizard.py5
3 files changed, 6 insertions, 3 deletions
diff --git a/lib/python/Components/Language.py b/lib/python/Components/Language.py
index c60b39b2..d6e43a5d 100644
--- a/lib/python/Components/Language.py
+++ b/lib/python/Components/Language.py
@@ -5,7 +5,7 @@ from Tools.Directories import *
class Language:
def __init__(self):
- gettext.install('enigma2', '/enigma2/po', unicode=1)
+ gettext.install('enigma2', resolveFilename(SCOPE_LANGUAGE, ""), unicode=0, codeset="utf-8")
self.activeLanguage = 0
self.lang = []
# FIXME make list dynamically
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 3bbdde10..9400565d 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -78,6 +78,8 @@ class configSelection:
def __call__(self, selected): #needed by configlist
self.checkValues()
+ print "[config.py] orgstring: ", self.parent.vals[self.parent.value]
+ print "[config.py] translation: ", _(self.parent.vals[self.parent.value])
return ("text", _(self.parent.vals[self.parent.value]))
class configDateTime:
diff --git a/lib/python/Screens/TutorialWizard.py b/lib/python/Screens/TutorialWizard.py
index 0ba97d3a..95318724 100644
--- a/lib/python/Screens/TutorialWizard.py
+++ b/lib/python/Screens/TutorialWizard.py
@@ -10,8 +10,9 @@ config.misc.firstruntutorial = configElementBoolean("config.misc.firstruntutoria
class TutorialWizard(Wizard):
skin = """
- <screen position="0,0" size="720,300" title="Welcome..." flags="wfNoBorder" >
+ <screen position="0,0" size="720,560" title="Welcome..." flags="wfNoBorder" >
<widget name="text" position="50,100" size="440,200" font="Arial;23" />
+ <widget name="list" position="50,300" zPosition="1" size="440,200" />
<widget name="rc" pixmap="/usr/share/enigma2/rc.png" position="500,600" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
<widget name="arrowdown" pixmap="/usr/share/enigma2/arrowdown.png" position="0,0" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
<widget name="arrowup" pixmap="/usr/share/enigma2/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
@@ -22,7 +23,7 @@ class TutorialWizard(Wizard):
self.skin = TutorialWizard.skin
self.xmlfile = "tutorialwizard.xml"
- Wizard.__init__(self, session, showSteps=False, showStepSlider=False, showList=False, showConfig=False)
+ Wizard.__init__(self, session, showSteps=False, showStepSlider=False, showList=True, showConfig=False)
self["rc"] = MovingPixmap()
self["arrowdown"] = MovingPixmap()
self["arrowup"] = MovingPixmap()