Merge lp:~mvo/software-center/lp968974 into lp:software-center

[Michael Vogt]

This branch changes the label/button in the appdetailsview for gratis/zero-dollar apps to show "Free" and "Install"
instead of USD$0 and Buy… (LP: #968974).

To avoid a string break its using "Install" instead of "Install…" but once 12.04 is released we should change
the string to include the "…".

[Natalia Bidart (nataliabidart)]

Looks great! I tested it IRL as well.

review: Approve

[Kiwinote (kiwinote)]

Just a few quick comments based purely on ui testing rather than the code:
- in the list views 0$ apps don't have an install button (free apps have install and for purchase apps have buy) *

clicking on install for a 0$ app:
- displays a spinner view with 'connecting to payment service' (this scares people - 'i thought it was free') *
- then requires an sso login ('bit odd, but ok')
- then another spinner comes up with 'payment authorised' ('wait, why did it charge me') *
- then an auth dialog pops up with the text 'to install purchased software, authenticate'
- the text in the status bar is 'installing purchase'
- the progress pane says 'installing purchase'
- another auth dialog 'to install or remove software'

clicking on reinstall previous purchases we see:
- appname (already purchased) (shouldn't appear at all as it isn't a purchase)
- clicking on it gives a status bar 'purchased on 2012-04-12'

I think what it comes down to is that until the majority of the points above are fixed (or at a realistic minimum the ones marked *), in my opinion 'buying' something for 0$ is a lot less confusing and scary than being confronted with 'connecting to payment service' and 'payment authorised' messages.

I do of course agree that we do want to have free/install instead of 0$/buy, it just seems that the behaviour in this branch is more confusing/scary than the current situation?

[Michael Vogt (mvo)]

Based on the excellent comments from Kiwinote I set this back to Work-in-Progress and will talk with MPT about the points you mentioned.

[Matthew Paul Thomas (mpt)]

Kiwinote, you make a good case for leaving this as it is until we can fix more of the strings.

review: Needs Fixing (design)

Unmerged revisions

2961. By Michael Vogt on 2012-04-12

do not show "USD$0"/buy for gratis apps, but instead show "Free" and "Install" (LP: #968974)

=== modified file 'softwarecenter/enums.py'
--- softwarecenter/enums.py	2012-03-21 20:54:46 +0000
+++ softwarecenter/enums.py	2012-04-12 10:19:20 +0000
@@ -68,6 +68,10 @@
 # the server size "page" for ratings&reviews
 REVIEWS_BATCH_PAGE_SIZE = 10
 
+# the values that a price property can have when a app is gratis
+# this is used for e.g. demo apps in the for-purchase channel
+PRICE_GRATIS = ("0.00", "0", "")
+
 
 # the various "views" that the app has
 class ViewPages:

=== modified file 'softwarecenter/ui/gtk3/models/appstore2.py'
--- softwarecenter/ui/gtk3/models/appstore2.py	2012-03-30 09:11:08 +0000
+++ softwarecenter/ui/gtk3/models/appstore2.py	2012-04-12 10:19:20 +0000
@@ -25,6 +25,7 @@
 from gettext import gettext as _
 
 from softwarecenter.enums import (Icons,
+                                  PRICE_GRATIS,
                                   XapianValues)
 
 
@@ -47,7 +48,6 @@
 
 
 LOG = logging.getLogger(__name__)
-_FREE_AS_IN_BEER = ("0.00", "")
 
 
 class CategoryRowReference:
@@ -168,7 +168,7 @@
     def is_purchasable(self, doc):
         if doc.purchasable is None:
             doc.purchasable = (doc.get_value(XapianValues.PRICE) not in
-                _FREE_AS_IN_BEER)
+                               PRICE_GRATIS)
         return doc.purchasable
 
     def get_pkgname(self, doc):

=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
--- softwarecenter/ui/gtk3/views/appdetailsview.py	2012-03-27 14:40:22 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview.py	2012-04-12 10:19:20 +0000
@@ -40,6 +40,7 @@
 from softwarecenter.enums import (AppActions,
                                   PkgStates,
                                   Icons,
+                                  PRICE_GRATIS,
                                   SOFTWARE_CENTER_PKGNAME)
 from softwarecenter.utils import (is_unity_running,
                                   upstream_version,
@@ -374,12 +375,29 @@
             #        translatable when hardcoded, since it (currently)
             #        won't vary based on locale and as such we don't want
             #        it translated
-            self.set_label("US$ %s" % app_details.price)
+            # label
+            if app_details.price in PRICE_GRATIS:
+                self.set_label(_("Free"))
+            else:
+                self.set_label("US$ %s" % app_details.price)
+            # button
             if (app_details.hardware_requirements_satisfied and
                 app_details.region_requirements_satisfied):
-                self.set_button_label(_(u'Buy\u2026'))
+                if app_details.price in PRICE_GRATIS:
+                    # FIXME: once the 12.04 string freeze is over, we can
+                    #        change this to include the "..."
+                    #self.set_button_label(_(u"Install\u2026"))
+                    self.set_button_label(_(u"Install"))
+                else:
+                    self.set_button_label(_(u'Buy\u2026'))
             else:
-                self.set_button_label(_(u'Buy Anyway\u2026'))
+                if app_details.price in PRICE_GRATIS:
+                    # FIXME: once the 12.04 string freeze is over, we can
+                    #        change this to include the "..."
+                    #self.set_button_label(_(u"Install Anyway\u2026"))
+                    self.set_button_label(_(u"Install Anyway"))
+                else:
+                    self.set_button_label(_(u'Buy Anyway\u2026'))
         elif state == PkgStates.FORCE_VERSION:
             self.set_button_label(_('Change'))
         elif state in (

=== modified file 'test/gtk3/test_appdetailsview.py'
--- test/gtk3/test_appdetailsview.py	2012-03-15 21:19:02 +0000
+++ test/gtk3/test_appdetailsview.py	2012-04-12 10:19:20 +0000
@@ -375,6 +375,7 @@
         self.assertEqual(
             self.view.pkg_statusbar.button.get_label(), "Install Anyway")
         # and again for purchase
+        self.app_mock.details.price = "1.00"
         self.app_mock.details.pkg_state = PkgStates.NEEDS_PURCHASE
         self.view.show_app(self.app_mock)
         self.assertEqual(
@@ -385,6 +386,15 @@
         self.assertEqual(self.view.pkg_warningbar.label.get_text(),
                          _('This software requires a GPS, '
                            'but the computer does not have one.'))
+        # and again for gratis "purchase"
+        self.app_mock.details.price = "0.00"
+        self.app_mock.details.pkg_state = PkgStates.NEEDS_PURCHASE
+        self.view.show_app(self.app_mock)
+        self.assertEqual(
+            self.view.pkg_statusbar.button.get_label(),
+            # FIXME: update once the string freeze is over
+            #_(u"Install Anyway\u2026").encode("utf-8"))
+            _(u"Install Anyway").encode("utf-8"))
 
     def test_no_show_hardware_requirements(self):
         self.app_mock.details.hardware_requirements = {}
@@ -398,6 +408,7 @@
         self.assertEqual(
             self.view.pkg_statusbar.button.get_label(), _("Install"))
         # and again for purchase
+        self.app_mock.details.price = "1.00"
         self.app_mock.details.pkg_state = PkgStates.NEEDS_PURCHASE
         self.view.show_app(self.app_mock)
         self.assertEqual(
@@ -405,6 +416,15 @@
             _(u'Buy\u2026').encode("utf-8"))
         # check if the warning bar is invisible
         self.assertFalse(self.view.pkg_warningbar.get_property("visible"))
+        # and again for "gratis" purchase
+        self.app_mock.details.price = "0.00"
+        self.app_mock.details.pkg_state = PkgStates.NEEDS_PURCHASE
+        self.view.show_app(self.app_mock)
+        self.assertEqual(
+            self.view.pkg_statusbar.button.get_label(), 
+            # FIXME: update once the string freeze is over
+            #_(u'Install\u2026').encode("utf-8"))
+            _(u'Install').encode("utf-8"))
 
 class RegionRequirementsTestCase(unittest.TestCase):
     
@@ -435,6 +455,7 @@
         self.assertEqual(
             self.view.pkg_statusbar.button.get_label(), "Install Anyway")
         # and again for purchase
+        self.app_mock.details.price = "1.0"
         self.app_mock.details.pkg_state = PkgStates.NEEDS_PURCHASE
         self.view.show_app(self.app_mock)
         self.assertEqual(