changes for i18n

5 files changed, 14 insertions, 13 deletions

diff --git a/gui.py b/gui.py
index 36b287a4b..cf61fb2dc 100755
--- a/gui.py
+++ b/gui.py
@@ -74,10 +74,10 @@ class WaitWindow:
     def __init__(self, title, text):
 	threads_enter ()
         self.window = GtkWindow (WINDOW_POPUP)
-        self.window.set_title (title)
+        self.window.set_title (_(title))
         self.window.set_position (WIN_POS_CENTER)
         self.window.set_modal (TRUE)
-        label = GtkLabel (text)
+        label = GtkLabel (_(text))
         label.set_line_wrap (TRUE)
         box = GtkFrame ()
         box.set_border_width (10)
@@ -90,7 +90,6 @@ class WaitWindow:
 	self.window.show_all ()
         thread = currentThread ()
         if thread.getName () == "gtk_main":
-            gdk_flush ()
             while events_pending ():
                 mainiteration (FALSE)
         threads_leave ()
@@ -104,13 +103,13 @@ class ProgressWindow:
     def __init__(self, title, text, total):
 	threads_enter ()
         self.window = GtkWindow (WINDOW_POPUP)
-        self.window.set_title (title)
+        self.window.set_title (_(title))
         self.window.set_position (WIN_POS_CENTER)
         self.window.set_modal (TRUE)
         box = GtkVBox (5)
         box.set_border_width (10)
 
-        label = GtkLabel (text)
+        label = GtkLabel (_(text))
         label.set_line_wrap (TRUE)
         label.set_alignment (0.0, 0.5)
         box.pack_start (label)
@@ -160,10 +159,10 @@ class MessageWindow:
     def __init__ (self, title, text, type = "ok"):
         threads_enter ()
         if type == "ok":
-            self.window = GnomeOkDialog (text)
+            self.window = GnomeOkDialog (_(text))
             self.window.connect ("clicked", self.quit)
         if type == "okcancel":
-            self.window = GnomeOkCancelDialog (text, self.okcancelquit)
+            self.window = GnomeOkCancelDialog (_(text), self.okcancelquit)
         # this is the pixmap + the label
         hbox = self.window.vbox.children ()[0]
         label = hbox.children ()[1]
diff --git a/installclass.py b/installclass.py
index 9510ce00d..32e38267b 100644
--- a/installclass.py
+++ b/installclass.py
@@ -285,6 +285,6 @@ class Server(InstallClass):
 	self.partitions.append(('/home', 512, 512, 1))
 	self.partitions.append(('swap', 64, 64, 1))
 	self.setClearParts(FSEDIT_CLEAR_ALL, 
-	    warningText = _("You are about to erase ALL DATA on your hard " + \
+	    warningText = _("You are about to erase ALL DATA on your hard "
 			    "drive to make room for your Linux installation."))
 
diff --git a/iw/language.py b/iw/language.py
index 0d11e623a..ac776f89a 100644
--- a/iw/language.py
+++ b/iw/language.py
@@ -36,6 +36,7 @@ class LanguageWindow (InstallWindow):
         mainBox = GtkVBox (FALSE, 10)
         label = GtkLabel (self.question)
         label.set_alignment (0.5, 0.5)
+        label.set_line_wrap (TRUE)
         
  	language_keys = self.languages.keys ()
         language_keys.sort ()
diff --git a/iw/rootpartition.py b/iw/rootpartition.py
index 3240c5ec3..5b9b33093 100644
--- a/iw/rootpartition.py
+++ b/iw/rootpartition.py
@@ -191,7 +191,8 @@ class AutoPartitionWindow(InstallWindow):
            GtkLabel(_("%s\n\nIf you don't want to do this, you can continue with "
 	      "this install by partitioning manually, or you can go back "
 	      "and perform a fully customized installation.") % 
-		    (todo.getPartitionWarningText(), ))
+		    (_(todo.getPartitionWarningText()), ))
+
 	label.set_line_wrap(TRUE)
 	label.set_alignment(0.0, 0.0)
 	label.set_usize(400, -1)
diff --git a/text.py b/text.py
index ece418ca8..52699d3ea 100644
--- a/text.py
+++ b/text.py
@@ -780,9 +780,9 @@ class WaitWindow:
 	width = 40
 	if (len(text) < width): width = len(text)
 
-	t = TextboxReflowed(width, text)
+	t = TextboxReflowed(width, _(text))
 
-	g = GridForm(self.screen, title, 1, 1)
+	g = GridForm(self.screen, _(title), 1, 1)
 	g.add(t, 0, 0)
 	g.draw()
 	self.screen.refresh()
@@ -881,10 +881,10 @@ class ProgressWindow:
 
 class InstallInterface:
     def progressWindow(self, title, text, total):
-        return ProgressWindow (self.screen, title, text, total)
+        return ProgressWindow (self.screen, _(title), _(text), total)
 
     def messageWindow(self, title, text):
-	ButtonChoiceWindow(self.screen, title, text,
+	ButtonChoiceWindow(self.screen, _(title), _(text),
                            buttons = [ _("OK") ])
     
     def exceptionWindow(self, title, text):