Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1389274 into lp:ubuntu-keyboard

[Michael Sheldon]

Fix building and packaging of translation files

Fix building and packaging of translation files

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * Yes

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/519/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/519/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/ubuntu-keyboard.install'
--- debian/ubuntu-keyboard.install	2013-12-11 17:15:49 +0000
+++ debian/ubuntu-keyboard.install	2014-12-09 14:20:51 +0000
@@ -1,3 +1,4 @@
 debian/server.conf etc/xdg/maliit.org/
 usr/lib/maliit/plugins/libubuntu-keyboard-plugin.so
 usr/share/maliit/plugins/com/ubuntu/lib/libwesternsupport.a
+usr/share/locale/*/LC_MESSAGES/ubuntu-keyboard.mo

=== modified file 'po/po.pro'
--- po/po.pro	2014-08-21 11:49:01 +0000
+++ po/po.pro	2014-12-09 14:20:51 +0000
@@ -25,3 +25,19 @@
                    $${SOURCECODE} $${DESKTOPFILETEMP}
 QMAKE_EXTRA_TARGETS += potfile
 
+PO_FILES = $$system(ls *.po)
+
+install_mo_commands =
+for(po_file, PO_FILES) {
+  mo_file = $$replace(po_file,.po,.mo)
+  !isEmpty(install_mo_commands): install_mo_commands += &&
+  install_mo_commands += msgfmt $$po_file -o $$mo_file
+  mo_name = $$replace(po_file,.po,)
+  mo_targetpath = $(INSTALL_ROOT)/usr/share/locale/$${mo_name}/LC_MESSAGES
+  mo_target = $${mo_targetpath}/$${PROJECTNAME}.mo
+  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

=== modified file 'src/plugin/plugin.cpp'
--- src/plugin/plugin.cpp	2013-10-31 15:26:07 +0000
+++ src/plugin/plugin.cpp	2014-12-09 14:20:51 +0000
@@ -33,11 +33,15 @@
 #include "inputmethod.h"
 
 #include <QtQml>
+#include <libintl.h>
 
 MaliitKeyboardPlugin::MaliitKeyboardPlugin(QObject *parent)
     : QObject(parent)
     , Maliit::Plugins::InputMethodPlugin()
 {
+    bindtextdomain("ubuntu-keyboard", NULL);
+    textdomain("ubuntu-keyboard");
+
     qmlRegisterUncreatableType<InputMethod>("UbuntuKeyboard", 1, 0, "InputMethod",
                                             QString("InputMethod can't be created in QML"));
 }