Merge lp:~dobey/unity-scope-click/plural-results into lp:unity-scope-click/devel

[dobey]

Use dngettext to have the results string be pluralized.

[Alejandro J. Cura (alecu)]

Why do you need to remove the checks with CategoryHasNumberOfResults?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:351
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/226/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/200
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/200/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/200

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

review: Approve (continuous-integration)

[dobey (dobey)]

On Mon, 2014-07-21 at 21:49 +0000, Alejandro J. Cura wrote:
> Review: Needs Information
>
> Why do you need to remove the checks with CategoryHasNumberOfResults?

I removed them from the two tests for testing the Purchased flag,
because those tests should not be testing the category results string,
but only data related to purchasing. I should have done this in the
branch that added those tests, but didn't notice it until I broke the
tests when creating this branch. So I removed them here.

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

=== modified file 'po/unity-scope-click.pot'
--- po/unity-scope-click.pot	2014-07-18 13:35:58 +0000
+++ po/unity-scope-click.pot	2014-07-21 20:51:07 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-18 09:34-0400\n"
+"POT-Creation-Date: 2014-07-21 16:42-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
 #: ../scope/clickapps/apps-query.cpp:258
@@ -105,32 +106,34 @@
 msgstr ""
 
 #: ../scope/clickapps/apps-query.cpp:297
-#: ../scope/clickstore/store-query.cpp:234
-#: ../scope/clickstore/store-query.cpp:245
+#: ../scope/clickstore/store-query.cpp:236
+#: ../scope/clickstore/store-query.cpp:247
 msgid "All departments"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:283
+#: ../scope/clickstore/store-query.cpp:285
 msgid "✔ INSTALLED"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:288
+#: ../scope/clickstore/store-query.cpp:290
 msgid "✔ PURCHASED"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:292
+#: ../scope/clickstore/store-query.cpp:298
 msgid "FREE"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:401
+#: ../scope/clickstore/store-query.cpp:408
 msgid "Available"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:404
+#: ../scope/clickstore/store-query.cpp:414
 #, c-format
-msgid "%u results in Ubuntu Store"
-msgstr ""
+msgid "%u result in Ubuntu Store"
+msgid_plural "%u results in Ubuntu Store"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../scope/clickstore/store-query.cpp:412
+#: ../scope/clickstore/store-query.cpp:424
 msgid "Recommended"
 msgstr ""

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-07-17 21:35:57 +0000
+++ scope/clickstore/store-query.cpp	2014-07-21 20:51:07 +0000
@@ -408,7 +408,12 @@
                 std::string cat_title(_("Available"));
                 {
                     char tmp[512];
-                    if (snprintf(tmp, sizeof(tmp), _("%u results in Ubuntu Store"), static_cast<unsigned int>(packages.size())) > 0) {
+                    unsigned int num_results = static_cast<unsigned int>(packages.size());
+                    if (snprintf(tmp, sizeof(tmp),
+                                 dngettext(GETTEXT_PACKAGE,
+                                           "%u result in Ubuntu Store",
+                                           "%u results in Ubuntu Store",
+                                           num_results), num_results) > 0) {
                         cat_title = tmp;
                     }
                 }

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-07-18 15:01:41 +0000
+++ scope/tests/test_query.cpp	2014-07-21 20:51:07 +0000
@@ -408,7 +408,7 @@
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
 
     ON_CALL(q, register_category(_, _, _, _, _)).WillByDefault(Return(ptrCat));
-    EXPECT_CALL(q, register_category(_, "appstore", CategoryHasNumberOfResults(1), _, _));
+    EXPECT_CALL(q, register_category(_, "appstore", _, _, _));
     EXPECT_CALL(q, register_category(_, "recommends", _, _, _));
 
     scopes::testing::MockSearchReply mock_reply;
@@ -443,7 +443,7 @@
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
 
     ON_CALL(q, register_category(_, _, _, _, _)).WillByDefault(Return(ptrCat));
-    EXPECT_CALL(q, register_category(_, "appstore", CategoryHasNumberOfResults(1), _, _));
+    EXPECT_CALL(q, register_category(_, "appstore", _, _, _));
     EXPECT_CALL(q, register_category(_, "recommends", _, _, _));
 
     scopes::testing::MockSearchReply mock_reply;