1) since libfdisk isn't setting up the text domain for C programs

    anymore, we have to set it in the timezone map module
2)  remove the America/New York default and have the text interface fetch
    it from the insttimelanguage

Fixes #48723

4 files changed, 7 insertions, 8 deletions

diff --git a/gnome-map/pytimezone b/gnome-map/pytimezone
index 9fb9cd3b0..4e131a529 100755
--- a/gnome-map/pytimezone
+++ b/gnome-map/pytimezone
@@ -1,9 +1,7 @@
 #!/usr/bin/python
 
 import sys
-sys.path.append ("../isys")
 from gnome.ui import *
-import isys
 import timezonemap
 from gtk import *
 import GdkImlib
diff --git a/gnome-map/timezonemapmodule.c b/gnome-map/timezonemapmodule.c
index f5619ff37..befd549fb 100644
--- a/gnome-map/timezonemapmodule.c
+++ b/gnome-map/timezonemapmodule.c
@@ -897,6 +897,10 @@ static tzObject * doNewTZ (PyObject * s, PyObject * args) {
 
 void inittimezonemap (void) {
     init_pygtk();
+    setlocale (LC_MESSAGES, "");
+    setlocale (LC_CTYPE, "");
+    bindtextdomain("anaconda","/usr/share/locale");
+    textdomain("anaconda");
     
     Py_InitModule("timezonemap", timezoneMethods);
 }
diff --git a/textw/timezone_text.py b/textw/timezone_text.py
index c79e36d58..8d2e8fd75 100644
--- a/textw/timezone_text.py
+++ b/textw/timezone_text.py
@@ -68,12 +68,9 @@ class TimezoneWindow:
 
     def __call__(self, screen, instLang, timezone):
 	timezones = self.getTimezoneList()
-	rc = timezone.getTimezoneInfo()
-	if rc:
-	    (default, asUtc, asArc) = rc
-	else:
+	(default, asUtc, asArc) = timezone.getTimezoneInfo()
+        if not default:
 	    default = instLang.getDefaultTimeZone()
-	    asUtc = 0
 
 	bb = ButtonBar(screen, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON])
 	t = TextboxReflowed(30, 
diff --git a/timezone.py b/timezone.py
index 5d8afddac..98db78251 100644
--- a/timezone.py
+++ b/timezone.py
@@ -51,7 +51,7 @@ class Timezone:
 	self.arc = asArc
 
     def __init__(self):
-	self.tz = "America/New_York"
+	self.tz = None
 	self.utc = 0
 	self.arc = 0