X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FTimezones.py;h=7f709159286b0065cc3e53fd9a1dd6f76e9b7c74;hb=3bc4feea6206761d48e7ead73dfd32721bf8e259;hp=ccc982797e8c466b521362ce9c2145c98d4a2ba2;hpb=ed40f6f85c9c07c3c1224ae20601082c0309a631;p=vuplus_dvbapp

diff --git a/lib/python/Components/Timezones.py b/lib/python/Components/Timezones.py
index ccc9827..7f70915 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,13 +52,14 @@ 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?
-		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()