Merge lp:~gary-lasker/software-center/recommendations-string-change-lp986437-for-5.2 into lp:software-center/5.2

Proposed by Gary Lasker on 2012-06-20
Status: Merged
Merged at revision: 3051
Proposed branch: lp:~gary-lasker/software-center/recommendations-string-change-lp986437-for-5.2
Merge into: lp:software-center/5.2
Diff against target: 24 lines (+1/-10)
1 file modified
softwarecenter/ui/gtk3/widgets/recommendations.py (+1/-10)
To merge this branch: bzr merge lp:~gary-lasker/software-center/recommendations-string-change-lp986437-for-5.2
Reviewer Review Type Date Requested Status
David Planella (community) Approve on 2012-06-23
Michael Vogt 2012-06-20 Approve on 2012-06-21
Review via email: mp+111238@code.launchpad.net

Commit message

* lp:~gary-lasker/software-center/recommendations-string-change-lp986437-for-5.2:
   - switch to the updated recommendations opt-in string now that the corresponding
     language pack updates are released and available (LP: #986437)

Description of the change

This branch contains the switchover to the modified recommendations opt-in string as described in bug 986437. Note that the string freeze exception was granted for Precise and we were holding this change until the corresponding language pack release occurred. These packs were released a while ago and so should be in place now and everything now seems ready for this merge.

To test, first launch from the branch in English to verify the text change, then test in another language (e.g. French) to verify that the translation is available and is displayed. Steps are as shown:

1. In a terminal, launch Software Center from inside this branch as shown:

  $ PYTHONPATH=. python ./software-center

2. If you are currently opt-in to recommendations choose to opt-out using the menu item "View"->"Turn off Recommendations".
3. In the "Recommended for You" panel at the bottom of the lobby view, verify that the opt-in text reads "To make recommendations, Ubuntu Software Center will occasionally sent to Canonical a list of software currently installed" (note that the word "anonymous" does not appear).
4. Close Software Center and reopen in a different language, e.g., French. First, of course, install the corresponding language pack if you have not done this already. Launch as shown in the branch directory:

  $ LANGUAGE=fr_FR.utf8 PYTHONPATH=. python ./software-center

5. Verify that the opt-in text is correctly translated into French.

Note that I also tested this with traditional Chinese using "LANGUAGE=zh_CN.UTF-8" and this case works as well.

Many thanks for your review!

To post a comment you must log in.
Gary Lasker (gary-lasker) wrote :

P.S. As per all of our other 5.2 fixes, we'll need this one to get merged into trunk as well and released into Quantal before the SRU team will approve an upload of this into precise-proposed.

Thanks again!

Michael Vogt (mvo) wrote :

On Wed, Jun 20, 2012 at 03:02:20PM -0000, Gary Lasker wrote:
> P.S. As per all of our other 5.2 fixes, we'll need this one to get merged into trunk as well and released into Quantal before the SRU team will approve an upload of this into precise-proposed.
>
> Thanks again!

Thanks, this is in trunk now.

Cheers,
 Michael

Michael Vogt (mvo) wrote :

This looks fine.

review: Approve
Michael Vogt (mvo) wrote :

This is in 5.2 and trunk now.

David Planella (dpm) wrote :

Sorry Gary for the delay in looking at this. In case it helps, it looks good to me too.

I'll be on holiday for the next 10 days, but if you need help verifying the SRU, I'd suggest sending an e-mail to the ubuntu-translators@ list, and I'm sure he'll be happy to help testing the SRU.

review: Approve
Gary Lasker (gary-lasker) wrote :

Thanks Michael, and thanks David! I appreciate your taking a look at this. My testing showed it as fine, but it is very reassuring and very much appreciated that you took the time to look at it and for us to have your approval of it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/ui/gtk3/widgets/recommendations.py'
2--- softwarecenter/ui/gtk3/widgets/recommendations.py 2012-04-30 22:27:29 +0000
3+++ softwarecenter/ui/gtk3/widgets/recommendations.py 2012-06-20 14:41:21 +0000
4@@ -146,19 +146,10 @@
5 TURN_ON_RECOMMENDATIONS_TEXT = _(u"Turn On Recommendations")
6 # FIXME: This will be the default text once LP: #986437 is approved and
7 # ready to be merged/SRU'd
8- FUTURE_RECOMMENDATIONS_OPT_IN_TEXT = _(u"To make recommendations, "
9+ RECOMMENDATIONS_OPT_IN_TEXT = _(u"To make recommendations, "
10 "Ubuntu Software Center "
11 "will occasionally send to Canonical a list "
12 "of software currently installed.")
13- # FIXME: The following unused string can be removed and the one above used
14- # after the transition to the new string has had enough time to
15- # take effect
16- # TRANSLATORS: please ignore the following string as it it just there for
17- # a transition to the updated string above
18- RECOMMENDATIONS_OPT_IN_TEXT = _(u"To make recommendations, "
19- "Ubuntu Software Center "
20- "will occasionally send to Canonical an anonymous list "
21- "of software currently installed.")
22
23 def __init__(self, catview):
24 RecommendationsPanel.__init__(self, catview)

Subscribers

People subscribed via source and target branches