Merge lp:~unity-api-team/qtcreator-plugin-ubuntu/scope-template-translation-support into lp:qtcreator-plugin-ubuntu

[Pete Woods]

Add translation support to scope templates

Add translation support to scope templates

Requires this MR (https://code.launchpad.net/~unity-api-team/click/add-cmake-extras/+merge/235768) adding cmake-extras to the SDK.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:286
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/447/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/215

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/447/rebuild

review: Approve (continuous-integration)

[lp:~unity-api-team/qtcreator-plugin-ubuntu/scope-template-translation-support]

287. By Pete Woods on 2014-10-16

Fix unit tests

[Pete Woods (pete-woods)]

Okay, the tests should work again!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:287
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/454/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/222

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/454/rebuild

review: Approve (continuous-integration)

[Benjamin Zeller (zeller-benjamin)]

OK

review: Approve

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt	2014-10-10 07:46:06 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt	2014-10-16 12:49:26 +0000
@@ -2,9 +2,6 @@
 cmake_minimum_required(VERSION 2.8.10)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
 
-#do not remove this line, its required for the correct functionality of the Ubuntu-SDK
-set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Tells QtCreator location and name of the manifest file")
-
 # We require g++ 4.9, to avoid ABI breakage with earlier version.
 set(cxx_version_required 4.9)
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
@@ -51,12 +48,19 @@
   ${SCOPE_INCLUDE_DIRS}
 )
 
+# Do not remove this line, its required for the correct functionality of the Ubuntu-SDK
+set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Tells QtCreator location and name of the manifest file")
 set(UBUNTU_PROJECT_TYPE "Scope" CACHE INTERNAL "Tells QtCreator this is a Scope project")
+
+# Important project paths
+set(CMAKE_INSTALL_PREFIX /)
 set(SCOPE_INSTALL_DIR "/%ClickHookName:l%")
+set(GETTEXT_PACKAGE "%ProjectName:l%")
 
 # If we need to refer to the scope's name or package in code, these definitions will help
 add_definitions(-DPACKAGE_NAME="%ClickDomain:l%.%ProjectName:l%")
 add_definitions(-DSCOPE_NAME="%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%")
+add_definitions(-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}")
 
 #This command figures out the target architecture and puts it into the manifest file
 execute_process(
@@ -82,6 +86,7 @@
 # Add our main directories
 add_subdirectory(src)
 add_subdirectory(data)
+add_subdirectory(po)
 
 # Set up the tests
 enable_testing()

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/include/scope/localization.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/include/scope/localization.h	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/include/scope/localization.h	2014-10-16 12:49:26 +0000
@@ -0,0 +1,22 @@
+#ifndef SCOPE_LOCALIZATION_H_
+#define SCOPE_LOCALIZATION_H_
+
+#include <libintl.h>
+#include <string>
+
+inline char * _(const char *__msgid) {
+    return dgettext(GETTEXT_PACKAGE, __msgid);
+}
+
+inline std::string _(const char *__msgid1, const char *__msgid2,
+                     unsigned long int __n) {
+    char buffer [256];
+    if (snprintf ( buffer, 256, dngettext(GETTEXT_PACKAGE, __msgid1, __msgid2, __n), __n ) >= 0) {
+        return buffer;
+    } else {
+        return std::string();
+    }
+}
+
+#endif // SCOPE_LOCALIZATION_H_
+

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/po'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/po/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/po/CMakeLists.txt	2014-10-16 12:49:26 +0000
@@ -0,0 +1,8 @@
+include(UseXGettext)
+
+add_translations_directory(${GETTEXT_PACKAGE})
+
+add_translations_catalog(
+  GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+  SOURCE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src"
+)
\ No newline at end of file

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/src/api/client.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/api/client.cpp	2014-09-23 12:19:52 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/api/client.cpp	2014-10-16 12:49:26 +0000
@@ -23,13 +23,24 @@
 Client::ResultList Client::search(const string &query) {
     ResultList results;
 
-    Result result;
-    result.uri = "uri";
-    result.title = query;
-    result.art = "art.png";
-    result.subtitle = "subtitle";
-    result.description = "description";
-    results.emplace_back(result);
+    {
+        Result result;
+        result.uri = "uri";
+        result.title = query;
+        result.art = "art.png";
+        result.subtitle = "subtitle";
+        result.description = "description";
+        results.emplace_back(result);
+    }
+    {
+        Result result;
+        result.uri = "uri2";
+        result.title = query;
+        result.art = "art2.png";
+        result.subtitle = "subtitle2";
+        result.description = "description2";
+        results.emplace_back(result);
+    }
 
     return results;
 }

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/src/scope/query.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/scope/query.cpp	2014-09-23 12:19:52 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/scope/query.cpp	2014-10-16 12:49:26 +0000
@@ -1,5 +1,6 @@
 #include <boost/algorithm/string/trim.hpp>
 
+#include <scope/localization.h>
 #include <scope/query.h>
 
 #include <unity/scopes/Annotation.h>
@@ -125,7 +126,8 @@
         }
 
         // Register a category
-        auto cat = reply->register_category("results", "Results", "",
+        auto cat = reply->register_category("results",
+                _("1 result", "%d results", results.size()), "",
                 sc::CategoryRenderer(CATEGORY_TEMPLATE));
 
         for (const auto &result : results) {
@@ -219,7 +221,7 @@
 
         // Register a category for the forecast
         auto forecast_cat = reply->register_category("forecast",
-                "7 day forecast", "", sc::CategoryRenderer(WEATHER_TEMPLATE));
+                _("7 day forecast"), "", sc::CategoryRenderer(WEATHER_TEMPLATE));
 
         // For each of the forecast days
         for (const auto &weather : forecast.weather) {

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/src/scope/scope.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/scope/scope.cpp	2014-09-23 12:19:52 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/scope/scope.cpp	2014-10-16 12:49:26 +0000
@@ -1,6 +1,7 @@
+#include <scope/localization.h>
+#include <scope/preview.h>
+#include <scope/query.h>
 #include <scope/scope.h>
-#include <scope/query.h>
-#include <scope/preview.h>
 
 #include <iostream>
 #include <sstream>
@@ -14,6 +15,11 @@
 void Scope::start(string const&) {
     config_ = make_shared<Config>();
 
+    setlocale(LC_ALL, "");
+    string translation_directory = ScopeBase::scope_directory()
+            + "/../share/locale/";
+    bindtextdomain(GETTEXT_PACKAGE, translation_directory.c_str());
+
 @if "%ContentType%" == "network"
     // Under test we set a different API root
     char *apiroot = getenv("NETWORK_SCOPE_APIROOT");

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/CMakeLists.txt	2014-09-25 14:21:35 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/CMakeLists.txt	2014-10-16 12:49:26 +0000
@@ -18,6 +18,11 @@
   ${TEST_INCLUDE_DIRS}
 )
 
+# Where to find the scope ini file and .so
+add_definitions(
+  -DTEST_SCOPE_DIRECTORY="${CMAKE_BINARY_DIR}/src"
+)
+
 @if "%ContentType%" == "network"
 file(GLOB_RECURSE
   TEST_FIXTURES

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/scope/test-scope.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/scope/test-scope.cpp	2014-09-23 12:19:52 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/scope/test-scope.cpp	2014-10-16 12:49:26 +0000
@@ -68,6 +68,7 @@
         setenv("NETWORK_SCOPE_APIROOT", apiroot.c_str(), true);
 
         // Do the parent SetUp
+        TypedScopeFixture::set_scope_directory(TEST_SCOPE_DIRECTORY);
         TypedScopeFixtureScope::SetUp();
     }
 

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2014-10-09 07:03:22 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2014-10-16 12:49:26 +0000
@@ -19,6 +19,7 @@
 
         <file source="include/api/config.h"/>
         <file source="include/api/client.h"/>
+        <file source="include/scope/localization.h"/>
         <file source="include/scope/preview.h"/>
         <file source="include/scope/query.h"/>
         <file source="include/scope/scope.h"/>
@@ -29,6 +30,8 @@
         <file source="src/scope/scope.cpp" openeditor="true"/>
         <file source="src/scope/preview.cpp"/>
 
+        <file source="po/CMakeLists.txt"/>
+
         <file source="tests/server/forecast/daily/Manchester,uk.json"/>
         <file source="tests/server/forecast/daily/London,uk.json"/>
         <file source="tests/server/weather/Manchester,uk.json"/>