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

[PATCH 5/6 master] Translate task and repo names based on the product.img (#622064).



From: Chris Lumens <clumens redhat com>

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

diff --git a/pyanaconda/iw/task_gui.py b/pyanaconda/iw/task_gui.py
index e639010..42c2dfd 100644
--- a/pyanaconda/iw/task_gui.py
+++ b/pyanaconda/iw/task_gui.py
@@ -623,7 +623,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
@@ -663,7 +663,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/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py
index 28f5fb4..5a06969 100644
--- a/pyanaconda/yuminstall.py
+++ b/pyanaconda/yuminstall.py
@@ -690,7 +690,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
 
@@ -843,8 +843,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 repo.isEnabled():
                     addonRepo.enable()
-- 
1.7.2.3


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