Merge lp:~evfool/software-center/fix751068 into lp:software-center

[Robert Roth]

Date format localized in the Installed on .... string (LP: #751068). Fixed some typos.

[Gary Lasker (gary-lasker)]

Looks great, thanks Robert!

review: Approve

[Kiwinote (kiwinote)]

Hi Robert,
Just two quick points on this diff:
- I see both strftime_( and strftime( -this is inconsistent, so presumably one of them is wrong.
- It would seem that the string itself is no longer marked for translation.
It would be great if you could look into these!

review: Needs Fixing

[Robert Roth (evfool)]

Fixed based on Kiwinote's suggestions, it indeed had some typos. Resubmitting.

[Kiwinote (kiwinote)]

That would seem to look better now. Thanks!

[Gary Lasker (gary-lasker)]

Hey again Robert, thanks for getting back so quickly with the fixup! (and thanks kiwinote for noticing the typo that eluded my eye) :)

Note I made a couple of additional tweaks before merging your latest branch rev. You can see what I did by looking at trunk, rev 1680. First, as it turns out the unit test test/test_appdetails_view.py was failing. It's actually a good practice to run the suite of unit tests when making changes to make sure they still pass (I should have done that before my initial merge, for instance, as that would have uncovered the typo right off...definitely my bad!). More on unit tests in Software Center in a minute.

A second tweak that was needed was that, as it turns out, the value of app_details.purchase_date is actually a string, so it needed conversion before formatting. And one final tweak was that there was an additional instance of the unlocalized 'Purchased on %s' string a little further down in appdetails_gtk.py (in the 'state == PKG_STATE_PURCHASED_BUT_REPO_MUST_BE_ENABLED' section), so I fixed that up to match the one above. I updated the unit tests to cover these cases.

If you get a chance, please take a look at these changes and ping me if there's anything I may have missed, etc.

Ok, back to unit tests. For reference for the future, to run the full set of unit tests you need just do the following (starting in the top branch directory):

  cd test
  make

To run an individual test, it's just:

  cd test
  PYTHONPATH=. python test_appdetails_view.py

And thank you again for your help! It's very much appreciated!

Cheers,
Gary

review: Approve

=== modified file 'softwarecenter/view/appdetailsview_gtk.py'
--- softwarecenter/view/appdetailsview_gtk.py	2011-04-05 08:40:04 +0000
+++ softwarecenter/view/appdetailsview_gtk.py	2011-04-05 17:14:27 +0000
@@ -267,10 +267,10 @@
             else:
                 if app_details.purchase_date:
                     # TRANSLATORS : %x is the locale-specific date representation, %Y-%m-%d formats the date like 2011-03-31
-                    self.set_label(app_details.purchase_date.strftime_('Purchased on %Y-%m-%d') )
+                    self.set_label(app_details.purchase_date.strftime(_('Purchased on %Y-%m-%d')) )
                 elif app_details.installation_date:
                     # TRANSLATORS : %x is the locale-specific date representation, %Y-%m-%d formats the date like 2011-03-31
-                    self.set_label(app_details.installation_date.strftime('Installed on %Y-%m-%d') )
+                    self.set_label(app_details.installation_date.strftime(_('Installed on %Y-%m-%d')) )
                 else:
                     self.set_label(_('Installed'))
             if state == PKG_STATE_REINSTALLABLE: # only deb files atm