Merge lp:~phablet-team/gallery-app/desktop-i18n into lp:gallery-app

[Ugo Riboni]

Translate the .desktop file inline

Translate the .desktop file inline

[David Planella (dpm)]

Looks good to me, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1063
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/997/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/172
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/172
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3527
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/629
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2922
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3833
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3833/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/997/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

83 +_Keywords=Photograps;Pictures;Albums

typo: s/Photograps/Photographs/

review: Needs Fixing

[Olivier Tilloy (osomon)]

125 + -D ${CMAKE_BINARY_DIR} ${DESKTOP_FILE_IN_IN_H})

Earlier in the same file, DESKTOP_FILE_IN_IN_H is defined relative to CMAKE_SOURCE_DIR, not to CMAKE_BINARY_DIR. So I think the "-D ${CMAKE_BINARY_DIR}" option can be removed altogether.

[lp:~phablet-team/gallery-app/desktop-i18n]

1064. By Ugo Riboni on 2014-09-16

Fix a typo and remove unnecessary definition

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1064
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1002/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/177/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/177/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/177/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/404/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3547/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/639/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3854/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1002/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

With the last change I suggested, the code fails to build in an out-of-source configuration (try locally with: "mkdir build; cd build; cmake ..; make").

Looking more closely at those lines:

95 +file(RELATIVE_PATH DESKTOP_FILE_IN_IN ${CMAKE_SOURCE_DIR}
96 + ${CMAKE_SOURCE_DIR}/desktop/${DESKTOP_FILE}.in.in)

This file command looks useless, it could be simplified to "set(DESKTOP_FILE_IN_IN desktop/${DESKTOP_FILE}.in.in)".

97 +file(RELATIVE_PATH DESKTOP_FILE_IN_IN_H ${CMAKE_SOURCE_DIR}
98 + ${CMAKE_CURRENT_SOURCE_DIR}/${DESKTOP_FILE_IN_IN}.h)

Why is the DESKTOP_FILE_IN_IN_H path built from the current source dir? Isn’t it supposed to be generated in the current binary dir?

Please clarify, and actually test that at least an out-of-source build works (ideally an in-source build too, as I think it’s supposed to work with the current trunk) before commiting. Thanks.

review: Needs Fixing

[lp:~phablet-team/gallery-app/desktop-i18n]

1065. By Ugo Riboni on 2014-09-16

Fix out of tree builds, and simplify

[Olivier Tilloy (osomon)]

This isn’t correct either:

96 +set(DESKTOP_FILE_IN_IN_H ${CMAKE_CURRENT_BINARY_DIR}/desktop/${DESKTOP_FILE}.in.in.h)

DESKTOP_FILE_IN_IN_H needs to be relative to CMAKE_SOURCE_DIR (or to some other place known to the build system, and then you need to pass a -D parameter to xgettext again).

This can be easily verified: if I build the code locally, it won’t update the translation template anymore, whereas it should (at least the timestamp).

review: Needs Fixing

[lp:~phablet-team/gallery-app/desktop-i18n]

1066. By Ugo Riboni on 2014-09-16

fix a silent failure in xgettext by specifying paths correctly

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1065
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1003/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/178
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/178
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/405
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3548
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/548
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/640
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13261
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2940
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3855
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3855/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1003/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

LGTM now. Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1066
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1004/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/179
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/406
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/641
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13262
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3856
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3856/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1004/rebuild

review: Needs Fixing (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2013-06-18 07:56:00 +0000
+++ .bzrignore	2014-09-16 12:17:45 +0000
@@ -1,6 +1,7 @@
 /CMakeLists.txt.user
 /gallery-app.qmlproject.user
 /desktop/gallery-app.desktop
+/desktop/gallery-app.desktop.in
 /src/config.h
 /src/gallery-app
 /tests/unittests/command-line-parser/command-line-parser
@@ -14,6 +15,7 @@
 /tests/unittests/*/test_*.xml
 /Testing
 /po/*.gmo
+/po/desktop
 CMakeCache.txt
 CMakeFiles
 CTestTestfile.cmake

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-08 21:22:15 +0000
+++ CMakeLists.txt	2014-09-16 12:17:45 +0000
@@ -45,6 +45,9 @@
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
 
+find_program(INTLTOOL_MERGE intltool-merge)
+find_program(INTLTOOL_EXTRACT intltool-extract)
+
 # Standard install paths
 include(GNUInstallDirs)
 
@@ -68,11 +71,6 @@
     set(GALLERY_DIR ${CMAKE_INSTALL_DATADIR}/${GALLERY})
 endif(CLICK_MODE)
 
-file(GLOB_RECURSE I18N_SRC_FILES
-     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     rc/**.qml desktop/**.desktop.in)
-list(SORT I18N_SRC_FILES)
-
 # for dh_translations to extract the domain
 # (regarding syntax consistency, see http://pad.lv/1181187)
 set (GETTEXT_PACKAGE "${GALLERY}")

=== modified file 'desktop/CMakeLists.txt'
--- desktop/CMakeLists.txt	2014-01-11 22:06:28 +0000
+++ desktop/CMakeLists.txt	2014-09-16 12:17:45 +0000
@@ -10,13 +10,11 @@
 	set(ICON "${GALLERY}")
 endif(CLICK_MODE)
 
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
-file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
-foreach(LINE ${DESKTOP_FILE_CONTENTS})
-    string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
-    string(CONFIGURE "${LINE}" LINE)
-    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
-endforeach(LINE)
+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
+add_custom_target(${DESKTOP_FILE} ALL
+                  COMMENT "Merging translations into ${DESKTOP_FILE}"
+                  COMMAND ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po
+                          ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in ${DESKTOP_FILE})
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
         DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)

=== renamed file 'desktop/gallery-app.desktop.in' => 'desktop/gallery-app.desktop.in.in'
--- desktop/gallery-app.desktop.in	2014-02-20 17:53:20 +0000
+++ desktop/gallery-app.desktop.in.in	2014-09-16 12:17:45 +0000
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Name=tr("Gallery")
-GenericName=tr("Ubuntu Photo Viewer")
-X-GNOME-Fullname=tr("Ubuntu Photo Viewer")
-Comment=tr("Browse your photographs")
+_Name=Gallery
+_GenericName=Ubuntu Photo Viewer
+_Comment=Browse your photographs
+_Keywords=Photographs;Pictures;Albums
 Exec=@APP_EXEC@ %u
 Icon=@ICON@
 StartupNotify=true

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-05-09 19:52:57 +0000
+++ po/CMakeLists.txt	2014-09-16 12:17:45 +0000
@@ -3,19 +3,30 @@
 include(FindGettext)
 find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
 
+set(DESKTOP_FILE_IN_IN desktop/${DESKTOP_FILE}.in.in)
+set(DESKTOP_FILE_IN_IN_H ${DESKTOP_FILE_IN_IN}.h)
+
+file(GLOB_RECURSE I18N_SRC_FILES
+     RELATIVE ${CMAKE_SOURCE_DIR}
+     ${CMAKE_SOURCE_DIR}/rc/**.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}
-                  COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${CMAKE_SOURCE_DIR}/po/${POT_FILE}
-                          -D ${CMAKE_SOURCE_DIR}
+add_custom_target(${POT_FILE} ALL
+                  COMMENT "Generating translation template"
+                  COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
+                          --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE_IN_IN}
+                  COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
                           --from-code=UTF-8
                           --c++ --qt --add-comments=TRANSLATORS
-                          --keyword=tr --keyword=tr:1,2
+                          --keyword=tr --keyword=tr:1,2 --keyword=N_
                           --package-name='${GALLERY}'
                           --copyright-holder='Canonical Ltd.'
-                          ${I18N_SRC_FILES})
+                          -D ${CMAKE_SOURCE_DIR} ${I18N_SRC_FILES}
+                          -D ${CMAKE_CURRENT_BINARY_DIR} ${DESKTOP_FILE_IN_IN_H})
 
 foreach(PO_FILE ${PO_FILES})
     get_filename_component(LANG ${PO_FILE} NAME_WE)

=== modified file 'po/gallery-app.pot'
--- po/gallery-app.pot	2014-09-15 07:59:56 +0000
+++ po/gallery-app.pot	2014-09-16 12:17:45 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gallery-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 09:59+0200\n"
+"POT-Creation-Date: 2014-09-16 14:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,18 +17,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: desktop/gallery-app.desktop.in:3 rc/qml/MediaViewer/PopupPhotoViewer.qml:56
-msgid "Gallery"
-msgstr ""
-
-#: desktop/gallery-app.desktop.in:4 desktop/gallery-app.desktop.in:5
-msgid "Ubuntu Photo Viewer"
-msgstr ""
-
-#: desktop/gallery-app.desktop.in:6
-msgid "Browse your photographs"
-msgstr ""
-
 #: rc/qml/AlbumEditor/AlbumEditMenu.qml:43
 #: rc/qml/AlbumEditor/AlbumEditor.qml:35
 msgid "Edit album"
@@ -209,6 +197,11 @@
 msgid "Play"
 msgstr ""
 
+#: rc/qml/MediaViewer/PopupPhotoViewer.qml:56
+#: desktop/gallery-app.desktop.in.in.h:1
+msgid "Gallery"
+msgstr ""
+
 #: rc/qml/PhotosOverview.qml:74
 msgid "Delete photos"
 msgstr ""
@@ -329,3 +322,15 @@
 #: rc/qml/Utility/PhotosToolbarActions.qml:43
 msgid "Import"
 msgstr ""
+
+#: desktop/gallery-app.desktop.in.in.h:2
+msgid "Ubuntu Photo Viewer"
+msgstr ""
+
+#: desktop/gallery-app.desktop.in.in.h:3
+msgid "Browse your photographs"
+msgstr ""
+
+#: desktop/gallery-app.desktop.in.in.h:4
+msgid "Photographs;Pictures;Albums"
+msgstr ""