X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d801f7ab1029416b489c32e15a857e2ce963015c..4c1d3d2f5cf39f72bf85041a6ba6665350ea742e:/lib/python/Components/Timezones.py

diff --git a/lib/python/Components/Timezones.py b/lib/python/Components/Timezones.py
index 15837450..7f709159 100644
--- a/lib/python/Components/Timezones.py
+++ b/lib/python/Components/Timezones.py
@@ -1,11 +1,9 @@
 from xml.sax import make_parser
 from xml.sax.handler import ContentHandler
 
-import os
+from os import environ, unlink, symlink
 import time
 
-from enigma import *
-
 class Timezones:
 	class parseTimezones(ContentHandler):
 		def __init__(self, timezones):
@@ -38,20 +36,30 @@ class Timezones:
 		if len(self.timezones) <= index:
 			return
 		
-		os.environ['TZ'] = self.timezones[index][1]
+		environ['TZ'] = self.timezones[index][1]
+		try:
+			unlink("/etc/localtime")
+		except OSError:
+			pass
+		try:
+			symlink("/usr/share/zoneinfo/%s" %(self.timezones[index][1]), "/etc/localtime")
+		except OSError:
+			pass
 		try:
 			time.tzset()
 		except:
-			etimezone()
+			from enigma import e_tzset
+			e_tzset()
 		
 	def getTimezoneList(self):
-		list = []
-		for x in self.timezones:
-			list.append(str(x[0]))
-		return list
-	
+		return [ str(x[0]) for x in self.timezones ]
+
 	def getDefaultTimezone(self):
 		# TODO return something more useful - depending on country-settings?
-		return 27
+		t = "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Vienna"
+		for (a,b) in self.timezones:
+			if a == t:
+				return a
+		return self.timezones[0][0]
 
 timezones = Timezones()