2008-06-04 Ján ONDREJ <ondrejj@salstar.sk> (via ondrejj@fedoraproject.org)

  * po/sk.po: Typo fix.

28 files changed, 103 insertions, 99 deletions

diff --git a/iw/GroupSelector.py b/iw/GroupSelector.py
index a1bb88749..eb1e7e523 100644
--- a/iw/GroupSelector.py
+++ b/iw/GroupSelector.py
@@ -31,6 +31,7 @@ try:
 except ImportError: # yum 2.9.x
     mdErrors = yum.Errors
 from yum.constants import *
+import yuminstall
 
 I18N_DOMAIN="anaconda"
 
@@ -88,52 +89,6 @@ def _getgladefile(fn):
 t = gettext.translation(I18N_DOMAIN, "/usr/share/locale", fallback = True)
 _ = t.lgettext
 
-def getDefaultLangs():
-    languages = []
-    for envar in ('LANGUAGE', 'LC_ALL', 'LC_MESSAGES', 'LANG'):
-        val = os.environ.get(envar)
-        if val:
-            languages = val.split(':')
-            break
-    if 'C' not in languages:
-        languages.append('C')
-        
-    # now normalize and expand the languages
-    nelangs = []
-    for lang in languages:
-        for nelang in gettext._expand_lang(lang):
-            if nelang not in nelangs:
-                nelangs.append(nelang)
-    return nelangs
-    
-
-# kind of lame caching of translations so we don't always have
-# to do all the looping
-strs = {}
-def _xmltrans(base, thedict):
-    if strs.has_key(base):
-        return strs[base]
-    
-    langs = getDefaultLangs()
-    for l in langs:
-        if thedict.has_key(l):
-            strs[base] = thedict[l]
-            return strs[base]
-    strs[base] = base
-    return base
-
-def _ui_comps_sort(one, two):
-    if one.display_order > two.display_order:
-        return 1
-    elif one.display_order < two.display_order:
-        return -1
-    elif _xmltrans(one.name, one.translated_name) > \
-         _xmltrans(two.name, two.translated_name):
-        return 1
-    elif _xmltrans(one.name, one.translated_name) < \
-         _xmltrans(two.name, two.translated_name):
-        return -1
-    return 0
 
 def _deselectPackage(ayum, group, pkg):
     grpid = group.groupid
@@ -208,7 +163,7 @@ class OptionalPackageSelector:
         if parent:
             self.window.set_transient_for(parent)
         self.window.set_title(_("Packages in %s") %
-                               _xmltrans(group.name, group.translated_name))
+                               yuminstall.xmltrans(group.name, group.translated_name))
         self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
         self.window.set_size_request(600, 400)
         self._createStore()
@@ -412,11 +367,11 @@ class GroupSelector:
     def _populateGroups(self, groups, defaultpix = None):
         grps = map(lambda x: self.ayum.comps.return_group(x),
                    filter(lambda x: self.ayum.comps.has_group(x), groups))
-        grps.sort(_ui_comps_sort)
+        grps.sort(yuminstall.ui_comps_sort)
         for grp in grps:
             if not _groupHasPackages(grp, self.ayum):
                 continue
-            s = "<span size=\"large\" weight=\"bold\">%s</span>" % _xmltrans(grp.name, grp.translated_name)
+            s = "<span size=\"large\" weight=\"bold\">%s</span>" % yuminstall.xmltrans(grp.name, grp.translated_name)
 
             fn = "/usr/share/pixmaps/comps/%s.png" % grp.groupid
             if os.access(fn, os.R_OK):
@@ -456,9 +411,9 @@ class GroupSelector:
             return
         
         if grp.description:
-            txt = _xmltrans(grp.description, grp.translated_description)
+            txt = yuminstall.xmltrans(grp.description, grp.translated_description)
         else:
-            txt = _xmltrans(grp.name, grp.translated_name)
+            txt = yuminstall.xmltrans(grp.name, grp.translated_name)
 
         inst = 0
         cnt = 0
@@ -512,11 +467,11 @@ class GroupSelector:
     def populateCategories(self):
         self.catstore.clear()
         cats = self.ayum.comps.categories
-        cats.sort(_ui_comps_sort)
+        cats.sort(yuminstall.ui_comps_sort)
         for cat in cats:
             if not _catHasGroupWithPackages(cat, self.ayum):
                 continue
-            s = "<span size=\"large\" weight=\"bold\">%s</span>" % _xmltrans(cat.name, cat.translated_name)
+            s = "<span size=\"large\" weight=\"bold\">%s</span>" % yuminstall.xmltrans(cat.name, cat.translated_name)
             self.catstore.append(None, [s, cat])
 
         # select the first category
diff --git a/iw/account_gui.py b/iw/account_gui.py
index a3860bb09..d44bd0ce2 100644
--- a/iw/account_gui.py
+++ b/iw/account_gui.py
@@ -23,10 +23,13 @@ import gtk
 import string
 import gui
 from iw_gui import *
-from rhpl.translate import _
 from flags import flags
+from constants import *
 import cracklib
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 class AccountWindow (InstallWindow):
     def getScreen(self, anaconda):
         self.rootPassword = anaconda.id.rootPassword
@@ -117,6 +120,7 @@ class AccountWindow (InstallWindow):
 
         msg = cracklib.FascistCheck(pw)
         if msg is not None:
+            msg = gettext.ldgettext("cracklib", msg)
             ret = self.intf.messageWindow(_("Weak Password"),
                                           _("Weak password provided: %s"
                                             "\n\n"
diff --git a/iw/autopart_type.py b/iw/autopart_type.py
index e158d02b1..1573e7c51 100644
--- a/iw/autopart_type.py
+++ b/iw/autopart_type.py
@@ -24,8 +24,6 @@ import gobject
 import math
 
 import autopart
-import rhpl
-from rhpl.translate import _, N_
 from constants import *
 import gui
 from partition_ui_helpers_gui import *
@@ -37,6 +35,9 @@ import network
 import partitions
 import iscsi
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 def whichToResize(partitions, diskset, intf):
     def getActive(combo):
         act = combo.get_active_iter()
@@ -323,7 +324,7 @@ class PartitionTypeWindow(InstallWindow):
         (dxml, dialog) = gui.getGladeWidget("adddrive.glade", "addDriveDialog")
         gui.addFrame(dialog)
         dialog.show_all()
-        if rhpl.getArch() not in ("s390", "s390x"):
+        if not iutil.isS390():
             dxml.get_widget("zfcpRadio").hide()
             dxml.get_widget("zfcpRadio").set_group(None)
 
@@ -452,7 +453,7 @@ class PartitionTypeWindow(InstallWindow):
             self.xml.get_widget("bootDriveCombo").set_sensitive(False)
             self.xml.get_widget("encryptButton").set_sensitive(False)
 
-        if rhpl.getArch() not in ["s390", "s390x"] and not iscsi.has_iscsi():
+        if not iutil.isS390() and not iscsi.has_iscsi():
             self.xml.get_widget("addButton").set_sensitive(False)
 
         sigs = { "on_partitionTypeCombo_changed": self.comboChanged,
diff --git a/iw/blpasswidget.py b/iw/blpasswidget.py
index 80932bde6..e9f7a8934 100644
--- a/iw/blpasswidget.py
+++ b/iw/blpasswidget.py
@@ -21,8 +21,10 @@
 
 import gtk
 import gui
-from rhpl.translate import _, N_
+from constants import *
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
 
 class BootloaderPasswordWidget:
     def __init__(self, anaconda, parent):
diff --git a/iw/bootloader_main_gui.py b/iw/bootloader_main_gui.py
index 8ab9c5e14..11cb7601b 100644
--- a/iw/bootloader_main_gui.py
+++ b/iw/bootloader_main_gui.py
@@ -24,7 +24,10 @@ import gobject
 import partedUtils
 import gui
 from iw_gui import *
-from rhpl.translate import _, N_
+from constants import *
+
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
 
 from osbootwidget import OSBootWidget
 from blpasswidget import BootloaderPasswordWidget
diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py
index 79c9215e5..515cb5fea 100644
--- a/iw/congrats_gui.py
+++ b/iw/congrats_gui.py
@@ -20,12 +20,13 @@
 
 import gtk
 import gui
-import rhpl
 from iw_gui import *
-from rhpl.translate import _, N_
 from constants import *
 import os
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 class CongratulationWindow (InstallWindow):		
 
     windowTitle = N_("Congratulations")
@@ -65,8 +66,9 @@ class CongratulationWindow (InstallWindow):
             hbox.pack_start (a, False, False, 36)
 
         bootstr = ""
-        if rhpl.getArch() == "s390" or os.path.exists("/dev/live-osimg"):
-            floppystr = ""
+        if iutil.isS390() or os.path.exists("/dev/live-osimg"):
+            floppystr = _("Please reboot the system to use the installed "
+                          "system.\n\n")
         else:
             floppystr = _("Press the \"Reboot\" button to reboot your system."
                           "\n\n")
diff --git a/iw/examine_gui.py b/iw/examine_gui.py
index 58b2d8def..94cabad5b 100644
--- a/iw/examine_gui.py
+++ b/iw/examine_gui.py
@@ -22,11 +22,13 @@ import gtk
 import gui
 from iw_gui import *
 from pixmapRadioButtonGroup_gui import pixmapRadioButtonGroup
-from rhpl.translate import _, N_
 from constants import *
 import upgrade
 from flags import flags
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 UPGRADE_STR = "upgrade"
 REINSTALL_STR = "reinstall"
 
diff --git a/iw/iw_gui.py b/iw/iw_gui.py
index f22969d0e..6cdeaa9fe 100644
--- a/iw/iw_gui.py
+++ b/iw/iw_gui.py
@@ -17,7 +17,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from rhpl.translate import _
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
 
 class InstallWindow:
 
diff --git a/iw/language_gui.py b/iw/language_gui.py
index 36e79fd8b..fdb4993c8 100644
--- a/iw/language_gui.py
+++ b/iw/language_gui.py
@@ -21,7 +21,10 @@ import gobject
 import gtk
 import gui
 from iw_gui import *
-from rhpl.translate import _, N_
+from constants import *
+
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
 
 from gui import setupTreeViewFixupIdleHandler
 
diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py
index 84e83a92d..5c996a1a9 100644
--- a/iw/lvm_dialog_gui.py
+++ b/iw/lvm_dialog_gui.py
@@ -26,8 +26,6 @@ import gobject
 import gtk
 import datacombo
 
-from rhpl.translate import _, N_
-
 import gui
 from fsset import *
 from partRequests import *
@@ -36,6 +34,9 @@ from constants import *
 import lvm
 from cryptodev import LUKSDevice
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 import logging
 log = logging.getLogger("anaconda")
 
diff --git a/iw/netconfig_dialog.py b/iw/netconfig_dialog.py
index dd5554e1a..954b299cf 100644
--- a/iw/netconfig_dialog.py
+++ b/iw/netconfig_dialog.py
@@ -23,7 +23,9 @@ import gtk
 import gobject
 import gui
 
-from rhpl.translate import _, N_
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
 
 import gui
 import network
diff --git a/iw/network_gui.py b/iw/network_gui.py
index 95a6c1e5e..3da933364 100644
--- a/iw/network_gui.py
+++ b/iw/network_gui.py
@@ -27,10 +27,13 @@ import gobject
 from iw_gui import *
 import isys
 import gui
-from rhpl.translate import _, N_
 import network
 import checklist
 
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 global_options = [_("Gateway"), _("Primary DNS"), _("Secondary DNS")]
 global_option_labels = [_("_Gateway"), _("_Primary DNS"), _("_Secondary DNS")]
 
diff --git a/iw/osbootwidget.py b/iw/osbootwidget.py
index acda638b2..d4a294277 100644
--- a/iw/osbootwidget.py
+++ b/iw/osbootwidget.py
@@ -26,9 +26,10 @@ import parted
 import partedUtils
 import gui
 import datacombo
-from rhpl.translate import _, N_
 from constants import *
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
 
 class OSBootWidget:
     """Widget to display OSes to boot and allow adding new ones."""
diff --git a/iw/package_gui.py b/iw/package_gui.py
index 844ffee54..133dcbf94 100644
--- a/iw/package_gui.py
+++ b/iw/package_gui.py
@@ -25,7 +25,10 @@ from GroupSelector import GroupSelector
 
 import gui
 from iw_gui import *
-from rhpl.translate import _, N_
+
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
 
 class GroupSelectionWindow (InstallWindow):
     def getScreen(self, anaconda):
diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py
index 839807840..0b5e52d34 100644
--- a/iw/partition_dialog_gui.py
+++ b/iw/partition_dialog_gui.py
@@ -25,8 +25,6 @@ import copy
 import gobject
 import gtk
 
-from rhpl.translate import _, N_
-
 import gui
 from fsset import *
 from cryptodev import LUKSDevice
@@ -34,6 +32,8 @@ from partRequests import *
 from partition_ui_helpers_gui import *
 from constants import *
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
 
 class PartitionEditor:
     def sizespinchangedCB(self, widget, fillmaxszsb):
diff --git a/iw/partition_gui.py b/iw/partition_gui.py
index 7014a17ae..b1b1534c6 100644
--- a/iw/partition_gui.py
+++ b/iw/partition_gui.py
@@ -43,7 +43,6 @@ import lvm_dialog_gui
 import raid_dialog_gui
 import partition_dialog_gui
 
-from rhpl.translate import _, N_
 from partIntfHelpers import *
 from partedUtils import *
 from fsset import *
@@ -51,6 +50,9 @@ from partRequests import *
 from constants import *
 from partition_ui_helpers_gui import *
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 import logging
 log = logging.getLogger("anaconda")
 
@@ -968,8 +970,7 @@ class PartitionWindow(InstallWindow):
             self.diskStripeGraph.selectSlice(partition)
 
     def newCB(self, widget):
-        # create new request of size 1M
-        request = NewPartitionSpec(fileSystemTypeGetDefault(), size = 100)
+        request = NewPartitionSpec(fileSystemTypeGetDefault(), size = 200)
 
         self.editPartitionRequest(request, isNew = 1)
 
@@ -1322,7 +1323,7 @@ class PartitionWindow(InstallWindow):
 
 	# see which option they choose
 	if createRAIDpart.get_active():
-	    rdrequest = NewPartitionSpec(fileSystemTypeGet("software RAID"), size = 100)
+	    rdrequest = NewPartitionSpec(fileSystemTypeGet("software RAID"), size = 200)
 	    rc = self.editPartitionRequest(rdrequest, isNew = 1, restrictfs=["software RAID"])
 	elif createRAIDdev.get_active():
 	    self.editRaidRequest(request, isNew=1)
diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py
index 08e997625..bda091406 100644
--- a/iw/partition_ui_helpers_gui.py
+++ b/iw/partition_ui_helpers_gui.py
@@ -33,8 +33,8 @@ from partIntfHelpers import *
 from partRequests import *
 from partedUtils import *
 
-import rhpl
-from rhpl.translate import _, N_
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
 
 def istruefalse(val):
     if val is None or not val:
diff --git a/iw/partmethod_gui.py b/iw/partmethod_gui.py
index 6547dba0c..8aa7bf542 100644
--- a/iw/partmethod_gui.py
+++ b/iw/partmethod_gui.py
@@ -22,9 +22,12 @@
 import gtk
 from gui import WrappingLabel
 from iw_gui import *
-from rhpl.translate import _
 from autopart import PARTMETHOD_TYPE_DESCR_TEXT
 
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 class PartitionMethodWindow(InstallWindow):
     def __init__(self, ics):
 	InstallWindow.__init__(self, ics)
diff --git a/iw/pixmapRadioButtonGroup_gui.py b/iw/pixmapRadioButtonGroup_gui.py
index bb72220db..89c4bb4e0 100644
--- a/iw/pixmapRadioButtonGroup_gui.py
+++ b/iw/pixmapRadioButtonGroup_gui.py
@@ -19,7 +19,6 @@
 #
 
 import gtk
-from rhpl.translate import _, N_
 from constants import *
 
 class pixmapRadioButtonGroup:
@@ -200,7 +199,7 @@ if __name__ == "__main__":
     else:
 	opts = ['8.0 - /dev/hda1']
 
-    label = _("The following installed system will be upgraded:")
+    label = "The following installed system will be upgraded:"
     upgradeoption = gtk.OptionMenu()
     upgradeoptionmenu = gtk.Menu()
     for lev in opts:
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index b0f15fa35..4b3499f43 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -27,7 +27,6 @@ import pango
 import gui
 from flags import flags
 from iw_gui import *
-from rhpl.translate import _, N_
 from constants import *
 import language
 
diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py
index d62e368fd..63c9f2ee8 100644
--- a/iw/raid_dialog_gui.py
+++ b/iw/raid_dialog_gui.py
@@ -27,8 +27,6 @@ import gobject
 import gtk
 import datacombo
 
-from rhpl.translate import _, N_
-
 import gui
 from fsset import *
 from raid import availRaidLevels
@@ -37,6 +35,9 @@ from partRequests import *
 from partition_ui_helpers_gui import *
 from constants import *
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 class RaidEditor:
 
     def createAllowedRaidPartitionsList(self, allraidparts, reqraidpart,
diff --git a/iw/task_gui.py b/iw/task_gui.py
index e7a8e3a70..243415eac 100644
--- a/iw/task_gui.py
+++ b/iw/task_gui.py
@@ -22,10 +22,12 @@ import gtk.glade
 import gobject
 import gui
 from iw_gui import *
-from rhpl.translate import _, N_
-from constants import productName
+from constants import *
 import isys
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 from netconfig_dialog import NetworkConfigurator
 import network
 
@@ -371,6 +373,8 @@ class TaskWindow(InstallWindow):
         store = gtk.ListStore(gobject.TYPE_BOOLEAN,
                               gobject.TYPE_STRING,
                               gobject.TYPE_PYOBJECT)
+        store.set_sort_column_id(1, gtk.SORT_ASCENDING)
+
         tl = self.xml.get_widget("repoList")
         tl.set_model(store)
 
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index e1135304a..2b6290901 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -28,18 +28,19 @@ import pango
 import sys
 
 from timezone_map_gui import TimezoneMap, Enum
-from rhpl.translate import _, textdomain
 from iw_gui import *
 from bootloaderInfo import dosFilesystems
 from bootloader import hasWindows
 
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 try:
     import gnomecanvas
 except ImportError:
     import gnome.canvas as gnomecanvas
 
-textdomain("system-config-date")
-
 class TimezoneWindow(InstallWindow):
     def __init__(self, ics):
         InstallWindow.__init__(self, ics)
@@ -134,7 +135,7 @@ class AnacondaTZMap(TimezoneMap):
                     # York as the default.
                     self.fallbackEntry = entry
 
-            iter = self.tzStore.insert_after(iter, [_(entry.tz), entry.tz, entry])
+            iter = self.tzStore.insert_after(iter, [gettext.ldgettext("system-config-date", entry.tz), entry.tz, entry])
 
     def timezone_list_init (self, default):
         self.hbox = gtk.HBox()
diff --git a/iw/upgrade_bootloader_gui.py b/iw/upgrade_bootloader_gui.py
index 84c16dc22..63ebb9d64 100644
--- a/iw/upgrade_bootloader_gui.py
+++ b/iw/upgrade_bootloader_gui.py
@@ -23,9 +23,12 @@
 from iw_gui import *
 
 import gtk
-from rhpl.translate import _, N_
 import checkbootloader
 
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 import logging
 log = logging.getLogger("anaconda")
 
diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py
index 27c82d7d2..bd683b68e 100644
--- a/iw/upgrade_migratefs_gui.py
+++ b/iw/upgrade_migratefs_gui.py
@@ -20,7 +20,6 @@
 #
 
 from iw_gui import *
-from rhpl.translate import _, N_
 from constants import *
 import string
 import isys 
@@ -28,6 +27,9 @@ import iutil
 from fsset import *
 import gtk
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
 class UpgradeMigrateFSWindow (InstallWindow):		
     windowTitle = N_("Migrate File Systems")
 
@@ -60,7 +62,7 @@ class UpgradeMigrateFSWindow (InstallWindow):
         box.set_border_width (5)
 
 	text = (_("This release of %s supports "
-                 "the an updated file system, which has several "
+                 "an updated file system, which has several "
                  "benefits over the file system traditionally shipped "
                  "in %s.  This installation program can migrate "
                  "formatted partitions without data loss.\n\n"
diff --git a/iw/upgrade_swap_gui.py b/iw/upgrade_swap_gui.py
index f16ce5222..83e27c6dd 100644
--- a/iw/upgrade_swap_gui.py
+++ b/iw/upgrade_swap_gui.py
@@ -27,7 +27,9 @@ import gtk
 from iw_gui import *
 from flags import flags
 
-from rhpl.translate import _, N_
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
 
 class UpgradeSwapWindow (InstallWindow):		
     windowTitle = N_("Upgrade Swap Partition")
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index c386d87be..a12a2e104 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -20,7 +20,10 @@
 import gtk
 import gui
 from iw_gui import *
-from rhpl.translate import _, N_
+
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
 
 class WelcomeWindow (InstallWindow):		
 
diff --git a/iw/zipl_gui.py b/iw/zipl_gui.py
index c27d4ad0e..b90eaae2b 100644
--- a/iw/zipl_gui.py
+++ b/iw/zipl_gui.py
@@ -23,7 +23,9 @@ import isys
 import gtk
 import string
 from iw_gui import *
-from rhpl.translate import _, N_
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
 
 class ZiplWindow (InstallWindow):
     checkMark = None