Merge lp:~elopio/unity-scope-click/update_new_scopes2 into lp:unity-scope-click

[Leo Arias]

Unmerged revisions

=== modified file 'autopilot/unityclickscope/credentials.py'
--- autopilot/unityclickscope/credentials.py	2014-01-28 05:21:19 +0000
+++ autopilot/unityclickscope/credentials.py	2014-05-14 13:33:50 +0000
@@ -90,7 +90,7 @@
         auth_data = account_service.get_auth_data()
         identity = auth_data.get_credentials_id()
         method = auth_data.get_method()
-        mechanism = auth_data.get_method()
+        mechanism = auth_data.get_mechanism()
         session_data = auth_data.get_parameters()
         session = Signon.AuthSession.new(identity, method)
         session.process(

=== modified file 'autopilot/unityclickscope/test_click_scope.py'
--- autopilot/unityclickscope/test_click_scope.py	2014-04-09 16:36:08 +0000
+++ autopilot/unityclickscope/test_click_scope.py	2014-05-14 13:33:50 +0000
@@ -107,7 +107,7 @@
         logging.info('Restarting click scope.')
         os.system('pkill -f -9 clickscope.ini')
         lib_path = '/usr/lib/$DEB_HOST_MULTIARCH/'
-        scoperunner_path = os.path.join(lib_path, 'scoperunner/scoperunner')
+        scoperunner_path = os.path.join(lib_path, 'unity-scopes/scoperunner')
         clickscope_config_ini_path = os.path.join(
             lib_path, 'unity-scopes/clickscope/clickscope.ini')
         os.system(
@@ -161,11 +161,11 @@
     def test_search_available_app(self):
         self.search('Shorts')
         applications = self.scope.get_applications('appstore')
-        self.assertThat(applications[0].title, Equals('Shorts'))
+        self.assertThat(applications[0], Equals('Shorts'))
 
     def test_open_app_preview(self):
         expected_details = dict(
-            title='Shorts', subtitle='Shorts is an rssreader application')
+            title='Shorts', subtitle='Ubuntu Click Loader')
         preview = self.open_app_preview('appstore', 'Shorts')
         details = preview.get_details()
         self.assertEqual(details, expected_details)
@@ -182,14 +182,13 @@
 class ClickScopeTestCaseWithCredentials(BaseClickScopeTestCase):
 
     def setUp(self):
-        self.skipTest('segfaults. TODO in following branches.')
+#        self.skipTest('segfaults. TODO in following branches.')
         self.add_u1_credentials()
         super(ClickScopeTestCaseWithCredentials, self).setUp()
         self.scope = self.open_scope()
         self.preview = self.open_app_preview('appstore', 'Shorts')
 
     def add_u1_credentials(self):
-        import pdb; pdb.set_trace()
         account_manager = credentials.AccountManager()
         account = account_manager.add_u1_credentials(
             '[e-mail]', 'dummy')

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-05-06 21:28:13 +0000
+++ po/CMakeLists.txt	2014-05-14 13:33:50 +0000
@@ -4,7 +4,7 @@
 
 set(GETTEXT_PACKAGE ${PROJECT_NAME})
 set(POT_FILE ${GETTEXT_PACKAGE}.pot)
-file(STRINGS LINGUAS LINGUAS)
+file(GLOB POFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po)
 
 # Creates POTFILES
 add_custom_target(POTFILES ALL
@@ -22,12 +22,13 @@
 
 # Builds the binary translations catalog for each language
 # it finds source translations (*.po) for
-foreach(LANG ${LINGUAS})
-    list(APPEND PO_FILES "${LANG}.po")
-    gettext_process_po_files(${LANG} ALL PO_FILES "${LANG}.po")
+foreach(POFILE ${POFILES})
+    string(REPLACE ".po" "" LANG ${POFILE})
+    list(APPEND PO_FILES "${POFILE}")
+    gettext_process_po_files(${LANG} ALL PO_FILES "${POFILE}")
     set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
             DESTINATION ${INSTALL_DIR}
             RENAME ${GETTEXT_PACKAGE}.mo
     )
-endforeach(LANG)
+endforeach(POFILE)

=== removed file 'po/LINGUAS'
--- po/LINGUAS	2014-05-06 21:28:13 +0000
+++ po/LINGUAS	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-ar
-ca
-de
-es
-eu
-fi
-fr
-gd
-gl
-he
-id
-it
-lv
-nb
-ru
-sl
-uk
-zh_CN

=== added file 'po/my.po'
--- po/my.po	1970-01-01 00:00:00 +0000
+++ po/my.po	2014-05-14 13:33:50 +0000
@@ -0,0 +1,90 @@
+# Burmese translation for unity-scope-click
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the unity-scope-click package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: unity-scope-click\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-06 17:50-0400\n"
+"PO-Revision-Date: 2014-05-11 08:48+0000\n"
+"Last-Translator: Pyae Sone <Unknown>\n"
+"Language-Team: Burmese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-12 07:13+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#: ../data/clickscope.ini.in.in.h:1
+msgid "Apps"
+msgstr "Apps"
+
+#: ../data/clickscope.ini.in.in.h:2
+msgid "Scope for searching the click app store"
+msgstr ""
+
+#: ../scope/click/preview.cpp:270
+msgid "Download Error"
+msgstr ""
+
+#: ../scope/click/preview.cpp:271
+msgid "Download or install failed. Please try again."
+msgstr ""
+
+#. TODO see bug LP: #1289434
+#: ../scope/click/preview.cpp:273
+msgid "Close"
+msgstr "ပိတ်"
+
+#: ../scope/click/preview.cpp:278
+msgid "Login Error"
+msgstr "ဝင်ရောက်မှုမအောင်မြင်ပါ"
+
+#: ../scope/click/preview.cpp:279
+msgid "Please log in to your Ubuntu One account."
+msgstr "သင်၏ Ubuntu One အကောင့်ထဲသို့ဝင်ရောက်ပါ"
+
+#: ../scope/click/preview.cpp:281
+msgid "Go to Accounts"
+msgstr "အကောင့်သို့သွားမည်"
+
+#: ../scope/click/preview.cpp:505
+msgid "Open"
+msgstr "ဖွင့်"
+
+#: ../scope/click/preview.cpp:513
+msgid "Uninstall"
+msgstr "စက်ထဲမှထုတ်ရန်"
+
+#: ../scope/click/preview.cpp:598
+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?"
+msgstr ""
+
+#. TODO: see bug LP: #1289434
+#: ../scope/click/preview.cpp:607
+msgid "Not anymore"
+msgstr ""
+
+#: ../scope/click/preview.cpp:611
+msgid "Yes Uninstall"
+msgstr "ဟုတ်၊စက်ထဲမှထုတ်မည်"
+
+#: ../scope/click/preview.cpp:659
+msgid "Install"
+msgstr "စက်ထဲသို့ထည့်သွင်းမည်"
+
+#: ../scope/click/query.cpp:95
+msgid "My apps"
+msgstr "ကျွန်ုပ်၏ app များ"
+
+#: ../scope/click/query.cpp:189
+msgid "Available"
+msgstr "ရရှိနိုင်သော"

=== 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-14 13:33:50 +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-14 13:33:50 +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>
@@ -196,6 +198,16 @@
 
     bool has_screenshots = !details.main_screenshot_url.empty() || !details.more_screenshots_urls.empty();
 
+    scopes::PreviewWidget header("hdr", "header");
+    header.add_attribute_value("title", scopes::Variant(details.package.title));
+    if (!details.publisher.empty())
+    {
+        header.add_attribute_value("subtitle", scopes::Variant(details.publisher));
+    }
+    if (!details.package.icon_url.empty())
+        header.add_attribute_value("mascot", scopes::Variant(details.package.icon_url));
+    widgets.push_back(header);
+
     if (has_screenshots)
     {
         scopes::PreviewWidget gallery("screenshots", "gallery");
@@ -215,16 +227,6 @@
         widgets.push_back(gallery);
     }
 
-    scopes::PreviewWidget header("hdr", "header");
-    header.add_attribute_value("title", scopes::Variant(details.package.title));
-    if (!details.publisher.empty())
-    {
-        header.add_attribute_value("subtitle", scopes::Variant(details.publisher));
-    }
-    if (!details.package.icon_url.empty())
-        header.add_attribute_value("mascot", scopes::Variant(details.package.icon_url));
-    widgets.push_back(header);
-
     return widgets;
 }
 
@@ -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);