Merge lp:~gary-lasker/software-center/fix-lp955048 into lp:software-center

Proposed by Gary Lasker
Status: Merged
Merged at revision: 2858
Proposed branch: lp:~gary-lasker/software-center/fix-lp955048
Merge into: lp:software-center
Diff against target: 51 lines (+4/-4)
4 files modified
softwarecenter/db/categories.py (+1/-1)
softwarecenter/ui/gtk3/views/catview_gtk.py (+1/-1)
softwarecenter/ui/gtk3/widgets/recommendations.py (+1/-1)
test/gtk3/test_catview.py (+1/-1)
To merge this branch: bzr merge lp:~gary-lasker/software-center/fix-lp955048
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+97575@code.launchpad.net

Description of the change

String fix for the "Recommended For You" panel, includes unit test update. See bug 955048 for details.

Thanks!

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks, looks good. A string break so we need approval for this from the release-team and notify ubuntu-translators.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'softwarecenter/db/categories.py'
--- softwarecenter/db/categories.py 2012-02-29 20:56:24 +0000
+++ softwarecenter/db/categories.py 2012-03-15 05:37:21 +0000
@@ -141,7 +141,7 @@
141141
142 def __init__(self):142 def __init__(self):
143 super(RecommendedForYouCategory, self).__init__(143 super(RecommendedForYouCategory, self).__init__(
144 u"Recommended for You", _("Recommended for You"), None, 144 u"Recommended For You", _("Recommended For You"), None,
145 xapian.Query(),flags=['available-only', 'not-installed-only'], 145 xapian.Query(),flags=['available-only', 'not-installed-only'],
146 item_limit=60)146 item_limit=60)
147 self.recommender_agent = RecommenderAgent()147 self.recommender_agent = RecommenderAgent()
148148
=== modified file 'softwarecenter/ui/gtk3/views/catview_gtk.py'
--- softwarecenter/ui/gtk3/views/catview_gtk.py 2012-03-14 16:34:56 +0000
+++ softwarecenter/ui/gtk3/views/catview_gtk.py 2012-03-15 05:37:21 +0000
@@ -453,7 +453,7 @@
453 bottom_hbox_alignment.add(self.bottom_hbox)453 bottom_hbox_alignment.add(self.bottom_hbox)
454 self.vbox.pack_start(bottom_hbox_alignment, False, False, 0)454 self.vbox.pack_start(bottom_hbox_alignment, False, False, 0)
455455
456 # TODO: During development, place the "Recommended for You" panel456 # TODO: During development, place the "Recommended For You" panel
457 # at the bottom, but swap this with the Top Rated panel once457 # at the bottom, but swap this with the Top Rated panel once
458 # the recommended for you pieces are done and deployed458 # the recommended for you pieces are done and deployed
459 # see https://wiki.ubuntu.com/SoftwareCenter#Home_screen459 # see https://wiki.ubuntu.com/SoftwareCenter#Home_screen
460460
=== modified file 'softwarecenter/ui/gtk3/widgets/recommendations.py'
--- softwarecenter/ui/gtk3/widgets/recommendations.py 2012-03-13 08:29:20 +0000
+++ softwarecenter/ui/gtk3/widgets/recommendations.py 2012-03-15 05:37:21 +0000
@@ -78,7 +78,7 @@
7878
79 def __init__(self, catview):79 def __init__(self, catview):
80 RecommendationsPanel.__init__(self, catview)80 RecommendationsPanel.__init__(self, catview)
81 self.set_header_label(_(u"Recommended for You"))81 self.set_header_label(_(u"Recommended For You"))
8282
83 # if we already have a recommender UUID, then the user is already83 # if we already have a recommender UUID, then the user is already
84 # opted-in to the recommender service84 # opted-in to the recommender service
8585
=== modified file 'test/gtk3/test_catview.py'
--- test/gtk3/test_catview.py 2012-03-08 09:13:23 +0000
+++ test/gtk3/test_catview.py 2012-03-15 05:37:21 +0000
@@ -188,7 +188,7 @@
188 lobby.recommended_for_you_panel.more.clicked()188 lobby.recommended_for_you_panel.more.clicked()
189 self._p()189 self._p()
190 self.assertNotEqual(self._cat, None)190 self.assertNotEqual(self._cat, None)
191 self.assertEqual(self._cat.name, "Recommended for You")191 self.assertEqual(self._cat.name, "Recommended For You")
192 win.destroy()192 win.destroy()
193193
194 def _p(self):194 def _p(self):

Subscribers

People subscribed via source and target branches