X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FTimezones.py;h=704b765e2b17deb2e47db097a1071e6f01f5689a;hb=8639b38f47e5dbe5c14ef53b28a913bdb0f9b53d;hp=6f71187b9d1dab74d13eccffbc795a1cfd3bafc9;hpb=a630959f3049fd7dda7d687d0d5dc827ba4cfe2b;p=vuplus_dvbapp

diff --git a/lib/python/Components/Timezones.py b/lib/python/Components/Timezones.py
index 6f71187..704b765 100644
--- 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,16 +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]
 		try:
 			time.tzset()
 		except:
-			print "Timezone NOT set because your python has problems with time.tzset()"
+			etimezone()
 		
 	def getTimezoneList(self):
 		list = []
@@ -40,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()