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

[dobey]

Use intltool support from cmake-extras.

Unmerged revisions

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2017-02-07 20:21:19 +0000
@@ -0,0 +1,4 @@
+build/
+po/Makefile.in.in
+po/POTFILES.in
+
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-16 18:09:57 +0000
+++ CMakeLists.txt	2017-02-07 20:21:19 +0000
@@ -13,9 +13,6 @@
   -DLOW_BATTERY_SOUND="Low battery.ogg"
 )
 
-option (enable_tests "Build the package's automatic tests." ON)
-option (enable_lcov "Generate lcov code coverage reports." ON)
-
 set(SERVICE_LIB "indicatorpowerservice")
 set(SERVICE_EXEC "indicator-power-service")
 add_definitions(-DSERVICE_EXEC="${SERVICE_EXEC}")
@@ -59,9 +56,6 @@
                    COMMAND bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.gz
                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
-add_custom_target (clean-coverage
-                   COMMAND find ${CMAKE_BINARY_DIR} -name '*.gcda' | xargs rm -f)
-
 add_custom_target (cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2 --inline-suppr
                    ${CMAKE_SOURCE_DIR}/src
                    ${CMAKE_SOURCE_DIR}/tests)
@@ -83,22 +77,17 @@
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
 include_directories (${CMAKE_CURRENT_BINARY_DIR}/include)
 
-# testing & coverage
-if (${enable_tests})
-  set (GTEST_SOURCE_DIR /usr/src/gtest/src)
-  set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..)
-  set (GTEST_LIBS -lpthread)
-  enable_testing ()
-  if (${enable_lcov})
-    include(GCov)
-  endif ()
-endif ()
-
 # actually build things
 add_subdirectory(src)
 add_subdirectory(data)
 add_subdirectory(po)
-if (${enable_tests})
-  add_subdirectory(tests)
-endif ()
 
+# testing & coverage
+enable_testing ()
+add_subdirectory(tests)
+find_package(CoverageReport)
+ENABLE_COVERAGE_REPORT(
+  TARGETS ${SERVICE_LIB} ${SERVICE_EXEC}
+  TESTS ${COVERAGE_TEST_TARGETS}
+  FILTER /usr/include ${CMAKE_BINARY_DIR}/*
+)
 
=== removed file 'cmake/GCov.cmake'
--- cmake/GCov.cmake	2014-07-14 04:43:41 +0000
+++ cmake/GCov.cmake	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-if (CMAKE_BUILD_TYPE MATCHES coverage)
-  set(GCOV_FLAGS "${GCOV_FLAGS} --coverage")
-  set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS}    ${GCOV_FLAGS}")
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${GCOV_FLAGS}")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCOV_FLAGS}")
-  set(GCOV_LIBS ${GCOV_LIBS} gcov)
-
-  find_program(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
-  if (NOT GCOVR_EXECUTABLE)
-    message(STATUS "Gcovr binary was not found, can not generate XML coverage info.")
-  else ()
-    message(STATUS "Gcovr found, can generate XML coverage info.")
-    add_custom_target (coverage-xml
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      COMMAND "${GCOVR_EXECUTABLE}" --exclude="test.*" -x -r "${CMAKE_SOURCE_DIR}" 
-      --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml)
-  endif()
-
-  find_program(LCOV_EXECUTABLE lcov HINTS ${LCOV_ROOT} "${GCOVR_ROOT}/bin")
-  find_program(GENHTML_EXECUTABLE genhtml HINTS ${GENHTML_ROOT})
-  if (NOT LCOV_EXECUTABLE)
-    message(STATUS "Lcov binary was not found, can not generate HTML coverage info.")
-  else ()
-    if(NOT GENHTML_EXECUTABLE)
-      message(STATUS "Genthml binary not found, can not generate HTML coverage info.")
-    else()
-      message(STATUS "Lcov and genhtml found, can generate HTML coverage info.")
-      add_custom_target (coverage-html
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        COMMAND "${CMAKE_CTEST_COMMAND}" --force-new-ctest-process --verbose
-        COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture | ${CMAKE_SOURCE_DIR}/trim-lcov.py > dconf-lcov.info
-        COMMAND "${LCOV_EXECUTABLE}" -r dconf-lcov.info /usr/include/\\*  -o nosys-lcov.info
-        COMMAND LANG=C "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory lcov-html --legend --show-details nosys-lcov.info
-        COMMAND ${CMAKE_COMMAND} -E echo ""
-        COMMAND ${CMAKE_COMMAND} -E echo "file://${CMAKE_BINARY_DIR}/lcov-html/index.html"
-        COMMAND ${CMAKE_COMMAND} -E echo "")
-        #COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture --output-file coverage.info --no-checksum
-        #COMMAND "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-        #COMMAND ${CMAKE_COMMAND} -E echo "\\#define foo \\\"bar\\\"" 
-        #)
-    endif()
-  endif()
-endif()
-
-
-	#$(MAKE) $(AM_MAKEFLAGS) check
-	#lcov --directory $(top_builddir) --capture --test-name dconf | $(top_srcdir)/trim-lcov.py > dconf-lcov.info
-	#LANG=C genhtml --prefix $(top_builddir) --output-directory lcov-html --legend --show-details dconf-lcov.info
-	#@echo
-	#@echo "     file://$(abs_top_builddir)/lcov-html/index.html"
-	#@echo
 
=== removed file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2014-08-09 23:19:02 +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 'debian/control'
--- debian/control	2016-07-19 10:25:12 +0000
+++ debian/control	2017-02-07 20:21:19 +0000
@@ -3,6 +3,12 @@
 Priority: optional
 Maintainer: Ubuntu Core Developers <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras (>= 0.10),
+               debhelper (>= 9),
+               dh-translations,
+               gcovr,
+               intltool,
+               lcov,
                libnotify-dev (>= 0.7.6),
                libglib2.0-dev (>= 2.36),
                libgudev-1.0-dev,
@@ -10,12 +16,8 @@
                python:any,
 # for com.ubuntu.touch.AccountsService.Sound.xml
                accountsservice-ubuntu-schemas,
-# for packaging
-               debhelper (>= 9),
-               dh-translations,
-               intltool,
 # for tests
-               libgtest-dev,
+               googletest | google-mock,
                python3-dbusmock,
                dbus-test-runner,
                libdbustest1-dev,
 
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-07-16 23:29:24 +0000
+++ po/CMakeLists.txt	2017-02-07 20:21:19 +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	2014-10-14 09:00:13 +0000
+++ po/POTFILES.in	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-data/com.canonical.indicator.power.gschema.xml.in
-src/device.c
-src/notifier.c
-src/service.c
 
=== added file 'po/indicator-power.pot'
--- po/indicator-power.pot	1970-01-01 00:00:00 +0000
+++ po/indicator-power.pot	2017-02-07 20:21:19 +0000
@@ -0,0 +1,217 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# 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 15:18-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=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#. TRANSLATORS: system power cord
+#: ../src/device.c:524
+msgid "AC Adapter"
+msgstr ""
+
+#. TRANSLATORS: laptop primary battery
+#: ../src/device.c:528 ../src/service.c:442
+msgid "Battery"
+msgstr ""
+
+#. TRANSLATORS: battery-backed AC power source
+#: ../src/device.c:532
+msgid "UPS"
+msgstr ""
+
+#. TRANSLATORS: a monitor is a device to measure voltage and current
+#: ../src/device.c:536
+msgid "Monitor"
+msgstr ""
+
+#. TRANSLATORS: wireless mice with internal batteries
+#: ../src/device.c:540
+msgid "Mouse"
+msgstr ""
+
+#. TRANSLATORS: wireless keyboard with internal battery
+#: ../src/device.c:544
+msgid "Keyboard"
+msgstr ""
+
+#. TRANSLATORS: portable device
+#: ../src/device.c:548
+msgid "PDA"
+msgstr ""
+
+#. TRANSLATORS: cell phone (mobile...)
+#: ../src/device.c:552
+msgid "Cell phone"
+msgstr ""
+
+#. TRANSLATORS: media player, mp3 etc
+#: ../src/device.c:556
+msgid "Media player"
+msgstr ""
+
+#. TRANSLATORS: tablet device
+#: ../src/device.c:560
+msgid "Tablet"
+msgstr ""
+
+#. TRANSLATORS: tablet device
+#: ../src/device.c:564
+msgid "Computer"
+msgstr ""
+
+#. TRANSLATORS: unknown device
+#: ../src/device.c:568
+msgid "Unknown"
+msgstr ""
+
+#: ../src/device.c:608
+#, c-format
+msgid "estimating…"
+msgstr ""
+
+#: ../src/device.c:612
+#, c-format
+msgid "unknown"
+msgstr ""
+
+#. TRANSLATORS: H:MM (hours, minutes) to charge the battery. Example: "1:30 to charge"
+#: ../src/device.c:641
+#, c-format
+msgid "%0d:%02d to charge"
+msgstr ""
+
+#. TRANSLATORS: H:MM (hours, minutes) to discharge the battery. Example: "1:30 left"
+#: ../src/device.c:646
+#, c-format
+msgid "%0d:%02d left"
+msgstr ""
+
+#. TRANSLATORS: "X (hour,hours) Y (minute,minutes) to charge" the battery.
+#. Example: "1 hour 10 minutes to charge"
+#: ../src/device.c:681
+#, c-format
+msgid "%d %s %d %s to charge"
+msgstr ""
+
+#: ../src/device.c:682 ../src/device.c:700
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/device.c:683 ../src/device.c:690 ../src/device.c:701
+#: ../src/device.c:708
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: "Y (minute,minutes) to charge" the battery.
+#. Example: "59 minutes to charge"
+#: ../src/device.c:689
+#, c-format
+msgid "%d %s to charge"
+msgstr ""
+
+#. TRANSLATORS: "X (hour,hours) Y (minute,minutes) left" until the battery's empty.
+#. Example: "1 hour 10 minutes left"
+#: ../src/device.c:699
+#, c-format
+msgid "%d %s %d %s left"
+msgstr ""
+
+#. TRANSLATORS: "Y (minute,minutes) left" until the battery's empty.
+#. Example: "59 minutes left"
+#: ../src/device.c:707
+#, c-format
+msgid "%d %s left"
+msgstr ""
+
+#. TRANSLATORS: example: "battery (charged)"
+#: ../src/device.c:764
+#, c-format
+msgid "%s (charged)"
+msgstr ""
+
+#. TRANSLATORS: example: "battery (time remaining)"
+#: ../src/device.c:781
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
+#. TRANSLATORS: after the icon, a time-remaining string + battery %. Example: "(0:59, 33%)"
+#: ../src/device.c:853
+#, c-format
+msgid "(%s, %.0lf%%)"
+msgstr ""
+
+#. TRANSLATORS: after the icon, a time-remaining string Example: "(0:59)"
+#: ../src/device.c:858
+#, c-format
+msgid "(%s)"
+msgstr ""
+
+#. TRANSLATORS: after the icon, a battery %. Example: "(33%)"
+#: ../src/device.c:863
+#, c-format
+msgid "(%.0lf%%)"
+msgstr ""
+
+#: ../src/notifier.c:286
+msgid "Battery Low"
+msgstr ""
+
+#: ../src/notifier.c:287
+msgid "Battery Critical"
+msgstr ""
+
+#: ../src/notifier.c:289
+#, c-format
+msgid "%.0f%% charge remaining"
+msgstr ""
+
+#: ../src/notifier.c:321
+msgid "OK"
+msgstr ""
+
+#: ../src/notifier.c:322
+msgid "Battery settings"
+msgstr ""
+
+#: ../src/service.c:567
+msgid "Charge level"
+msgstr ""
+
+#: ../src/service.c:635
+msgid "Show Time in Menu Bar"
+msgstr ""
+
+#: ../src/service.c:639
+msgid "Show Percentage in Menu Bar"
+msgstr ""
+
+#: ../src/service.c:643
+msgid "Power Settings…"
+msgstr ""
+
+#: ../src/service.c:669
+msgid "Adjust brightness automatically"
+msgstr ""
+
+#: ../src/service.c:675
+msgid "Battery settings…"
+msgstr ""
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-05-16 17:59:03 +0000
+++ tests/CMakeLists.txt	2017-02-07 20:21:19 +0000
@@ -1,9 +1,5 @@
-# build libgtest
-add_library (gtest STATIC 
-             ${GTEST_SOURCE_DIR}/gtest-all.cc 
-             ${GTEST_SOURCE_DIR}/gtest_main.cc)
-set_target_properties (gtest PROPERTIES INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIR})
-set_target_properties (gtest PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS} -w)
+find_package(GMock)
+include_directories(${GMOCK_INCLUDE_DIRS})
 
 # dbustest
 pkg_check_modules(DBUSTEST REQUIRED
@@ -47,11 +43,17 @@
 
 function(add_test_by_name name)
   set (TEST_NAME ${name})
+  set (COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
   add_executable (${TEST_NAME} ${TEST_NAME}.cc gschemas.compiled)
   add_test (${TEST_NAME} ${TEST_NAME})
   add_dependencies (${TEST_NAME} ${SERVICE_LIB})
-  target_link_libraries (${TEST_NAME} ${SERVICE_LIB} gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS})
+  target_link_libraries (${TEST_NAME} ${SERVICE_LIB} ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GMOCK_LIBRARIES})
 endfunction()
 add_test_by_name(test-notify)
 add_test(NAME dear-reader-the-next-test-takes-80-seconds COMMAND true)
 add_test_by_name(test-device)
+
+set(COVERAGE_TEST_TARGETS
+  ${COVERAGE_TEST_TARGETS}
+  PARENT_SCOPE
+)
 
=== removed file 'tests/Makefile.am.strings'
--- tests/Makefile.am.strings	2012-05-24 14:49:30 +0000
+++ tests/Makefile.am.strings	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-TESTS += \
-	test-ellipsis \
-	test-space-ellipsis \
-	test-ascii-quotes
-
-#####
-# Tests for there being proper ellipsis instead of three periods in a row
-#####
-test-ellipsis: $(top_srcdir)/po
-	@echo "#!/bin/bash" > $@
-	@echo "(cd $(top_srcdir)/po && make $(GETTEXT_PACKAGE).pot)" >> $@
-	@echo "grep -c -e \"^msgid.*\.\.\.\\\"\" $(top_srcdir)/po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"Ellipsis found in user visible strings\" >&2 && exit 1" >> $@
-	@echo "exit 0" >> $@
-	@chmod +x $@
-
-#####
-# Tests for there being a space before an ellipsis
-#####
-test-space-ellipsis: $(top_srcdir)/po
-	@echo "#!/bin/bash" > $@
-	@echo "(cd $(top_srcdir)/po && make $(GETTEXT_PACKAGE).pot)" >> $@
-	@echo "grep -c -e \"^msgid.* …\\\"\" $(top_srcdir)/po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"Space before ellipsis found in user visible strings\" >&2 && exit 1" >> $@
-	@echo "exit 0" >> $@
-	@chmod +x $@
-
-#####
-# Tests for ASCII quote types
-#####
-test-ascii-quotes: $(top_srcdir)/po
-	@echo "#!/bin/bash" > $@
-	@echo "(cd $(top_srcdir)/po && make $(GETTEXT_PACKAGE).pot)" >> $@
-	@echo "grep -c -e \"^msgid \\\".*'.*\\\"\" $(top_srcdir)/po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII apostrophy found in user visible strings\" >&2 && exit 1" >> $@
-	@echo "grep -c -e \"^msgid \\\".*\\\".*\\\"\" $(top_srcdir)/po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII quote found in user visible strings\" >&2 && exit 1" >> $@
-	@echo "grep -c -e \"^msgid \\\".*\\\`.*\\\"\" $(top_srcdir)/po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII backtick found in user visible strings\" >&2 && exit 1" >> $@
-	@echo "exit 0" >> $@
-	@chmod +x $@
-
-CLEANFILES += $(TESTS)