From 335929cf7b8838d4543484d2a76f383eb3b4017d Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Wed, 25 Jan 2006 00:50:16 +0000 Subject: fixed repeated timer displays and translated the weekdays to German --- lib/python/Components/TimerList.py | 8 ++++---- lib/python/Screens/TimerEdit.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/python') diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py index 2750c7a7..6349466b 100644 --- a/lib/python/Components/TimerList.py +++ b/lib/python/Components/TimerList.py @@ -31,8 +31,8 @@ def TimerEntryComponent(timer, processed): res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 30, 560, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, timer.name)) repeatedtext = "" - days = [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ] - if not timer.repeated: + days = [ _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun") ] + if timer.repeated: flags = timer.repeated count = 0 for x in range(0, 7): @@ -42,9 +42,9 @@ def TimerEntryComponent(timer, processed): repeatedtext += days[x] count += 1 flags = flags >> 1 - res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 300, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1])))) + res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 400, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1])))) else: - res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 300, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:])))) + res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 400, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:])))) if not processed: if timer.state == TimerEntry.StateWaiting: diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index e12e29ae..b7a91ca5 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -66,9 +66,9 @@ class TimerEditList(Screen): def updateState(self): if self["timerlist"].getCurrent()[0].disabled: - self["key_yellow"].setText(_("enable")) + self["key_yellow"].setText(_("Enable")) else: - self["key_yellow"].setText(_("disable")) + self["key_yellow"].setText(_("Disable")) self["key_yellow"].instance.invalidate() def fillTimerList(self): -- cgit v1.2.3