Merge lp:~dobey/indicator-location/fix-i18n into lp:indicator-location

[dobey]

Use intltool module from cmake-extras.

[Ted Gould (ted)]

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:165
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-location-ci/6/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1620
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1627
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1405
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1405/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1405
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1405/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1405
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1405/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1405
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1405/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1405
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1405/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1405
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1405/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-location-ci/6/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-08-02 11:54:15 +0000
+++ .bzrignore	2017-02-07 19:24:33 +0000
@@ -1,2 +1,5 @@
-compile
+build/
+po/Makefile.in.in
+po/POTFILES.in
+
 indicator-location

=== removed directory 'cmake'
=== removed file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2014-08-09 23:21:43 +0000
+++ cmake/Translations.cmake	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
-
-macro(add_translations_directory NLS_PACKAGE)
-    add_custom_target (i18n ALL)
-    find_program (MSGFMT_EXECUTABLE msgfmt)
-    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
-    foreach (PO_INPUT ${PO_FILES})
-        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
-        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
-        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
-
-        install (FILES ${MO_OUTPUT} DESTINATION
-            ${CMAKE_INSTALL_LOCALEDIR}/${PO_INPUT_BASE}/LC_MESSAGES
-            RENAME ${NLS_PACKAGE}.mo)
-    endforeach (PO_INPUT ${PO_FILES})
-endmacro(add_translations_directory)
-
-
-macro(add_translations_catalog NLS_PACKAGE)
-    add_custom_target (pot COMMENT “Building translation catalog.”)
-    find_program (XGETTEXT_EXECUTABLE xgettext)
-
-    # init this list, which will hold all the sources across all dirs
-    set(SOURCES "")
-
-    # add each directory's sources to the overall sources list
-    foreach(FILES_INPUT ${ARGN})
-        set (DIR ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT})
-        file (GLOB_RECURSE DIR_SOURCES ${DIR}/*.c ${DIR}/*.cc ${DIR}/*.cpp ${DIR}/*.cxx ${DIR}/*.vala)
-	set (SOURCES ${SOURCES} ${DIR_SOURCES})
-    endforeach()
-
-    add_custom_command (TARGET pot COMMAND
-        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
-        ${SOURCES} --keyword="_" --keyword="N_" --from-code=UTF-8
-        )
-endmacro()

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2013-08-26 20:38:29 +0000
+++ po/CMakeLists.txt	2017-02-07 19:24:33 +0000
@@ -1,3 +1,12 @@
-include (Translations)
-add_translations_directory ("${GETTEXT_PACKAGE}")
-add_translations_catalog ("${GETTEXT_PACKAGE}" ../src/)
+find_package(Intltool REQUIRED)
+
+intltool_update_potfile(
+    KEYWORDS "_" "_:1,2" "N_" "N_:1,2"
+    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+    COPYRIGHT_HOLDER "Canonical Ltd."
+)
+
+intltool_install_translations(
+    ALL
+    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+)

=== removed file 'po/POTFILES.in'
--- po/POTFILES.in	2013-08-26 20:19:46 +0000
+++ po/POTFILES.in	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-src/phone.cc

=== removed file 'po/update-pot.sh'
--- po/update-pot.sh	2014-05-27 08:45:15 +0000
+++ po/update-pot.sh	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-#!/bin/sh
-set -e
-cd $(dirname $0)
-PO_DIR=$PWD
-
-PKGNAME="indicator-location"
-PROGNAME=$(basename $0)
-
-# Create a list of files to scan
-GETTEXT_FILES=$(mktemp --tmpdir uitk-unity.lst.XXXXX)
-trap 'rm -f "$GETTEXT_FILES"' EXIT
-cd ..
-find \( -name '*.h' -o -name '*.cpp' -o -name '*.cc' -o -name '*.c' -o -name '*.qml' -o -name '*.js' \) \
-    -a ! \( -path './debian/*' -o -path './builddir/*' -o -path './build/*' -o -path './.bzr/*' \) | sort \
-> $GETTEXT_FILES
-cat $GETTEXT_FILES
-
-# Generate pot from our list
-xgettext \
-    --output $PO_DIR/$PKGNAME.pot \
-    --files-from $GETTEXT_FILES \
-    --c++ \
-    --add-comments=TRANSLATORS \
-    --keyword=_ \
-    --package-name="$PKGNAME" \
-    --copyright-holder="Canonical Ltd."
-
-echo "$PROGNAME: $PO_DIR/$PKGNAME.pot updated"