Merge lp:~dobey/unity-scope-click/fix-1234211 into lp:unity-scope-click/devel

[dobey]

Improve the text in the uninstall confirmation dialog per latest design.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

=== modified file 'po/unity-scope-click.pot'
--- po/unity-scope-click.pot	2014-05-06 21:52:48 +0000
+++ po/unity-scope-click.pot	2014-05-09 19:36:21 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-06 17:50-0400\n"
+"POT-Creation-Date: 2014-05-09 15:06-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"
@@ -25,59 +25,54 @@
 msgid "Scope for searching the click app store"
 msgstr ""
 
-#: ../scope/click/preview.cpp:270
+#: ../scope/click/preview.cpp:272
 msgid "Download Error"
 msgstr ""
 
-#: ../scope/click/preview.cpp:271
+#: ../scope/click/preview.cpp:273
 msgid "Download or install failed. Please try again."
 msgstr ""
 
 #. TODO see bug LP: #1289434
-#: ../scope/click/preview.cpp:273
+#: ../scope/click/preview.cpp:275
 msgid "Close"
 msgstr ""
 
-#: ../scope/click/preview.cpp:278
+#: ../scope/click/preview.cpp:280
 msgid "Login Error"
 msgstr ""
 
-#: ../scope/click/preview.cpp:279
+#: ../scope/click/preview.cpp:281
 msgid "Please log in to your Ubuntu One account."
 msgstr ""
 
-#: ../scope/click/preview.cpp:281
+#: ../scope/click/preview.cpp:283
 msgid "Go to Accounts"
 msgstr ""
 
-#: ../scope/click/preview.cpp:505
+#: ../scope/click/preview.cpp:506
 msgid "Open"
 msgstr ""
 
-#: ../scope/click/preview.cpp:513
+#: ../scope/click/preview.cpp:514 ../scope/click/preview.cpp:615
 msgid "Uninstall"
 msgstr ""
 
-#: ../scope/click/preview.cpp:598
+#: ../scope/click/preview.cpp:599
 msgid "Confirmation"
 msgstr ""
 
-#: ../scope/click/preview.cpp:600
-msgid ""
-"Uninstalling this app will delete all the related information. Are you sure "
-"you want to uninstall?"
+#. TRANSLATORS: Do NOT translate ${title} here.
+#: ../scope/click/preview.cpp:602
+msgid "Uninstall ${title}?"
 msgstr ""
 
 #. TODO: see bug LP: #1289434
-#: ../scope/click/preview.cpp:607
-msgid "Not anymore"
-msgstr ""
-
 #: ../scope/click/preview.cpp:611
-msgid "Yes Uninstall"
+msgid "Cancel"
 msgstr ""
 
-#: ../scope/click/preview.cpp:659
+#: ../scope/click/preview.cpp:663
 msgid "Install"
 msgstr ""
 

=== modified file 'scope/click/preview.cpp'
--- scope/click/preview.cpp	2014-05-07 21:22:59 +0000
+++ scope/click/preview.cpp	2014-05-09 19:36:21 +0000
@@ -33,6 +33,8 @@
 #include "qtbridge.h"
 #include "download-manager.h"
 
+#include <boost/algorithm/string/replace.hpp>
+
 #include <unity/UnityExceptions.h>
 #include <unity/scopes/PreviewReply.h>
 #include <unity/scopes/Variant.h>
@@ -595,19 +597,22 @@
 
     scopes::PreviewWidget header("hdr", "header");
     header.add_attribute_value("title", scopes::Variant(_("Confirmation")));
-    header.add_attribute_value("subtitle",
-                               scopes::Variant(_("Uninstalling this app will delete all the related information. Are you sure you want to uninstall?"))); // TODO: wording needs review. see bug LP: #1234211
+    std::string title = result["title"].get_string();
+    // TRANSLATORS: Do NOT translate ${title} here.
+    std::string message = _("Uninstall ${title}?");
+    boost::replace_first(message, "${title}", title);
+    header.add_attribute_value("subtitle", scopes::Variant(message));
     widgets.push_back(header);
 
     scopes::PreviewWidget buttons("buttons", "actions");
     scopes::VariantBuilder builder;
     builder.add_tuple({
        {"id", scopes::Variant(click::Preview::Actions::CLOSE_PREVIEW)}, // TODO: see bug LP: #1289434
-       {"label", scopes::Variant(_("Not anymore"))}
+       {"label", scopes::Variant(_("Cancel"))}
     });
     builder.add_tuple({
        {"id", scopes::Variant(click::Preview::Actions::CONFIRM_UNINSTALL)},
-       {"label", scopes::Variant(_("Yes Uninstall"))}
+       {"label", scopes::Variant(_("Uninstall"))}
     });
     buttons.add_attribute_value("actions", builder.end());
     widgets.push_back(buttons);