Merge lp:~mhr3/unity-scope-scopes/i18n-enablement into lp:unity-scope-scopes

[Michal Hruby]

Add i18n support.

Add i18n support.

[lp:~mhr3/unity-scope-scopes/i18n-enablement]

35. By Michal Hruby on 2014-04-29

Fix the FIXME

36. By Michal Hruby on 2014-04-29

Update pot

37. By Michal Hruby on 2014-04-29

Add missing file

38. By Michal Hruby on 2014-04-30

Install mo, added missing setlocale call

39. By Michal Hruby on 2014-04-30

Fix ini install rule

[Paweł Stołowski (stolowski)]

Looks good. +1

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-04 13:32:17 +0000
+++ CMakeLists.txt	2014-04-30 10:36:28 +0000
@@ -8,6 +8,11 @@
   "libunity-scopes >= 0.4.0"
 )
 
+find_program(XGETTEXT_BIN xgettext)
+find_program(MSGFMT_BIN msgfmt)
+find_program(INTLTOOL_EXTRACT_BIN intltool-extract)
+find_program(INTLTOOL_MERGE_BIN intltool-merge)
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wmissing-declarations -pedantic -std=c++11")
 
 set(DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/data")
@@ -25,6 +30,7 @@
 )
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
+add_subdirectory("po")
 add_subdirectory("src")
 
 enable_testing()

=== modified file 'debian/control'
--- debian/control	2014-03-04 13:32:17 +0000
+++ debian/control	2014-04-30 10:36:28 +0000
@@ -4,6 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake (>= 2.8),
                debhelper (>= 9),
+               intltool,
                libunity-scopes-dev (>= 0.4.0),
                pkg-config,
 Standards-Version: 3.9.5

=== added directory 'po'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2014-04-30 10:36:28 +0000
@@ -0,0 +1,53 @@
+file(GLOB CPPFILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+                   "${CMAKE_SOURCE_DIR}/src/*.cpp")
+file(GLOB INIFILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+                   "${CMAKE_SOURCE_DIR}/src/*.ini.in.in")
+
+foreach(inifile ${INIFILES})
+    get_filename_component(fname ${inifile} NAME)
+    set(iniheaderfile "${CMAKE_CURRENT_SOURCE_DIR}/tmp/${fname}.h")
+    list(APPEND GENERATED_HEADERS ${iniheaderfile})
+    add_custom_command(OUTPUT ${iniheaderfile}
+        COMMAND ${INTLTOOL_EXTRACT_BIN} --type=gettext/ini --local ${inifile}
+        DEPENDS ${inifile}
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    )
+endforeach()
+
+add_custom_target(pot-ini
+    DEPENDS ${GENERATED_HEADERS}
+)
+
+add_custom_target(pot
+    COMMAND ${XGETTEXT_BIN} -o ${GETTEXT_PACKAGE}.pot
+                            --copyright=\"Canonical Ltd.\"
+                            --package-name ${GETTEXT_PACKAGE}
+                            --c++ --add-comments=TRANSLATORS
+                            --keyword=_ --keyword=N_ --from-code=UTF-8
+                            ${CPPFILES} "tmp/*.h"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    DEPENDS pot-ini
+)
+
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locale)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locale DESTINATION share)
+
+file(GLOB pofiles *.po)
+foreach(f ${pofiles})
+  get_filename_component(pofile ${f} NAME_WE)
+  set(languages "${pofile};${languages}")
+endforeach()
+
+MESSAGE("${languages}")
+
+foreach(i ${languages})
+  add_custom_command(OUTPUT ${i}.mo
+  COMMAND ${MSGFMT_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/${i}.po -o ${CMAKE_CURRENT_BINARY_DIR}/${i}.mo
+  DEPENDS ${i}.po
+  )
+  add_custom_target(${i}gen ALL DEPENDS ${i}.mo)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${i}.mo 
+  DESTINATION share/locale/${i}/LC_MESSAGES
+  RENAME ${GETTEXT_PACKAGE}.mo)
+endforeach()
+

=== added file 'po/unity-scope-scopes.pot'
--- po/unity-scope-scopes.pot	1970-01-01 00:00:00 +0000
+++ po/unity-scope-scopes.pot	2014-04-30 10:36:28 +0000
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: unity-scope-scopes\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-29 17:44+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/scopes-scope.cpp:206
+msgid "Featured"
+msgstr ""
+
+#: ../src/scopes-scope.cpp:208
+msgid "Entertainment"
+msgstr ""
+
+#: ../src/scopes-scope.cpp:210
+msgid "Other"
+msgstr ""
+
+#: ../src/scopes-scope.cpp:239 tmp/scopes.ini.in.in.h:1
+msgid "Scopes"
+msgstr ""
+
+#: ../src/scopes-scope.cpp:431
+msgid "Description"
+msgstr ""
+
+#: ../src/scopes-scope.cpp:438
+msgid "Search"
+msgstr ""
+
+#: tmp/scopes.ini.in.in.h:2
+msgid ""
+"This is an Ubuntu search plugin that displays and allows searching available "
+"scopes."
+msgstr ""
+
+#: tmp/scopes.ini.in.in.h:3
+msgid "Search for scopes"
+msgstr ""

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-03-06 13:09:11 +0000
+++ src/CMakeLists.txt	2014-04-30 10:36:28 +0000
@@ -12,7 +12,15 @@
   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/unity-scopes/scopes"
 )
 
-install(
-  FILES scopes.ini
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/unity-scopes/scopes"
-)
+set(SCOPE_CONFIG_FILES scopes.ini)
+
+foreach(configfile ${SCOPE_CONFIG_FILES})
+    configure_file(${configfile}.in.in ${configfile}.in)
+    get_filename_component(basename ${configfile} NAME_WE)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${configfile}"
+            DESTINATION "${CMAKE_INSTALL_LIBDIR}/unity-scopes/${basename}")
+    add_custom_command(OUTPUT ${configfile} COMMAND ${INTLTOOL_MERGE_BIN} -d ${CMAKE_CURRENT_SOURCE_DIR}/../po ${configfile}.in ${configfile}) 
+endforeach()
+
+add_custom_target(ini-i18n ALL DEPENDS ${SCOPE_CONFIG_FILES})
+

=== added file 'src/i18n.h'
--- src/i18n.h	1970-01-01 00:00:00 +0000
+++ src/i18n.h	2014-04-30 10:36:28 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SCOPE_I18N_H
+#define SCOPE_I18N_H
+
+#include <libintl.h>
+#include <config.h>
+
+#define _(value) dgettext(GETTEXT_PACKAGE, value)
+
+#endif

=== modified file 'src/scopes-scope.cpp'
--- src/scopes-scope.cpp	2014-04-01 13:32:26 +0000
+++ src/scopes-scope.cpp	2014-04-30 10:36:28 +0000
@@ -31,6 +31,7 @@
 
 #include "scopes-scope.h"
 #include "resultcollector.h"
+#include "i18n.h"
 
 using namespace unity::scopes;
 
@@ -71,6 +72,7 @@
 )";
 
 int ScopesScope::start(std::string const&, RegistryProxy const &registry) {
+    setlocale(LC_ALL, "");
     this->registry = registry;
     try {
         online_scope = registry->get_metadata(ONLINE_SCOPE_ID).proxy();
@@ -202,11 +204,11 @@
     CategoryRenderer renderer(SCOPES_CATEGORY_DEFINITION);
     Category::SCPtr categories[N_CATEGORIES];
     categories[CAT_FEATURED] = reply->register_category(
-        "popular", "Featured", "", renderer);
+        "popular", _("Featured"), "", renderer);
     categories[CAT_ENTERTAINMENT] = reply->register_category(
-        "entertainment", "Entertainment", "", renderer);
+        "entertainment", _("Entertainment"), "", renderer);
     categories[CAT_OTHER] = reply->register_category(
-        "scopes", "Other", "", renderer);
+        "scopes", _("Other"), "", renderer);
 
     MetadataMap all_scopes = scope.registry->list();
     std::vector<ScopeMetadata> scopes;
@@ -235,7 +237,7 @@
 void ScopesQuery::search_query(SearchReplyProxy const &reply) {
     CategoryRenderer renderer(SEARCH_CATEGORY_DEFINITION);
     Category::SCPtr category = reply->register_category(
-        "scopes", "Scopes", "", renderer);
+        "scopes", _("Scopes"), "", renderer);
 
     std::string term = lowercase(query.query_string());
 
@@ -427,13 +429,14 @@
 
     PreviewWidget description("description", "text");
     description.add_attribute_mapping("text", "description");
+    description.add_attribute_value("title", Variant(_("Description")));
 
     PreviewWidget actions("actions", "actions");
     {
         VariantBuilder builder;
         builder.add_tuple({
                 {"id", Variant("search")},
-                {"label", Variant("Search")}
+                {"label", Variant(_("Search"))}
             });
         actions.add_attribute_value("actions", builder.end());
     }

=== renamed file 'src/scopes.ini' => 'src/scopes.ini.in.in'
--- src/scopes.ini	2014-03-05 10:13:09 +0000
+++ src/scopes.ini.in.in	2014-04-30 10:36:28 +0000
@@ -1,8 +1,8 @@
 [ScopeConfig]
-DisplayName = Scopes
-Author = Canonical Ltd.
-Description = This is an Ubuntu search plugin that enables information from available search plugins to be searched and displayed in the Dash underneath the Dash plugins header. If you do not wish to search this content source, you can disable this search plugin.
-SearchHint = Search for scopes
-HotKey =
-Author = Canonical Ltd.
-Invisible = true
+_DisplayName=Scopes
+Author=Canonical Ltd.
+_Description=This is an Ubuntu search plugin that displays and allows searching available scopes.
+_SearchHint=Search for scopes
+HotKey=
+Author=Canonical Ltd.
+Invisible=true