Merge lp:~dpm/click-update-manager/enable-translations into lp:click-update-manager

[David Planella]

Enable translation extraction, exposing them to Launchpad and shipping them in the package

Enable translation extraction, exposing them to Launchpad and shipping them in the package.

This branch:

- Extracts translatable messages and generates a .pot file containing them
- Adds the po/updatemanager.pot file to version control, so that the translatable messages are exposed to translators in Launchpad
- Builds and ships the translations in the Debian package, from the po/*.po textual files into the *.mo files in the standard per-language locale system folders

Notes:

- Once this is merged, I'd recommend setting automatic translation exports in Launchpad. This way if there are new translations, they will be committed daily as po/$LANGCODE.po in the branch. This is the same setup we use for core apps.
- Since we're past string freeze, I'll upload the .pot file manually into Launchpad, so that translators can start doing their work without having to wait for this MP to be reviewed.

See the README.translations file for more info

[lp:~dpm/click-update-manager/enable-translations]

31. By David Planella on 2013-10-01

Updated project file to show translations-related files

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:31
http://jenkins.qa.ubuntu.com/job/click-update-manager-ci/19/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-update-manager-saucy-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-update-manager-saucy-armhf-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/click-update-manager-ci/19/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

31. By David Planella on 2013-10-01

Updated project file to show translations-related files

30. By David Planella on 2013-10-01

Added support for building and installing translations in the Debian package

29. By David Planella on 2013-10-01

Internationalization improvements to ease translation

28. By David Planella on 2013-10-01

Added gettext domain for .desktop file

27. By David Planella on 2013-10-01

Added basic i18n infrastructure, created .pot file for translators

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-10-01 07:00:58 +0000
@@ -0,0 +1,2 @@
+.build
+po/Makefile
 
=== modified file 'Components/PageUpdate.qml'
--- Components/PageUpdate.qml	2013-09-27 18:30:17 +0000
+++ Components/PageUpdate.qml	2013-10-01 07:00:58 +0000
@@ -63,6 +63,7 @@
     Button {
         id: retryButton
         objectName: "retryButton"
+	// TRANSLATORS: this is shown in a button to re-check for updates. Please keep it short.
         text: i18n.tr("Check again")
         anchors {
             left: parent.left
@@ -84,7 +85,7 @@
     Button {
         id: installAllButton
         objectName: "installAllButton"
-        text: i18n.tr("Install %1 Updates").arg(root.updates)
+        text: i18n.tr("Install %1 Update", "Install %1 Updates", root.updates).arg(root.updates)
         anchors {
             left: parent.left
             right: parent.right
@@ -137,6 +138,7 @@
                 onMessageChanged: {
                     if(message.length > 0) {
                         labelVersion.text = message;
+			// TRANSLATORS: this is shown in a button to retry updates. Please keep it short.
                         buttonAppUpdate.text = i18n.tr("Retry");
                         modelData.updateState = false;
                     }
@@ -151,6 +153,7 @@
 
                     Button {
                         id: buttonAppUpdate
+			// TRANSLATORS: this is shown in a button to apply updates. Please keep it short.
                         text: i18n.tr("Update")
                         height: textArea.height / 2
 
@@ -194,7 +197,8 @@
                             left: parent.left
                             right: parent.right
                         }
-                        text: modelData.remoteVersion ? i18n.tr("Version: ") + modelData.remoteVersion : ""
+			// TRANSLATORS: this is a label that shows the version of the app
+                        text: modelData.remoteVersion ? i18n.tr("Version:") + " " + modelData.remoteVersion : ""
                         color: "white"
                         visible: !modelData.updateState
                         elide: Text.ElideRight
@@ -230,6 +234,8 @@
                     onFinished: {
                         progress.visible = false;
                         buttonAppUpdate.visible = false;
+			// TRANSLATORS: this is a message to indicate success after the installation
+			// process has finished
                         textArea.message = i18n.tr("Installed");
                         root.updates -= 1;
                     }
 
=== added file 'README.translations'
--- README.translations	1970-01-01 00:00:00 +0000
+++ README.translations	2013-10-01 07:00:58 +0000
@@ -0,0 +1,36 @@
+# Updating translations
+
+Translations for the Click Update Managerhappen in [Launchpad Translations][]
+and are automatically committed daily on the trunk branch in the po/ folder.
+
+They are then built and installed as part of the package build, so that
+developers don't really need to worry about them.
+
+However, there is one task that needs to be taken care of: exposing new
+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
+
+And that's it, once the branch lands Launchpad should take care of all the rest!
+
+# Behind the scenes
+
+Behind the scenes, whenever the po/*.pot file (also known as translations template)
+is committed to trunk Launchpad reads it and updates the translatable strings
+exposed in the web UI. This will enable translators to work on the new strings.
+The translations template contains all translatable strings that have been
+extracted from the source code files.
+
+Launchpad will then store translations in its database and will commit them daily
+in the form of textual po/*.po files to trunk. The PO files are also usually
+referred to as the translations files. You'll find a translation file for each
+language the app has got at least a translated message available for.
+
+Translations for core apps follow the standard [gettext format].
+
+ [Launchpad Translations]: https://translations.launchpad.net/click-update-manager
+ [gettext format]: https://www.gnu.org/software/gettext/
 
=== modified file 'click-update-manager.desktop'
--- click-update-manager.desktop	2013-09-26 19:14:00 +0000
+++ click-update-manager.desktop	2013-10-01 07:00:58 +0000
@@ -6,3 +6,4 @@
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true
+X-Ubuntu-Gettext-Domain=updatemanager
 
=== modified file 'debian/rules'
--- debian/rules	2013-09-26 21:07:17 +0000
+++ debian/rules	2013-10-01 07:00:58 +0000
@@ -11,3 +11,16 @@
 
 override_dh_auto_test:
 	dh_auto_build -- check
+
+override_dh_install:
+	tests/autopilot/install_autopilot.sh $(CURDIR)
+	dh_install --fail-missing
+	appname=updatemanager; \
+	for pofile in $(shell find ./po -name "*.po"); do \
+		pofilename="$${pofile##*/}"; \
+		langcode="$${pofilename%.*}"; \
+		localedir="debian/$$appname/usr/share/locale/$$langcode/LC_MESSAGES"; \
+		mkdir -p $$localedir; \
+		mofile="$$localedir/$$appname.mo"; \
+		msgfmt -o $$mofile $$pofile; \
+	done
 
=== added directory 'po'
=== added file 'po/po.pro'
--- po/po.pro	1970-01-01 00:00:00 +0000
+++ po/po.pro	2013-10-01 07:00:58 +0000
@@ -0,0 +1,58 @@
+## This .pro file is used to create a Makefile with the necessary rules
+## to create an initial translations template and to update it whenever
+## there are new translatable strings in the project that are ready to be
+## exposed to translators
+##
+## See the ../README.translations file for more information
+
+TEMPLATE = subdirs
+
+PROJECTNAME = $$system(basename ../*.qmlproject)
+PROJECTNAME = $$replace(PROJECTNAME,.qmlproject,)
+
+## DESKTOPFILE = ../$${PROJECTNAME}.desktop
+DESKTOPFILE = ../click-update-manager.desktop
+
+SOURCECODE = ../*.qml \
+             ../Components/*.qml
+
+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("")
+
+## 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} $${DESKTOPFILETEMP}
+potfile.depends = desktopfile
+QMAKE_EXTRA_TARGETS += potfile
+
+## Do not use this rule directly. It's a dependency rule to
+## generate an intermediate .js 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
+
 
=== added file 'po/updatemanager.pot'
--- po/updatemanager.pot	1970-01-01 00:00:00 +0000
+++ po/updatemanager.pot	2013-10-01 07:00:58 +0000
@@ -0,0 +1,68 @@
+# click-update-manager translations
+# Copyright (C) 2013 Canonical Ltd. 
+# This file is distributed under the same license as the click-update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: updatemanager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-01 08:42+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: ../Components/PageUpdate.qml:24
+msgid "Updates"
+msgstr ""
+
+#: ../Components/PageUpdate.qml:51
+msgid "No Updates Found"
+msgstr ""
+
+#: ../Components/PageUpdate.qml:58
+msgid "Please log into your Ubuntu One account in System Settings."
+msgstr ""
+
+#. TRANSLATORS: this is shown in a button to re-check for updates. Please keep it short.
+#: ../Components/PageUpdate.qml:67
+msgid "Check again"
+msgstr ""
+
+#: ../Components/PageUpdate.qml:88
+#, qt-format
+msgid "Install %1 Update"
+msgid_plural "Install %1 Updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: this is shown in a button to retry updates. Please keep it short.
+#: ../Components/PageUpdate.qml:142
+msgid "Retry"
+msgstr ""
+
+#. TRANSLATORS: this is shown in a button to apply updates. Please keep it short.
+#: ../Components/PageUpdate.qml:157
+msgid "Update"
+msgstr ""
+
+#. TRANSLATORS: this is a label that shows the version of the app
+#: ../Components/PageUpdate.qml:201
+msgid "Version:"
+msgstr ""
+
+#. TRANSLATORS: this is a message to indicate success after the installation
+#. process has finished
+#: ../Components/PageUpdate.qml:239
+msgid "Installed"
+msgstr ""
+
+#: ../.build/updatemanager.desktop.js:1
+msgid "Update Manager"
+msgstr ""
 
=== modified file 'updatemanager.qmlproject'
--- updatemanager.qmlproject	2013-09-20 20:04:44 +0000
+++ updatemanager.qmlproject	2013-10-01 07:00:58 +0000
@@ -41,6 +41,17 @@
         directory: "debian"
         filter: "*"
     }
+    /* Shows the README files in the project view */
+    Files {
+        filter: "README*"
+    }
+    /* Shows the translation files and the .pro file used to generate the .pot template */
+    Files {
+        filter: "*.po*"
+    }
+    Files {
+        filter: "*.pro"
+    }
     /* List of plugin directories passed to QML runtime */
     importPaths: [ "." ,"/usr/bin","/usr/lib/x86_64-linux-gnu/qt5/qml" ]
 }