summaryrefslogtreecommitdiffstats
path: root/iw
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-02-07 00:18:11 +0000
committerJeremy Katz <katzj@redhat.com>2003-02-07 00:18:11 +0000
commitb30ab01d7d28cb607bcf5bcc20a4217f9f4adce0 (patch)
tree780a1f866d9e86150a898458fdbec2f77495b38f /iw
parent8caf82935551746a2316d2ece0de338c2d2777b2 (diff)
downloadanaconda-b30ab01d7d28cb607bcf5bcc20a4217f9f4adce0.tar.gz
anaconda-b30ab01d7d28cb607bcf5bcc20a4217f9f4adce0.tar.xz
anaconda-b30ab01d7d28cb607bcf5bcc20a4217f9f4adce0.zip
we need to go ahead and change the labels so that we can do substitutions
(like for Red Hat Linux). this makes everything consistent about when and where we translate (#82725)
Diffstat (limited to 'iw')
-rw-r--r--iw/examine_gui.py4
-rw-r--r--iw/installpath_gui.py2
-rw-r--r--iw/pixmapRadioButtonGroup_gui.py5
3 files changed, 6 insertions, 5 deletions
diff --git a/iw/examine_gui.py b/iw/examine_gui.py
index e3d2a1e28..944fe1c22 100644
--- a/iw/examine_gui.py
+++ b/iw/examine_gui.py
@@ -56,7 +56,7 @@ class UpgradeExamineWindow (InstallWindow):
def createUpgradeOption(self):
r = pixmapRadioButtonGroup()
r.addEntry(UPGRADE_STR,
- N_("Perform an upgrade of an existing installation"),
+ _("Perform an upgrade of an existing installation"),
pixmap=self.ics.readPixmap("upgrade.png"),
descr=_("Choose this option if you would like "
"to upgrade your existing %s system. "
@@ -64,7 +64,7 @@ class UpgradeExamineWindow (InstallWindow):
"existing data on your drives.") %(productName,))
r.addEntry(REINSTALL_STR,
- N_("Perform a new %s installation") %(productName,),
+ _("Perform a new %s installation") %(productName,),
pixmap=self.ics.readPixmap("install.png"),
descr=_("Choose this option to install your system "
"from scratch. Depending on how you choose "
diff --git a/iw/installpath_gui.py b/iw/installpath_gui.py
index 901faa9c4..914d89d07 100644
--- a/iw/installpath_gui.py
+++ b/iw/installpath_gui.py
@@ -58,7 +58,7 @@ class InstallPathWindow (InstallWindow):
for (name, object, pixmap) in self.installTypes:
descr = object.description
- r.addEntry(name, name, pixmap=self.ics.readPixmap(pixmap),
+ r.addEntry(name, _(name), pixmap=self.ics.readPixmap(pixmap),
descr=_(descr))
return r
diff --git a/iw/pixmapRadioButtonGroup_gui.py b/iw/pixmapRadioButtonGroup_gui.py
index 743156775..4c07999cf 100644
--- a/iw/pixmapRadioButtonGroup_gui.py
+++ b/iw/pixmapRadioButtonGroup_gui.py
@@ -63,6 +63,7 @@ class pixmapRadioButtonGroup:
return button
# add a entry to end of list
+ # (label and descr should already be passed through _())
def addEntry(self, name, label, pixmap=None, descr=None, userdata=None):
node = {}
node["name"] = name
@@ -124,8 +125,8 @@ class pixmapRadioButtonGroup:
label = item["label"]
pixmap = item["pixmap"]
descr = item["descr"]
- radioGroup = self.pixRadioButton(radioGroup, _(label), pixmap,
- description=_(descr))
+ radioGroup = self.pixRadioButton(radioGroup, label, pixmap,
+ description=descr)
buttons.append(radioGroup)
self.buttonToEntry[radioGroup] = name