Merge lp:~dobey/unity-scope-click/usd-prices into lp:unity-scope-click

[dobey]

Define a constant for the currency symbol to use for USD, and use it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:274
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/521/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3495/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/61/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3800/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/521/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

=== modified file 'libclickscope/click/configuration.h'
--- libclickscope/click/configuration.h	2014-08-01 05:12:28 +0000
+++ libclickscope/click/configuration.h	2014-09-11 20:19:32 +0000
@@ -46,6 +46,7 @@
     constexpr static const char* LANGUAGE_ENVVAR {"LANGUAGE"};
     constexpr static const char* PURCHASES_ENVVAR {"CLICK_STORE_ENABLE_PURCHASES"};
     constexpr static const bool PURCHASES_DEFAULT = false;
+    constexpr static const char* CURRENCY_USD {"US$"};
     static const std::vector<const char*> FULL_LANG_CODES;
 
     virtual std::vector<std::string> get_available_frameworks();

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-08-26 15:16:25 +0000
+++ libclickscope/click/preview.cpp	2014-09-11 20:19:32 +0000
@@ -868,7 +868,7 @@
         && result["purchased"].get_bool() == false) {
         scopes::PreviewWidget payments("purchase", "payments");
         scopes::VariantMap tuple;
-        tuple["currency"] = "$";
+        tuple["currency"] = Configuration::CURRENCY_USD;
         qDebug() << "Price is" << details.package.price;
         tuple["price"] = scopes::Variant(details.package.price);
         tuple["store_item_id"] = details.package.name;

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-08-28 19:35:41 +0000
+++ scope/clickstore/store-query.cpp	2014-09-11 20:19:32 +0000
@@ -337,7 +337,7 @@
             res[click::Query::ResultKeys::PURCHASED] = false;
             if (pkg.price > 0.00f) {
                 QLocale locale;
-                price = locale.toCurrencyString(pkg.price, "$").toUtf8().data();
+                price = locale.toCurrencyString(pkg.price, Configuration::CURRENCY_USD).toUtf8().data();
             }
         }