Merge lp:~aacid/unity8/gettext_textdomain into lp:unity8

[Albert Astals Cid]

Fix launcher internationalization

Call textdomain and use X-Ubuntu-Gettext-Domain

bindtextdomain doesn't set the text domain, only the folder the domain has to be looked for.

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, launcher is now in spanish

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[lp:~aacid/unity8/gettext_textdomain]

1229. By Albert Astals Cid on 2014-09-01

We're setting this from cpp now

1230. By Albert Astals Cid on 2014-09-01

Use the non-standard X-Ubuntu-Gettext-Domain if present

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1228
http://jenkins.qa.ubuntu.com/job/unity8-ci/4196/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4294
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5546
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5546/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12440

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

I've added support for in .desktop file translations in the backend rework branch

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

no. jensins seems unreachable atm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1230
http://jenkins.qa.ubuntu.com/job/unity8-ci/4198/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4299
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1292
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1292
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5551
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5551/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12445

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
--- plugins/Unity/Launcher/backend/launcherbackend.cpp	2014-06-11 15:36:51 +0000
+++ plugins/Unity/Launcher/backend/launcherbackend.cpp	2014-09-01 15:24:21 +0000
@@ -28,6 +28,8 @@
 #include <QDebug>
 #include <QStandardPaths>
 
+#include <libintl.h>
+
 class LauncherBackendItem
 {
 public:
@@ -350,7 +352,12 @@
     QSettings settings(desktopFile, QSettings::IniFormat);
 
     LauncherBackendItem* item = new LauncherBackendItem();
+
     item->displayName = settings.value("Desktop Entry/Name").toString();
+    const QString domain  = settings.value("Desktop Entry/X-Ubuntu-Gettext-Domain").toString();
+    if (!domain.isEmpty()) {
+        item->displayName = dgettext(domain.toUtf8().constData(), item->displayName.toUtf8().constData());
+    }
 
     QString iconString = settings.value("Desktop Entry/Icon").toString();
     QString pathString = settings.value("Desktop Entry/Path").toString();
 
=== modified file 'qml/Dash/DashApplication.qml'
--- qml/Dash/DashApplication.qml	2014-08-07 15:29:12 +0000
+++ qml/Dash/DashApplication.qml	2014-09-01 15:24:21 +0000
@@ -24,12 +24,6 @@
 
     useDeprecatedToolbar: false
 
-    Binding {
-        target: i18n
-        property: "domain"
-        value: "unity8"
-    }
-
     Dash {
         anchors.fill: parent
     }
 
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-08-28 20:06:18 +0000
+++ qml/Shell.qml	2014-09-01 15:24:21 +0000
@@ -592,12 +592,6 @@
         }
     }
 
-    Binding {
-        target: i18n
-        property: "domain"
-        value: "unity8"
-    }
-
     Dialogs {
         id: dialogs
         anchors.fill: parent
 
=== modified file 'src/Dash/main.cpp'
--- src/Dash/main.cpp	2014-08-12 13:49:11 +0000
+++ src/Dash/main.cpp	2014-09-01 15:24:21 +0000
@@ -68,6 +68,7 @@
     }
 
     bindtextdomain("unity8", translationDirectory().toUtf8().data());
+    textdomain("unity8");
 
     QQuickView* view = new QQuickView();
     view->setResizeMode(QQuickView::SizeRootObjectToView);
 
=== modified file 'src/main.cpp'
--- src/main.cpp	2014-07-31 10:52:30 +0000
+++ src/main.cpp	2014-09-01 15:24:21 +0000
@@ -108,6 +108,7 @@
     }
 
     bindtextdomain("unity8", translationDirectory().toUtf8().data());
+    textdomain("unity8");
 
     QQuickView* view = new QQuickView();
     view->setResizeMode(QQuickView::SizeRootObjectToView);