config rewrite. some extensions still need to be updated.

[enigma2.git] / lib / python / Components / Timezones.py

diff --git a/lib/python/Components/Timezones.py b/lib/python/Components/Timezones.py
index 2eec17a67e9ed0202b2dedc904b16d76a37e9f9e..704b765e2b17deb2e47db097a1071e6f01f5689a 100644 (file)
--- a/lib/python/Components/Timezones.py
+++ b/lib/python/Components/Timezones.py
@@ -4,6 +4,8 @@ from xml.sax.handler import ContentHandler
 import os
 import time
 
+from enigma import *
+
 class Timezones:
        class parseTimezones(ContentHandler):
                def __init__(self, timezones):
@@ -21,14 +23,26 @@ class Timezones:
 
        def readTimezonesFromFile(self):
                parser = make_parser()
-               timezonesHandler = self.parseTimezones(self.timezones)
-               parser.setContentHandler(timezonesHandler)
-               parser.parse('/etc/timezone.xml')
+               
+               try:
+                       timezonesHandler = self.parseTimezones(self.timezones)
+                       parser.setContentHandler(timezonesHandler)
+                       parser.parse('/etc/timezone.xml')
+               except:
+                       pass
+               
+               if len(self.timezones) == 0:
+                       self.timezones = [("UTC", "UTC")]
                
        def activateTimezone(self, index):
+               if len(self.timezones) <= index:
+                       return
+               
                os.environ['TZ'] = self.timezones[index][1]
-               # FIXME we need a tzset
-               #time.tzset()
+               try:
+                       time.tzset()
+               except:
+                       etimezone()
                
        def getTimezoneList(self):
                list = []
@@ -38,6 +52,6 @@ class Timezones:
        
        def getDefaultTimezone(self):
                # TODO return something more useful - depending on country-settings?
-               return 27
+               return "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Vienna"
 
 timezones = Timezones()