← Back to branch summary

~ubuntu-branches/ubuntu/lucid/software-center/lucid

« back to all changes in this revision

Viewing changes to softwarecenter/distro/Ubuntu.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt, Gary Lasker, Michael Vogt
  • Date: 2010-03-11 16:58:00 UTC
  • Revision ID: james.westby@ubuntu.com-20100311165800-t1x7nerqb5dxjyeq
Tags: 1.1.17
https://launchpad.net/bugs/531689
https://launchpad.net/bugs/531780
https://launchpad.net/bugs/531820
https://launchpad.net/bugs/531694
https://launchpad.net/bugs/531798
http://bugs.debian.org/572941
[ Gary Lasker ]
* softwarecenter/view/navhistory.py:
  - unescape the nav button label text (LP: #531689)
  - fix up and just use a single __str__ method (LP: #531780)
* softwarecenter/view/availablepane.py,
  softwarecenter/view/channelpane.py:
  - fix intermittent AttributeError when a previous
    model does not exist when refreshing the apps view
    (LP: #531820)

[ Michael Vogt ]
* merged lp:~mpt/software-center/bug-499893 (thanks)
* merged lp:~mpt/software-center/categorization (thanks)
* merged lp:~michaelforrest/software-center/ui-changes (thanks)
* data/icons/scalable/apps/partner.svg:
  - add partner icon (LP: #531694)
* softwarecenter/view/catview.py:
  - do not show header in subsection view
* softwarecenter/view/availablepane.py:
  - fix race in initial part creation (LP: #531798)
* debian/control:
  - add gnome-app-install transitional package (closes: #572941)

Show diffs side-by-side

added added

removed removed

Lines of Context:
softwarecenter/distro/Ubuntu.py
71
71
                break
72
72
        return (primary, button_text)
73
73
 
74
 
    def get_rdepends_text(self, cache, pkg, appname):
 
74
    def get_installation_status(self, cache, pkg, appname):
75
75
        s = ""
76
76
        if pkg.installed:
77
77
            # generic message
78
 
            s = _("%s is installed on this computer.") % appname
79
 
            # show how many packages on the system depend on this
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)
 
78
            s = _("Installed")
 
79
            # In future, say "Installed since $date"
101
80
        return s
102
81
 
103
82
    def get_distro_codename(self):