[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH rhel6-branch] Translate task and repo names based on the product.img (#622064).



On Tue, 10 Aug 2010, Chris Lumens wrote:

---
iw/task_gui.py |    6 ++++--
yuminstall.py  |    6 +++---
2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/iw/task_gui.py b/iw/task_gui.py
index 5bce75c..4a45fa0 100644
--- a/iw/task_gui.py
+++ b/iw/task_gui.py
@@ -627,7 +627,7 @@ class TaskWindow(InstallWindow):
                continue

            enabled = self.backend.groupListDefault(grps)
-            store.append([not anyEnabled and enabled, _(txt), grps])
+            store.append([not anyEnabled and enabled, gettext.ldgettext("comps", txt), grps])

            if enabled:
                anyEnabled = True
@@ -667,7 +667,9 @@ class TaskWindow(InstallWindow):
        tl.append_column(col)

        for (reponame, repo) in self.repos.repos.items():
-            store.append([repo.isEnabled(), repo.name, repo])
+            store.append([repo.isEnabled(),
+                         gettext.ldgettext("comps", repo.name),
+                         repo])

        store.set_sort_column_id(1, gtk.SORT_ASCENDING)
        store.set_sort_func(1, self.__sortRepos)
diff --git a/yuminstall.py b/yuminstall.py
index ce1f898..31cf3ce 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -677,7 +677,7 @@ class AnacondaYum(YumSorter):
                continue

            url = "%s/%s" % (baseurl, c.get(addonSection, "repository"))
-            retval.append((addon, url))
+            retval.append((addon, c.get(addonSection, "name"), url))

        return retval

@@ -817,8 +817,8 @@ class AnacondaYum(YumSorter):
            addons = self._getAddons(repo.mirrorlist or repo.baseurl[0])
            for addon in addons:
                addonRepo = AnacondaYumRepo(addon[0])
-                addonRepo.name = addon[0]
-                addonRepo.baseurl = [ addon[1] ]
+                addonRepo.name = addon[1]
+                addonRepo.baseurl = [ addon[2] ]

                if self.anaconda.proxy:
                    addonRepo.setProxy(self.anaconda)


Ack.

--
David Cantrell <dcantrell redhat com>
Red Hat / Honolulu, HI


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]