1 diff -ur anaconda-11.2.0.24.org/iw/timezone_gui.py anaconda-11.2.0.24/iw/timezone_gui.py
2 --- anaconda-11.2.0.24.org/iw/timezone_gui.py 2007-01-30 19:54:05.000000000 +0100
3 +++ anaconda-11.2.0.24/iw/timezone_gui.py 2007-02-20 18:36:25.274623000 +0100
5 gtk.glade.set_custom_handler(self.custom_widget_handler)
7 # Set the default now. We'll fix it for real in getScreen.
8 - self.default = "America/New_York"
9 + self.default = "Europe/Warsaw"
11 self.zonetab = zonetab.ZoneTab()
16 if (string.find(self.default, "UTC") != -1):
17 - self.default = "America/New_York"
18 + self.default = "Europe/Warsaw"
20 # Now fix the default we set when we made the timezone map widget.
21 self.tz.setCurrent(self.zonetab.findEntryByTZ(self.default))
23 if tz.lat >= latmin and tz.lat <= latmax and tz.long >= longmin and tz.long <= longmax:
25 elif user_data.currentEntry == None:
26 - if model.get_value(iter, 1) == "America/New_York":
27 + if model.get_value(iter, 1) == "Europe/Warsaw":
32 weight=pango.WEIGHT_BOLD)
33 self.markers[entry.tz] = marker
35 - if entry.tz == "America/New_York":
36 + if entry.tz == "Europe/Warsaw":
37 # In case the /etc/sysconfig/clock is messed up, use New
38 # York as the default.
39 self.fallbackEntry = entry
40 diff -ur anaconda-11.2.0.24.org/timezone.py anaconda-11.2.0.24/timezone.py
41 --- anaconda-11.2.0.24.org/timezone.py 2007-01-17 23:49:50.000000000 +0100
42 +++ anaconda-11.2.0.24/timezone.py 2007-02-20 19:07:07.498623000 +0100
48 from flags import flags
53 f = open(instPath + "/etc/sysconfig/clock", "w")
55 - f.write('ZONE="%s"\n' % self.tz)
56 + f.write('# Should the hardware clock be kept in Coordinated Universal Time (instead of local time).\n')
57 f.write("UTC=%s\n" % bool(self.utc))
58 + f.write('# true means your machine uses epoch 1980 in its hardware clock\n')
59 f.write("ARC=%s\n" % bool(self.arc))
61 + f.write('# true means your machine uses epoch 1900 in its hardware clock\n')
62 + f.write("SRM=false\n")
65 + # FIXME: solution for timezones like EET
66 + (area, zone) = string.split(self.tz, "/")
68 + f = open(instPath + "/etc/sysconfig/timezone", "w")
69 + f.write('# Time zone information.\n')
70 + f.write('# Directory containing zone information files.\n')
71 + f.write('ZONE_INFO_DIR="/usr/share/zoneinfo"\n')
73 + f.write('# Scheme you would like to use in your system.\n')
74 + f.write('ZONE_INFO_SCHEME="posix"\n')
76 + f.write('# Area (sometimes may be empty)\n')
77 + f.write('ZONE_INFO_AREA="%s"\n' % area)
79 + f.write('# Name of the time zone for your system.\n')
80 + f.write('TIME_ZONE="%s"\n' % zone)
83 def getTimezoneInfo(self):
84 return (self.tz, self.utc, self.arc)