Merge lp:~dpm/ubuntu-weather-app/fix-cmake-i18n into lp:ubuntu-weather-app/obsolete.trunk

[David Planella]

Fix the rule to generate a .pot template after the migration to cmake

Fix the rule to generate a .pot template after the migration to cmake

[Martin Borho (martin-borho)]

Looks okay for me.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:196
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/135/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1323
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/133
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/133
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/47

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/135/rebuild

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2013-09-26 05:47:45 +0000
+++ .bzrignore	2014-02-14 09:55:02 +0000
@@ -1,8 +1,16 @@
-*.qmlproject.user
-
+*.qmlproject.user*
 debian/files
+debian/tmp
+debian/ubuntu-weather-app*
 debian/app-template/
 debian/*.debhelper.log
 debian/*.substvars
-po/Makefile
+Makefile
 .build
+.excludes
+CMakeCache.txt
+CMakeFiles/
+*.cmake
+*.gmo
+*.mo
+*.desktop

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-13 01:09:38 +0000
+++ CMakeLists.txt	2014-02-14 09:55:02 +0000
@@ -40,17 +40,23 @@
 
 file(GLOB_RECURSE I18N_SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     rc/**.qml desktop/**.desktop.in)
+     components/*.qml components/*.js ${DESKTOP_FILE}.in.in)
 list(SORT I18N_SRC_FILES)
 
-
 file(GLOB SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
      *.qml *.js *.png *.js)
 install(DIRECTORY components resources DESTINATION ${DATA_DIR})
 install(FILES ${MAIN_QML} DESTINATION ${DATA_DIR})
 
-configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
+file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
+file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
+foreach(LINE ${DESKTOP_FILE_CONTENTS})
+    string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
+    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
+endforeach(LINE)
+
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
     DESTINATION ${DESKTOP_DIR})
 

=== modified file 'README.translations'
--- README.translations	2013-09-26 05:41:19 +0000
+++ README.translations	2014-02-14 09:55:02 +0000
@@ -10,10 +10,12 @@
 translatable messages to translators. So whenever you add new translatable
 messages in the code, make sure to follow these steps:
 
- 1. Change directory to the po/ folder: `cd po`
- 2. Update the translations template: `qmake && make pot`
- 3. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
- 4. Push the branch and send a merge proposal as usual
+ 1. Create a build directory: `mkdir ../build && cd ../build`
+ 2. Run the cmake config: `cmake ../<original-branch>`
+ 3. Build the project to generate the updated .pot file: `make`
+ 4. Copy the .pot file to your original sources: `cp po/*.pot ../<original-branch>`
+ 5. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
+ 6. Push the branch and send a merge proposal as usual
 
 And that's it, once the branch lands Launchpad should take care of all the rest!
 

=== renamed file 'com.ubuntu.weather_weather.desktop.in' => 'com.ubuntu.weather_weather.desktop.in.in'
--- com.ubuntu.weather_weather.desktop.in	2014-01-31 21:06:15 +0000
+++ com.ubuntu.weather_weather.desktop.in.in	2014-02-14 09:55:02 +0000
@@ -4,7 +4,7 @@
 Terminal=false
 Exec=@EXEC@
 Icon=@ICON@
-Name=Weather
+Name=tr("Weather")
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
 X-Ubuntu-Gettext-Domain=@PROJECT_NAME@

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-01-31 21:06:15 +0000
+++ po/CMakeLists.txt	2014-02-14 09:55:02 +0000
@@ -5,16 +5,20 @@
 set(POT_FILE ${DOMAIN}.pot)
 file(GLOB PO_FILES *.po)
 
-add_custom_target(${POT_FILE}
-                  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
-						  --package-name='${PROJECT}'
-                          --copyright-holder='Canonical Ltd.'
-                          ${I18N_SRC_FILES})
+# Creates the .pot file containing the translations template
+add_custom_target(${POT_FILE} ALL
+    COMMENT "Generating translation template"
+    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
+        --package-name='${PROJECT}'
+        --copyright-holder='Canonical Ltd.'
+        ${I18N_SRC_FILES})
 
+# Builds the binary translations catalog for each language
+# it finds source translations (*.po) for
 foreach(PO_FILE ${PO_FILES})
     get_filename_component(LANG ${PO_FILE} NAME_WE)
     gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})

=== renamed file 'po/ubuntu-weather-app.pot' => 'po/com.ubuntu.weather.pot'
=== modified file 'ubuntu-weather-app.qmlproject'
--- ubuntu-weather-app.qmlproject	2013-09-26 05:41:19 +0000
+++ ubuntu-weather-app.qmlproject	2014-02-14 09:55:02 +0000
@@ -23,8 +23,9 @@
     Files {
         filter: "*.po*"
     }
+    /* Shows the CMake files */
     Files {
-        filter: "*.pro"
+        filter: "CMakeLists.txt"
     }
     /* List of plugin directories passed to QML runtime */
     importPaths: [ "." ,"/usr/lib/x86_64-linux-gnu/qt5/qml" ]