Merge lp:~dpm/ubuntu-terminal-app/enable-translations into lp:ubuntu-terminal-app

[David Planella]

Enable the translations infrastructure: expose translations in Launchpad and build/ship them in the Debian package.

Enable the translations infrastructure: expose translations in Launchpad and build/ship them in the Debian package.

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

FAILED: Continuous integration, rev:27
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/1/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/502
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-precise-amd64-ci/1
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-quantal-amd64-ci/1
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/1
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/1

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

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

David, this is no longer needed, right?

review: Needs Information

Unmerged revisions

27. By David Planella on 2013-09-27

Updated changelog, fixed a lintian warning

26. By David Planella on 2013-09-27

Added .pot file, added rule to build and ship translations

25. By David Planella on 2013-09-27

Changed the project file name for consistency and to get it to work with the translations script, updated the .pot template

24. By David Planella on 2013-09-27

Added initial translations infrastructure

23. By Nicholas Skaggs on 2013-08-14

Remove unused code, and finally fix circle menu test on device (thanks Omer!). Fixes: https://bugs.launchpad.net/bugs/1212262.

Approved by Ubuntu Phone Apps Jenkins Bot.

22. By Nicholas Skaggs on 2013-08-14

Fix valueselector (missed in previous merge)
Fix for circlemenu.

Approved by Ubuntu Phone Apps Jenkins Bot.

21. By Nicholas Skaggs on 2013-08-14

Change to polling instead of using assert, fix lambda silliness, and enable all tests.

Approved by Ubuntu Phone Apps Jenkins Bot.

20. By Nicholas Skaggs on 2013-08-12

This converts the terminal ap tests to the ubuntusdk emulator as well as cleans up and fixes all the tests; including the color scheme check. Fixes: https://bugs.launchpad.net/bugs/1188841.

Approved by Ubuntu Phone Apps Jenkins Bot.

19. By Nicholas Skaggs on 2013-08-09

This converts the terminal ap tests to the ubuntusdk emulator as well as cleans up and fixes all the tests; including the color scheme check. Fixes: https://bugs.launchpad.net/bugs/1188841.

Approved by Ubuntu Phone Apps Jenkins Bot.

18. By Michael Hall on 2013-07-29

Updated attribution in debian/copyright.

Approved by Dmitry Zagnoyko, Ubuntu Phone Apps Jenkins Bot.

=== modified file '.bzrignore'
--- .bzrignore	2013-04-23 20:42:10 +0000
+++ .bzrignore	2013-09-27 06:58:57 +0000
@@ -4,3 +4,5 @@
 debian/ubuntu-terminal-app/
 debian/*.debhelper.log
 debian/*.substvars
+.build
+po/Makefile

=== added file 'README.translations'
--- README.translations	1970-01-01 00:00:00 +0000
+++ README.translations	2013-09-27 06:58:57 +0000
@@ -0,0 +1,36 @@
+# Updating translations
+
+Translations for the Terminal app happen 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/ubuntu-terminal-app
+ [gettext format]: https://www.gnu.org/software/gettext/

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-24 16:18:10 +0000
+++ debian/changelog	2013-09-27 06:58:57 +0000
@@ -1,3 +1,9 @@
+ubuntu-terminal-app (0.6) saucy; urgency=low
+
+  * Added translations infrastructure
+
+ -- David Planella <[e-mail]>  Fri, 27 Sep 2013 08:49:50 +0200
+
 ubuntu-terminal-app (0.5) raring; urgency=low
 
   * Added landscape mode

=== modified file 'debian/control'
--- debian/control	2013-08-09 21:33:43 +0000
+++ debian/control	2013-09-27 06:58:57 +0000
@@ -10,12 +10,12 @@
 Package: ubuntu-terminal-app
 Section: misc
 Architecture: all
-Depends: ${misc:Depends},
-         qmlscene,
+Depends: qmlscene,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-localstorage-plugin,
          qtdeclarative5-qtquick2-plugin,
-         qtdeclarative5-konsole-qml-plugin (>= 0.1.1)
+         qtdeclarative5-konsole-qml-plugin (>= 0.1.1),
+         ${misc:Depends}
 Description: Terminal application
  Core Terminal application
 
@@ -24,6 +24,7 @@
 Depends: libautopilot-qt,
          libqt5test5,
          ubuntu-ui-toolkit-autopilot,
-         ubuntu-terminal-app (= ${source:Version})
+         ubuntu-terminal-app (= ${source:Version}),
+         ${misc:Depends}
 Description: Autopilot tests for Terminal Application
  This package contains the autopilot tests for the Terminal

=== modified file 'debian/rules'
--- debian/rules	2013-04-11 21:26:07 +0000
+++ debian/rules	2013-09-27 06:58:57 +0000
@@ -9,3 +9,12 @@
 
 override_dh_install:
 	dh_install --fail-missing
+	appname=ubuntu-terminal-app; \
+	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

=== modified file 'po/po.pro'
--- po/po.pro	2013-02-12 16:18:48 +0000
+++ po/po.pro	2013-09-27 06:58:57 +0000
@@ -1,48 +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,)
 
-SOURCECODE = ../*.qml
+DESKTOPFILE = ../$${PROJECTNAME}.desktop
+
+SOURCECODE = ../*.qml \
+             ../config/*.qml \
+             ../extraPanel/*.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(" run 'make translate' to create a new translation (po) based on pot. ")
-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 --package-name $${PROJECTNAME} --qt --c++ --add-comments=TRANSLATORS --keyword=tr $${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
 
-## poedit target for new translations 'make translate'
-poedit.target = translate
-poedit.commands = cp messages.pot new_language.po; poedit new_language.po
-QMAKE_EXTRA_TARGETS += poedit
-
-## 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 .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/ubuntu-terminal-app.pot'
--- po/ubuntu-terminal-app.pot	1970-01-01 00:00:00 +0000
+++ po/ubuntu-terminal-app.pot	2013-09-27 06:58:57 +0000
@@ -0,0 +1,50 @@
+# 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
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-terminal-app\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-27 08:41+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"
+
+#: ../Configs.qml:46
+msgid "Color scheme"
+msgstr ""
+
+#: ../Configs.qml:60
+msgid "Font size"
+msgstr ""
+
+#: ../ubuntu-terminal-app.qml:24
+msgid "Control keys"
+msgstr ""
+
+#: ../ubuntu-terminal-app.qml:29
+msgid "Function keys"
+msgstr ""
+
+#: ../ubuntu-terminal-app.qml:34
+msgid "Text ctrl keys"
+msgstr ""
+
+#: ../ubuntu-terminal-app.qml:39
+msgid "Hide extra panel"
+msgstr ""
+
+#: ../ubuntu-terminal-app.qml:53 ../.build/ubuntu-terminal-app.desktop.js:1
+msgid "Terminal"
+msgstr ""
+
+#: ../ubuntu-terminal-app.qml:87
+msgid "Settings"
+msgstr ""

=== renamed file 'terminal.qmlproject' => 'ubuntu-terminal-app.qmlproject'
--- terminal.qmlproject	2013-04-30 20:53:03 +0000
+++ ubuntu-terminal-app.qmlproject	2013-09-27 06:58:57 +0000
@@ -15,6 +15,17 @@
     ImageFiles {
         directory: "."
     }
+    /* 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/lib/x86_64-linux-gnu/qt5/qml" ]
 }