Merge lp:~dpm/ubuntu-weather-app/desktop-file-i18n into lp:ubuntu-weather-app/obsolete.trunk

[David Planella]

Updated the qmake file to extract translatable strings from the .desktop file and include them in the generated .pot file.

Updated the qmake file to extract translatable strings from the .desktop file and include them in the generated .pot file.

Up until now, the .desktop file contents and thus the name of the app in the dash was not translatable.

[lp:~dpm/ubuntu-weather-app/desktop-file-i18n]

33. By David Planella on 2013-06-12

Internationalized desktop file

34. By David Planella on 2013-06-12

Changed the intermediate .h file to .js, which seems more appropriate for the SDK, and does not require an extra gettext keyword

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

PASSED: Continuous integration, rev:32
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/17/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-quantal-amd64-ci/14
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-raring-amd64-ci/17

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

review: Approve

=== modified file 'po/po.pro'
--- po/po.pro	2013-05-28 12:26:03 +0000
+++ po/po.pro	2013-06-12 13:56:30 +0000
@@ -3,42 +3,49 @@
 PROJECTNAME = $$system(basename ../*.qmlproject)
 PROJECTNAME = $$replace(PROJECTNAME,.qmlproject,)
 
-SOURCECODE = ../*.qml
-SOURCECODE += ../components/*.qml
-SOURCECODE += ../components/*.js
+DESKTOPFILE = ../$${PROJECTNAME}.desktop
+
+SOURCECODE = ../*.qml \
+             ../components/*.qml \
+             ../components/*.js
+
+BUILDDIR = ../.build
+DESKTOPFILETEMP = $${BUILDDIR}/$${PROJECTNAME}.desktop.js
 
 message("")
 message(" Project Name: $$PROJECTNAME ")
 message(" Source Code: $$SOURCECODE ")
 message("")
-message(" run 'make pot' to generate the pot file from source code. ")
-message(" run 'make mo' to generate the mo files from po files. ")
-message(" run 'qmake; make install' to install the mo files. ")
+message(" Run 'make pot' to generate the pot file from source code. ")
 message("")
 
-## generate pot file 'make pot'
+## Generate pot file 'make pot'
 potfile.target = pot
-potfile.commands = xgettext -o $${PROJECTNAME}.pot --copyright=\"Canonical Ltd. \" --package-name $${PROJECTNAME} --qt --c++ --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 $${SOURCECODE}
+potfile.commands = xgettext \
+                   -o $${PROJECTNAME}.pot \
+		   --copyright=\"Canonical Ltd. \" \
+		   --package-name $${PROJECTNAME} \
+		   --qt --c++ --add-comments=TRANSLATORS \
+		   --keyword=tr --keyword=tr:1,2 \
+		   $${SOURCECODE} $${DESKTOPFILETEMP}
+potfile.depends = desktopfile
 QMAKE_EXTRA_TARGETS += potfile
 
-## generate mo files 'make mo'
-mofiles.target = mo
-mofiles.commands = msgfmt *.po
-QMAKE_EXTRA_TARGETS += mofiles
-
-## Installation steps for mo files. 'make install'
-MO_FILES = $$system(ls *.mo)
-
-install_mo_commands =
-for(mo_file, MO_FILES) {
-  mo_name = $$replace(mo_file,.mo,)
-  mo_targetpath = $(INSTALL_ROOT)/usr/share/locale/$${mo_name}/LC_MESSAGES
-  mo_target = $${mo_targetpath}/$${PROJECTNAME}.mo
-  !isEmpty(install_mo_commands): install_mo_commands += &&
-  install_mo_commands += test -d $$mo_targetpath || mkdir -p $$mo_targetpath
-  install_mo_commands += && cp $$mo_file $$mo_target
-}
-
-install.commands = $$install_mo_commands
-QMAKE_EXTRA_TARGETS += install
+## Do not use this rule directly. It's a dependency rule to
+## generate an intermediate .h file to extract translatable
+## strings from the .desktop file
+desktopfile.target = desktopfile
+desktopfile.commands = awk \'BEGIN { FS=\"=\" }; /Name/ {print \"var s = i18n.tr(\42\" \$$2 \"\42);\"}\' $${DESKTOPFILE} > $${DESKTOPFILETEMP}
+desktopfile.depends = makebuilddir
+QMAKE_EXTRA_TARGETS += desktopfile
+
+## Dependency rule to create the temporary build dir
+makebuilddir.target = makebuilddir
+makebuilddir.commands = mkdir -p $${BUILDDIR}
+QMAKE_EXTRA_TARGETS += makebuilddir
+
+## Rule to clean the products of the build
+clean.target = clean
+clean.commands = rm -Rf $${BUILDDIR}
+QMAKE_EXTRA_TARGETS += clean
 

=== modified file 'po/ubuntu-weather-app.pot'
--- po/ubuntu-weather-app.pot	2013-05-28 12:26:03 +0000
+++ po/ubuntu-weather-app.pot	2013-06-12 13:56:30 +0000
@@ -1,6 +1,6 @@
-# Ubuntu Touch Weather app translations
-# Copyright (C) 2013 Canonical Ltd. 
-# This file is distributed under the same license as the ubuntu-weather-app package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd. 
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 14:18+0200\n"
+"POT-Creation-Date: 2013-06-12 15:54+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"
@@ -22,18 +22,18 @@
 msgstr ""
 
 #: ../components/AddLocationDialog.qml:14
-msgid "Write a city name o pick it by your location"
+msgid "Write a city name or pick it by your location"
 msgstr ""
 
-#: ../components/AddLocationDialog.qml:42
+#: ../components/AddLocationDialog.qml:43
 msgid "Enter a city name"
 msgstr ""
 
-#: ../components/AddLocationDialog.qml:62
+#: ../components/AddLocationDialog.qml:63
 msgid "Use my own location"
 msgstr ""
 
-#: ../components/AddLocationDialog.qml:74
+#: ../components/AddLocationDialog.qml:75
 msgid "Cancel"
 msgstr ""
 
@@ -46,10 +46,6 @@
 msgid "Min."
 msgstr ""
 
-#: ../components/LoadingComponent.qml:29
-msgid "Loading"
-msgstr ""
-
 #: ../components/LocationTab.qml:64 ../components/LocationTabEmpty.qml:20
 msgid "Add"
 msgstr ""
@@ -65,3 +61,7 @@
 #: ../components/LocationTabEmpty.qml:8
 msgid "No Locations"
 msgstr ""
+
+#: ../.build/ubuntu-weather-app.desktop.js:1
+msgid "Weather"
+msgstr ""

=== modified file 'ubuntu-weather-app.desktop'
--- ubuntu-weather-app.desktop	2013-04-11 20:37:30 +0000
+++ ubuntu-weather-app.desktop	2013-06-12 13:56:30 +0000
@@ -8,3 +8,4 @@
 Name=Weather
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
+X-Ubuntu-Gettext-Domain=ubuntu-weather-app