X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6eeefece35e4269e02fdb7abab4f79d8e7b8f98b..cd3cd96e2ff4c6e6a9a38393e4d93167d30f74ea:/lib/python/Components/Timezones.py

diff --git a/lib/python/Components/Timezones.py b/lib/python/Components/Timezones.py
index 704b765e..f3e24ee6 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,11 +36,20 @@ 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 = []
@@ -52,6 +59,10 @@ class Timezones:
 	
 	def getDefaultTimezone(self):
 		# TODO return something more useful - depending on country-settings?
-		return "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Vienna"
+		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()