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

Proposed by Gary Lasker on 2012-03-15
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 2012-03-15 Approve on 2012-03-15
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.
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
1=== modified file 'softwarecenter/db/categories.py'
2--- softwarecenter/db/categories.py 2012-02-29 20:56:24 +0000
3+++ softwarecenter/db/categories.py 2012-03-15 05:37:21 +0000
4@@ -141,7 +141,7 @@
5
6 def __init__(self):
7 super(RecommendedForYouCategory, self).__init__(
8- u"Recommended for You", _("Recommended for You"), None,
9+ u"Recommended For You", _("Recommended For You"), None,
10 xapian.Query(),flags=['available-only', 'not-installed-only'],
11 item_limit=60)
12 self.recommender_agent = RecommenderAgent()
13
14=== modified file 'softwarecenter/ui/gtk3/views/catview_gtk.py'
15--- softwarecenter/ui/gtk3/views/catview_gtk.py 2012-03-14 16:34:56 +0000
16+++ softwarecenter/ui/gtk3/views/catview_gtk.py 2012-03-15 05:37:21 +0000
17@@ -453,7 +453,7 @@
18 bottom_hbox_alignment.add(self.bottom_hbox)
19 self.vbox.pack_start(bottom_hbox_alignment, False, False, 0)
20
21- # TODO: During development, place the "Recommended for You" panel
22+ # TODO: During development, place the "Recommended For You" panel
23 # at the bottom, but swap this with the Top Rated panel once
24 # the recommended for you pieces are done and deployed
25 # see https://wiki.ubuntu.com/SoftwareCenter#Home_screen
26
27=== modified file 'softwarecenter/ui/gtk3/widgets/recommendations.py'
28--- softwarecenter/ui/gtk3/widgets/recommendations.py 2012-03-13 08:29:20 +0000
29+++ softwarecenter/ui/gtk3/widgets/recommendations.py 2012-03-15 05:37:21 +0000
30@@ -78,7 +78,7 @@
31
32 def __init__(self, catview):
33 RecommendationsPanel.__init__(self, catview)
34- self.set_header_label(_(u"Recommended for You"))
35+ self.set_header_label(_(u"Recommended For You"))
36
37 # if we already have a recommender UUID, then the user is already
38 # opted-in to the recommender service
39
40=== modified file 'test/gtk3/test_catview.py'
41--- test/gtk3/test_catview.py 2012-03-08 09:13:23 +0000
42+++ test/gtk3/test_catview.py 2012-03-15 05:37:21 +0000
43@@ -188,7 +188,7 @@
44 lobby.recommended_for_you_panel.more.clicked()
45 self._p()
46 self.assertNotEqual(self._cat, None)
47- self.assertEqual(self._cat.name, "Recommended for You")
48+ self.assertEqual(self._cat.name, "Recommended For You")
49 win.destroy()
50
51 def _p(self):

Subscribers

People subscribed via source and target branches