Ubuntu Software Center

Merge lp:~mpt/software-center/bug-499893 into lp:software-center

  1. bug-499893
  2. Merge into trunk
Proposed by Matthew Paul Thomas
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mpt/software-center/bug-499893
Merge into: lp:software-center
Diff against target: 107 lines (+8/-50)
4 files modified
softwarecenter/distro/Debian.py (+3/-24)
softwarecenter/distro/Ubuntu.py (+3/-24)
softwarecenter/distro/__init__.py (+1/-1)
softwarecenter/view/appdetailsview.py (+1/-1)
To merge this branch: bzr merge lp:~mpt/software-center/bug-499893
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+20645@code.launchpad.net

Description of the change

Fixes bug 499893. Unblocks some of the redesign of the software item screen.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'softwarecenter/distro/Debian.py'
--- softwarecenter/distro/Debian.py 2010-02-05 16:58:16 +0000
+++ softwarecenter/distro/Debian.py 2010-03-04 12:33:23 +0000
@@ -64,33 +64,12 @@
64 break64 break
65 return (primary, button_text)65 return (primary, button_text)
6666
67 def get_rdepends_text(self, cache, pkg, appname):67 def get_installation_status(self, cache, pkg, appname):
68 s = ""68 s = ""
69 if pkg.installed:69 if pkg.installed:
70 # generic message70 # generic message
71 s = _("%s is installed on this computer.") % appname71 s = _("Installed")
72 # show how many packages on the system depend on this72 # In future, say "Installed since $date"
73 installed_rdeps = cache.get_installed_rdepends(pkg)
74 installed_rrecommends = cache.get_installed_rrecommends(pkg)
75 installed_rsuggests = cache.get_installed_rsuggests(pkg)
76 if len(installed_rdeps) > 0:
77 s += " "
78 s += gettext.ngettext(
79 "It is used by %s piece of installed software.",
80 "It is used by %s pieces of installed software.",
81 len(installed_rdeps)) % len(installed_rdeps)
82 elif len(installed_rrecommends) > 0:
83 s += " "
84 s += gettext.ngettext(
85 "It is recommended by %s piece of installed software.",
86 "It is recommended by %s pieces of installed software.",
87 len(installed_rrecommends)) % len(installed_rrecommends)
88 elif len(installed_rsuggests) > 0:
89 s += " "
90 s += gettext.ngettext(
91 "It is suggested by %s piece of installed software.",
92 "It is suggested by %s pieces of installed software.",
93 len(installed_rrecommends)) % len(installed_rrecommends)
94 return s73 return s
9574
96 def get_distro_codename(self):75 def get_distro_codename(self):
9776
=== modified file 'softwarecenter/distro/Ubuntu.py'
--- softwarecenter/distro/Ubuntu.py 2010-02-17 09:14:08 +0000
+++ softwarecenter/distro/Ubuntu.py 2010-03-04 12:33:23 +0000
@@ -71,33 +71,12 @@
71 break71 break
72 return (primary, button_text)72 return (primary, button_text)
7373
74 def get_rdepends_text(self, cache, pkg, appname):74 def get_installation_status(self, cache, pkg, appname):
75 s = ""75 s = ""
76 if pkg.installed:76 if pkg.installed:
77 # generic message77 # generic message
78 s = _("%s is installed on this computer.") % appname78 s = _("Installed")
79 # show how many packages on the system depend on this79 # In future, say "Installed since $date"
80 installed_rdeps = cache.get_installed_rdepends(pkg)
81 installed_rrecommends = cache.get_installed_rrecommends(pkg)
82 installed_rsuggests = cache.get_installed_rsuggests(pkg)
83 if len(installed_rdeps) > 0:
84 s += " "
85 s += gettext.ngettext(
86 "It is used by %s installed software package.",
87 "It is used by %s installed software packages.",
88 len(installed_rdeps)) % len(installed_rdeps)
89 elif len(installed_rrecommends) > 0:
90 s += " "
91 s += gettext.ngettext(
92 "It is recommended by %s installed software package.",
93 "It is recommended by %s installed software packages.",
94 len(installed_rrecommends)) % len(installed_rrecommends)
95 elif len(installed_rsuggests) > 0:
96 s += " "
97 s += gettext.ngettext(
98 "It is suggested by %s installed software package.",
99 "It is suggested by %s installed software packages.",
100 len(installed_rrecommends)) % len(installed_rrecommends)
101 return s80 return s
10281
103 def get_distro_codename(self):82 def get_distro_codename(self):
10483
=== modified file 'softwarecenter/distro/__init__.py'
--- softwarecenter/distro/__init__.py 2010-03-03 11:08:21 +0000
+++ softwarecenter/distro/__init__.py 2010-03-04 12:33:23 +0000
@@ -45,7 +45,7 @@
45 """ The name in the Release file """45 """ The name in the Release file """
46 return "none"46 return "none"
4747
48 def get_rdepends_text(self, pkg):48 def get_installation_status(self, pkg):
49 raise UnimplementedError49 raise UnimplementedError
5050
51 def get_maintenance_status(self, cache, appname, pkgname, component, channel):51 def get_maintenance_status(self, cache, appname, pkgname, component, channel):
5252
=== modified file 'softwarecenter/view/appdetailsview.py'
--- softwarecenter/view/appdetailsview.py 2010-02-23 09:36:27 +0000
+++ softwarecenter/view/appdetailsview.py 2010-03-04 12:33:23 +0000
@@ -288,7 +288,7 @@
288 """Add message specific to this package (e.g. how many dependenies"""288 """Add message specific to this package (e.g. how many dependenies"""
289 if not self.pkg:289 if not self.pkg:
290 return ""290 return ""
291 return self.distro.get_rdepends_text(self.cache, self.pkg, self.app.name)291 return self.distro.get_installation_status(self.cache, self.pkg, self.app.name)
292 def wksub_homepage(self):292 def wksub_homepage(self):
293 s = _("Website")293 s = _("Website")
294 return s294 return s