X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a630959f3049fd7dda7d687d0d5dc827ba4cfe2b..39627668ca36cecbc78ec5f677061f128957b550:/lib/python/Components/Timezones.py

diff --git a/lib/python/Components/Timezones.py b/lib/python/Components/Timezones.py
index 6f71187b..ccc98279 100644
--- a/lib/python/Components/Timezones.py
+++ b/lib/python/Components/Timezones.py
@@ -21,16 +21,27 @@ 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()"
+			from enigma import e_tzset
+			e_tzset()
 		
 	def getTimezoneList(self):
 		list = []
@@ -40,6 +51,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()