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

[dobey]

Use intltool support from cmake-extras.

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

PASSED: Continuous integration, rev:25
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-display-ci/24/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1615
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1622
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1400
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1400/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1400
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1400/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1400
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1400/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1400
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1400/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1400
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1400/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1400
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1400/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

Since we're seeded I don't think we need to commit the pot file and merge translations. They'll get stripped and replaced with lang packs anyway.

review: Needs Information

[dobey (dobey)]

> Since we're seeded I don't think we need to commit the pot file and merge
> translations. They'll get stripped and replaced with lang packs anyway.

Having the template committed and launchpad translations set up, is standard practice, and this does not quite happen for PPAs, which one of our primary distribution points is.

[Pete Woods (pete-woods)]

review: Approve

[Charles Kerr (charlesk)]

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2017-02-07 18:14:52 +0000
@@ -0,0 +1,3 @@
+build/
+po/Makefile.in.in
+po/POTFILES.in

=== removed directory 'cmake'
=== removed file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2014-08-21 04:03:20 +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	2014-08-21 04:03:20 +0000
+++ po/CMakeLists.txt	2017-02-07 18:14:52 +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	2016-03-16 13:40:57 +0000
+++ po/POTFILES.in	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-src/rotation-lock.cpp
-src/usb-snap.cpp

=== added file 'po/indicator-display.pot'
--- po/indicator-display.pot	1970-01-01 00:00:00 +0000
+++ po/indicator-display.pot	2017-02-07 18:14:52 +0000
@@ -0,0 +1,43 @@
+# 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: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-02-07 13:08-0500\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/rotation-lock.cpp:125
+msgid "Rotation Lock"
+msgstr ""
+
+#: ../src/rotation-lock.cpp:136
+msgid "Rotation"
+msgstr ""
+
+#: ../src/usb-snap.cpp:107
+#, c-format
+msgid "The computer's RSA key fingerprint is: %s"
+msgstr ""
+
+#: ../src/usb-snap.cpp:112
+msgid "Allow"
+msgstr ""
+
+#: ../src/usb-snap.cpp:114
+msgid "Don't Allow"
+msgstr ""
+
+#: ../src/usb-snap.cpp:126
+msgid "Allow USB Debugging?"
+msgstr ""