Merge lp:~phablet-team/notes-app/notes-app-desktop-translations into lp:notes-app

[Ugo Riboni]

Add translations inside the .desktop file

Add translations inside the .desktop file

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:267
http://jenkins.qa.ubuntu.com/job/notes-app-ci/300/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/94
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/814
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-i386-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/131
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8467
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/954
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/954/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

This branch has been superseded by https://code.launchpad.net/~phablet-team/notes-app/inline-desktop-i18n/+merge/235785 - Ugo, could you update its status?

Unmerged revisions

267. By Ugo Riboni on 2014-06-16

Add translations in the .desktop file

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-05 14:47:20 +0000
+++ CMakeLists.txt	2014-06-16 13:13:22 +0000
@@ -5,6 +5,9 @@
 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+find_program(INTLTOOL_MERGE intltool-merge)
+find_program(INTLTOOL_EXTRACT intltool-extract)
+
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
 
@@ -42,6 +45,7 @@
 
 set(NOTES_APP notes-app)
 set(AUTOPILOT_DIR notes_app)
+set(DESKTOP_FILE notes-app.desktop)
 
 if(NOT CLICK_MODE)
     set(NOTES_APP_DIR ${CMAKE_INSTALL_DATADIR}/${NOTES_APP})
@@ -69,15 +73,11 @@
     DESTINATION ${NOTES_APP_DIR}
     )
 
-set(DESKTOP_FILE notes-app.desktop)
-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(REGEX REPLACE "\@DESKTOP_EXEC\@" "${DESKTOP_EXEC}" LINE "${LINE}")
-    string(REGEX REPLACE "\@DESKTOP_PATH\@" "${DESKTOP_PATH}" LINE "${LINE}")
-    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
-endforeach(LINE)
+configure_file(${DESKTOP_FILE}.in.in ${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 ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null
+        )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
     DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
@@ -89,7 +89,8 @@
 
 file(GLOB_RECURSE I18N_SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     **.qml **.desktop.in)
+     **.qml)
+list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in)
 list(SORT I18N_SRC_FILES)
 
 # for dh_translations to extract the domain

=== renamed file 'notes-app.desktop.in' => 'notes-app.desktop.in.in'
--- notes-app.desktop.in	2013-10-08 22:42:33 +0000
+++ notes-app.desktop.in.in	2014-06-16 13:13:22 +0000
@@ -1,12 +1,13 @@
 [Desktop Entry]
 Type=Application
 Exec=@DESKTOP_EXEC@
-Name=tr("Notes")
-GenericName=tr("Notes application for Ubuntu")
+_Name=Notes
+_GenericName=Notes application for Ubuntu
+_Description=Notes application for Ubuntu
+_Keywords=Notes;Notepad
 Icon=notepad
 Terminal=false
 @DESKTOP_PATH@
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=com.ubuntu.notes
 X-Ubuntu-Single-Instance=true

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2013-10-08 10:37:42 +0000
+++ po/CMakeLists.txt	2014-06-16 13:13:22 +0000
@@ -7,7 +7,11 @@
 set(POT_FILE ${DOMAIN}.pot)
 file(GLOB PO_FILES *.po)
 
-add_custom_target(${POT_FILE}
+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}
                           -D ${CMAKE_SOURCE_DIR}
                           --from-code=UTF-8

=== modified file 'po/com.ubuntu.notes.pot'
--- po/com.ubuntu.notes.pot	2013-10-10 09:36:08 +0000
+++ po/com.ubuntu.notes.pot	2014-06-16 13:13:22 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: com.ubuntu.notes\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-10 11:34+0200\n"
+"POT-Creation-Date: 2014-06-16 15:10+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"
@@ -49,10 +49,6 @@
 msgid "Trash;Erase Note"
 msgstr ""
 
-#: NotesApp.qml:64 notes-app.desktop.in:4
+#: NotesApp.qml:64
 msgid "Notes"
 msgstr ""
-
-#: notes-app.desktop.in:5
-msgid "Notes application for Ubuntu"
-msgstr ""