X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d0f0d67a824a4d7108a0081a5f4a839dacf40036..e7d3f74e6679c23d3f6174e2d8857b5788748af9:/lib/python/Components/Timezones.py

diff --git a/lib/python/Components/Timezones.py b/lib/python/Components/Timezones.py
index 6e43aa21..7f709159 100644
--- a/lib/python/Components/Timezones.py
+++ b/lib/python/Components/Timezones.py
@@ -1,7 +1,7 @@
 from xml.sax import make_parser
 from xml.sax.handler import ContentHandler
 
-import os
+from os import environ, unlink, symlink
 import time
 
 class Timezones:
@@ -36,7 +36,15 @@ 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:
@@ -44,11 +52,8 @@ class Timezones:
 			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?
 		t = "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Vienna"