Merge lp:~dobey/ubuntu-printing-app/fix-i18n into lp:ubuntu-printing-app

[dobey]

Use intltool module from cmake-extras and update template.

[Andrew Hayzen (ahayzen)]

Should this run when doing a build? I haven't yet been able to get the .pot to be regenerated when doing a build? I was expecting it todo this.

review: Needs Information

[dobey (dobey)]

No. Regenerating the .pot file with every build will create lots of needless changes to the file when strings aren't changed, and will create situations with conflicts when multiple people are working on different branches. The file should only be updated when strings are added or removed, generally. "make ubuntu-printing-app.pog" will cause it get rebuilt.

[Andrew Hayzen (ahayzen)]

OK thanks, this works nicely in that case :-)

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-03-17 21:17:09 +0000
+++ CMakeLists.txt	2017-03-17 21:17:09 +0000
@@ -5,15 +5,7 @@
 enable_testing()
 
 # Load translation tools
-find_program(INTLTOOL_MERGE intltool-merge)
-if(NOT INTLTOOL_MERGE)
-    message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
-endif()
-
-find_program(INTLTOOL_EXTRACT intltool-extract)
-if(NOT INTLTOOL_EXTRACT)
-    message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
-endif()
+find_package(Intltool REQUIRED)
 
 # Set the vars
 set(APP_NAME ubuntu-printing-app)
@@ -60,8 +52,6 @@
 
 # Setup gettext defs and include po directory
 set(GETTEXT_PACKAGE "ubuntu-printing-app")
-add_definitions(-DI18N_DOMAIN="${GETTEXT_PACKAGE}")
-
 add_subdirectory(po)
 
 # Add tests

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2017-01-24 10:58:19 +0000
+++ po/CMakeLists.txt	2017-03-17 21:17:09 +0000
@@ -1,44 +1,13 @@
-project(ubuntu-printing-app-translations)
-
-include(FindGettext)
-find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
-
-file(RELATIVE_PATH DESKTOP_FILE_IN_IN ${CMAKE_SOURCE_DIR}
-     ${CMAKE_SOURCE_DIR}/ubuntu-printing-app/${DESKTOP_FILE}.in.in)
-file(RELATIVE_PATH DESKTOP_FILE_IN_IN_H ${CMAKE_SOURCE_DIR}
-     ${CMAKE_CURRENT_SOURCE_DIR}/${DESKTOP_FILE_IN_IN}.h)
-
-file(GLOB_RECURSE I18N_SRC_FILES
-     RELATIVE ${CMAKE_SOURCE_DIR}
-     ${CMAKE_SOURCE_DIR}/ubuntu-printing-app/**.qml)
-list(SORT I18N_SRC_FILES)
-
-set(DOMAIN ${GETTEXT_PACKAGE})
-set(POT_FILE ${DOMAIN}.pot)
-file(GLOB PO_FILES *.po)
-
-add_custom_target(${POT_FILE} ALL
-                  COMMENT "Generating translation template"
-                  COMMAND touch ${POT_FILE}
-                  COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
-                          --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE_IN_IN}
-                  COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
-                          -D ${CMAKE_SOURCE_DIR}
-                          --from-code=UTF-8
-                          --c++ --qt --add-comments=TRANSLATORS
-                          --keyword=tr --keyword=tr:1,2 --keyword=N_
-                          -j
-                          --package-name=ubuntu-printing-app
-                          --copyright-holder='Canonical Ltd.'
-                          -D ${CMAKE_SOURCE_DIR} ${I18N_SRC_FILES}
-                          -D ${CMAKE_BINARY_DIR} ${DESKTOP_FILE_IN_IN_H}
-                  COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR})
-
-foreach(PO_FILE ${PO_FILES})
-    get_filename_component(LANG ${PO_FILE} NAME_WE)
-    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
-    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
-            DESTINATION ${INSTALL_DIR}
-            RENAME ${DOMAIN}.mo)
-endforeach(PO_FILE)
+
+intltool_update_potfile(
+    KEYWORDS "_" "_:1,2" "N_" "N_:1,2" "tr" "tr:1,2"
+    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+    COPYRIGHT_HOLDER "Canonical Ltd."
+    FILE_GLOBS "${CMAKE_SOURCE_DIR}/*.desktop.in.in" "${CMAKE_SOURCE_DIR}/*.qml"
+    FILTER "tests/*"
+)
+
+intltool_install_translations(
+    ALL
+    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+)

=== modified file 'po/ubuntu-printing-app.pot'
--- po/ubuntu-printing-app.pot	2017-02-28 15:34:29 +0000
+++ po/ubuntu-printing-app.pot	2017-03-17 21:17:09 +0000
@@ -1,129 +1,196 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the ubuntu-printing-app package.
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ubuntu-printing-app\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-28 15:29+0000\n"
+"POT-Creation-Date: 2017-03-17 17:00-0400\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-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ubuntu-printing-app/Main.qml:66
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: ../notifier/src/notify-engine.cpp:48
+#, c-format
+msgid "A cover is open on the printer “%s”."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:49
+#, c-format
+msgid "The printer “%s” can’t be used, because required software is missing."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:50
+#, c-format
+msgid "A door is open on the printer “%s”."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:51
+#, c-format
+msgid "The printer “%s” is out of paper."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:52
+#, c-format
+msgid "The printer “%s” is low on paper."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:53
+#, c-format
+msgid "The printer “%s” is currently off-line."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:54
+#, c-format
+msgid "The printer “%s” has an unknown problem."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:55
+#, c-format
+msgid "The printer “%s” is out of toner."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:56
+#, c-format
+msgid "The printer “%s” is low on toner."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:167
+#, c-format
+msgid "“%s” has printed."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:185
+#, c-format
+msgid "You have %d job queued to print on this printer."
+msgid_plural "You have %d jobs queued to print on this printer."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../notifier/src/notify-engine.cpp:193
+#: ../ubuntu-printing-app/components/AlertDialog.qml:28
+msgid "OK"
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:195
+msgid "Settings…"
+msgstr ""
+
+#. notifier
+#. printing
+#. ubuntu
+#: ../ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:1
+#: ../ubuntu-printing-app/components/PrintRow.qml:74
+msgid "Print"
+msgstr ""
+
+#: ../ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:2
+msgid "Print;Printing;"
+msgstr ""
+
+#: ../ubuntu-printing-app/Main.qml:66
 msgid "Document is invalid"
 msgstr ""
 
-#: ubuntu-printing-app/Main.qml:69
+#: ../ubuntu-printing-app/Main.qml:69
 msgid "Document not found"
 msgstr ""
 
-#: ubuntu-printing-app/Main.qml:72
+#: ../ubuntu-printing-app/Main.qml:72
 msgid "Not a PDF document"
 msgstr ""
 
-#: ubuntu-printing-app/Main.qml:75
+#: ../ubuntu-printing-app/Main.qml:75
 msgid "An unknown error occurred"
 msgstr ""
 
-#: ubuntu-printing-app/Main.qml:99
+#: ../ubuntu-printing-app/Main.qml:99
 msgid "Error"
 msgstr ""
 
-#: ubuntu-printing-app/Main.qml:126
+#: ../ubuntu-printing-app/Main.qml:126
 msgid "URL of PDF to print"
 msgstr ""
 
-#: ubuntu-printing-app/components/AlertDialog.qml:28
-msgid "OK"
-msgstr ""
-
-#: ubuntu-printing-app/components/PrintRow.qml:57
-msgid "Cancel"
-msgstr ""
-
-#: ubuntu-printing-app/components/PrintRow.qml:71
-msgid "Create PDF"
-msgstr ""
-
-#: ubuntu-printing-app/components/PrintRow.qml:71
-#: po/ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:1
-msgid "Print"
-msgstr ""
-
-#: ubuntu-printing-app/components/PrintRow.qml:71
-msgid "Sheets"
-msgstr ""
-
-#: ubuntu-printing-app/pages/ContentPeerPickerPage.qml:43
-msgid "Open With..."
-msgstr ""
-
-#: ubuntu-printing-app/pages/EmptyPage.qml:48
+#: ../ubuntu-printing-app/pages/EmptyPage.qml:48
 msgid ""
 "No document was chosen for printing. In order to print, you need to select "
 "print from an app. Alternatively you can export a PDF document from an app."
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:47
+#: ../ubuntu-printing-app/pages/PrintPage.qml:47
 msgid "Page Setup"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:47
+#: ../ubuntu-printing-app/pages/PrintPage.qml:47
 msgid "Printer Options"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:85
+#: ../ubuntu-printing-app/pages/PrintPage.qml:86
 msgid "Printer"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:106
+#: ../ubuntu-printing-app/pages/PrintPage.qml:107
 msgid "Copies"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:129
-msgid "Collate"
-msgstr ""
-
-#: ubuntu-printing-app/pages/PrintPage.qml:149
-msgid "Reverse"
-msgstr ""
-
-#: ubuntu-printing-app/pages/PrintPage.qml:170
+#: ../ubuntu-printing-app/pages/PrintPage.qml:131
 msgid "All"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:170
+#: ../ubuntu-printing-app/pages/PrintPage.qml:131
 msgid "Range"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:174
+#: ../ubuntu-printing-app/pages/PrintPage.qml:135
 msgid "Pages"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:216
+#: ../ubuntu-printing-app/pages/PrintPage.qml:177
 msgid "eg 1-3,8"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:225
+#: ../ubuntu-printing-app/pages/PrintPage.qml:186
 msgid "Two-sided"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:246
+#: ../ubuntu-printing-app/pages/PrintPage.qml:207
 msgid "Color"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:267
+#: ../ubuntu-printing-app/pages/PrintPage.qml:228
 msgid "Quality"
 msgstr ""
 
-#: po/ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:2
-msgid "Print;Printing;"
+#: ../ubuntu-printing-app/pages/PrintPage.qml:246
+msgid "Collate"
+msgstr ""
+
+#: ../ubuntu-printing-app/pages/PrintPage.qml:266
+msgid "Reverse"
+msgstr ""
+
+#: ../ubuntu-printing-app/pages/ContentPeerPickerPage.qml:43
+msgid "Open With..."
+msgstr ""
+
+#. Text color is determined from background color so set from html
+#: ../ubuntu-printing-app/components/PrintRow.qml:60
+msgid "Cancel"
+msgstr ""
+
+#: ../ubuntu-printing-app/components/PrintRow.qml:74
+msgid "Create PDF"
+msgstr ""
+
+#: ../ubuntu-printing-app/components/PrintRow.qml:74
+msgid "Sheets"
 msgstr ""

=== modified file 'ubuntu-printing-app/CMakeLists.txt'
--- ubuntu-printing-app/CMakeLists.txt	2017-01-20 12:36:56 +0000
+++ ubuntu-printing-app/CMakeLists.txt	2017-03-17 21:17:09 +0000
@@ -12,10 +12,11 @@
 
 # Install desktop file
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${DESKTOP_FILE}.in.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in)
-
-add_custom_target(${DESKTOP_FILE} ALL
-  COMMENT "Merging translations into ${DESKTOP_FILE}"
-  COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
+intltool_merge_translations(
+  "${DESKTOP_FILE}.in"
+  "${DESKTOP_FILE}"
+  ALL
+  UTF8
 )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}