Merge lp:~dobey/unity-scope-click/le-title into lp:unity-scope-click

[dobey]

Use the locally translated title and description for application previews.

Use the locally translated title and description for application previews.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:287
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dobey/unity-scope-click/le-title/+merge/238765/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/538/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4134/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/78
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/78/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3495/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4474
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4474/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good.

review: Approve

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2014-08-26 14:57:03 +0000
+++ libclickscope/click/interface.cpp	2014-10-17 19:28:53 +0000
@@ -182,17 +182,16 @@
         QStringList id = app_id.split("_", QString::SkipEmptyParts);
         app.name = id[0].toUtf8().data();
         app.version = id[2].toUtf8().data();
-    } else {
-        if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_COMMENT)) {
-            app.description = get_translated_string(keyFile,
-                                                    DESKTOP_FILE_GROUP,
-                                                    DESKTOP_FILE_COMMENT,
-                                                    domain);
-        }
-        if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_SCREENSHOT)) {
-            app.main_screenshot = keyFile.get_string(DESKTOP_FILE_GROUP,
-                                                     DESKTOP_FILE_SCREENSHOT);
-        }
+    }
+    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_COMMENT)) {
+        app.description = get_translated_string(keyFile,
+                                                DESKTOP_FILE_GROUP,
+                                                DESKTOP_FILE_COMMENT,
+                                                domain);
+    }
+    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_SCREENSHOT)) {
+        app.main_screenshot = keyFile.get_string(DESKTOP_FILE_GROUP,
+                                                 DESKTOP_FILE_SCREENSHOT);
     }
     return app;
 }
 
=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-10-10 17:53:00 +0000
+++ libclickscope/click/preview.cpp	2014-10-17 19:28:53 +0000
@@ -331,7 +331,7 @@
     scopes::PreviewWidgetList widgets;
 
     scopes::PreviewWidget header("hdr", "header");
-    header.add_attribute_value("title", scopes::Variant(details.package.title));
+    header.add_attribute_value("title", scopes::Variant(result.title()));
     if (!details.publisher.empty())
     {
         header.add_attribute_value("subtitle", scopes::Variant(details.publisher));
@@ -340,7 +340,7 @@
         header.add_attribute_value("mascot", scopes::Variant(details.package.icon_url));
     widgets.push_back(header);
 
-    qDebug() << "Pushed widgets for package:" << QString::fromStdString(details.package.title);
+    qDebug() << "Pushed widgets for package:" << QString::fromStdString(details.package.name);
     return widgets;
 }
 
@@ -351,7 +351,14 @@
     {
         scopes::PreviewWidget summary("summary", "text");
         summary.add_attribute_value("title", scopes::Variant(_("Info")));
-        summary.add_attribute_value("text", scopes::Variant(details.description));
+        if (result.contains("description") && !result["description"].get_string().empty())
+        {
+            summary.add_attribute_value("text", scopes::Variant(result["description"].get_string()));
+        }
+        else
+        {
+            summary.add_attribute_value("text", scopes::Variant(details.description));
+        }
         widgets.push_back(summary);
     }
 
 
=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp	2014-08-18 21:36:01 +0000
+++ libclickscope/tests/test_interface.cpp	2014-10-17 19:28:53 +0000
@@ -55,11 +55,11 @@
 static const std::vector<click::Application> non_desktop_applications =
 {
     {"com.ubuntu.stock-ticker-mobile", "Stock Ticker", 0.0,
-        "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "", "", ""},
+        "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "An awesome Stock Ticker application with all the features you could imagine", "", ""},
     {"", "Weather", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.weather/./weather64.png", "application:///com.ubuntu.weather_weather_1.0.168.desktop", "", "", ""},
     {"com.ubuntu.developer.webapps.webapp-twitter", "Twitter", 0.0,
         "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-twitter/./twitter.png", "application:///com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter_1.0.5.desktop", "", "", ""},
-    {"com.ubuntu.music", "Music", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.music/images/music.png", "application:///com.ubuntu.music_music_1.1.329.desktop", "", "", ""},
+    {"com.ubuntu.music", "Music", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.music/images/music.png", "application:///com.ubuntu.music_music_1.1.329.desktop", "Ubuntu Touch Music Player", "", ""},
     {"com.ubuntu.clock", "Clock", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png", "application:///com.ubuntu.clock_clock_1.0.300.desktop", "", "", ""},
     {"com.ubuntu.dropping-letters", "Dropping Letters", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.dropping-letters/dropping-letters.png", "application:///com.ubuntu.dropping-letters_dropping-letters_0.1.2.2.43.desktop", "", "", ""},
     {"com.ubuntu.developer.webapps.webapp-gmail", "Gmail", 0.0,
@@ -72,7 +72,7 @@
     {"com.ubuntu.shorts", "Shorts", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.shorts/./rssreader64.png", "application:///com.ubuntu.shorts_shorts_0.2.162.desktop", "", "", ""},
     {"com.ubuntu.filemanager", "File Manager", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.filemanager/./filemanager64.png", "application:///com.ubuntu.filemanager_filemanager_0.1.1.97.desktop", "", "", ""},
     {"com.ubuntu.calculator", "Calculator", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/./calculator64.png", "application:///com.ubuntu.calculator_calculator_0.1.3.206.desktop", "", "", ""},
-    {"com.ubuntu.sudoku", "Sudoku", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.sudoku/SudokuGameIcon.png", "application:///com.ubuntu.sudoku_sudoku_1.0.142.desktop", "", "", ""},
+    {"com.ubuntu.sudoku", "Sudoku", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.sudoku/SudokuGameIcon.png", "application:///com.ubuntu.sudoku_sudoku_1.0.142.desktop", "Sudoku Game for Ubuntu Touch", "", ""},
     {"com.ubuntu.developer.webapps.webapp-ebay", "eBay", 0.0,
         "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-ebay/./ebay.png", "application:///com.ubuntu.developer.webapps.webapp-ebay_webapp-ebay_1.0.8.desktop", "", "", ""},
     {"com.ubuntu.developer.webapps.webapp-facebook", "Facebook", 0.0,
@@ -250,7 +250,7 @@
     const std::vector<click::Application> expected_results = {
         {"com.ubuntu.clock", "Clock", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png", "application:///com.ubuntu.clock_clock_1.0.300.desktop", "", "", ""},
         {"com.ubuntu.stock-ticker-mobile", "Stock Ticker", 0.0,
-            "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "", "", ""},
+            "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "An awesome Stock Ticker application with all the features you could imagine", "", ""},
     };
     EXPECT_EQ(expected_results, results);
 }