Merge lp:~agateau/unity-2d/gettext2 into lp:unity-2d/3.0

[Aurélien Gâteau]

[translations] Replace GettextTranslator with Unity2dTr, for proper handling of plural forms

This branch replaces GettextTranslator with Unity2dTr, a thin wrapper around gettext functions. The wrapper is useful to handle char* to QString conversions and to make it simpler to use plural forms.

I decided to name the translation functions u2dTr() to keep them short, but this can be adjusted.

On the QML side, an helper object named "u2d" is installed in the root context of places and launcher. Code using qsTr() is replaced with u2d.tr().

It would have been nicer to expose the function as u2dTr, but I couldn't find a way to expose standalone functions and the operator() trick failed as well.

=== modified file 'launcher/UnityApplications/launcherapplication.cpp'
--- launcher/UnityApplications/launcherapplication.cpp	2011-03-11 01:14:28 +0000
+++ launcher/UnityApplications/launcherapplication.cpp	2011-03-16 17:45:58 +0000
@@ -35,6 +35,9 @@
 
 #include <X11/X.h>
 
+// libunity-2d
+#include <unity2dtr.h>
+
 #include <QDebug>
 #include <QAction>
 #include <QDBusInterface>
@@ -745,14 +748,14 @@
         QAction* keep = new QAction(m_menu);
         keep->setCheckable(is_running);
         keep->setChecked(sticky());
-        keep->setText(is_running ? tr("Keep In Launcher") : tr("Remove From Launcher"));
+        keep->setText(is_running ? u2dTr("Keep In Launcher") : u2dTr("Remove From Launcher"));
         actions.append(keep);
         QObject::connect(keep, SIGNAL(triggered()), this, SLOT(onKeepTriggered()));
     }
 
     if (is_running) {
         QAction* quit = new QAction(m_menu);
-        quit->setText(tr("Quit"));
+        quit->setText(u2dTr("Quit"));
         actions.append(quit);
         QObject::connect(quit, SIGNAL(triggered()), this, SLOT(onQuitTriggered()));
     }

=== modified file 'launcher/UnityApplications/launcherdevice.cpp'
--- launcher/UnityApplications/launcherdevice.cpp	2011-03-10 12:31:36 +0000
+++ launcher/UnityApplications/launcherdevice.cpp	2011-03-16 17:45:58 +0000
@@ -30,6 +30,8 @@
     #include <gtk/gtk.h>
 }
 
+// libunity-2d
+#include <unity2dtr.h>
 
 LauncherDevice::LauncherDevice() :
     m_volume(NULL)
@@ -223,7 +225,7 @@
 LauncherDevice::createMenuActions()
 {
     QAction* eject = new QAction(m_menu);
-    eject->setText(tr("Eject"));
+    eject->setText(u2dTr("Eject"));
     m_menu->addAction(eject);
     QObject::connect(eject, SIGNAL(triggered()), this, SLOT(onEjectTriggered()));
 }

=== modified file 'launcher/UnityApplications/trash.cpp'
--- launcher/UnityApplications/trash.cpp	2011-03-09 13:23:04 +0000
+++ launcher/UnityApplications/trash.cpp	2011-03-16 17:45:58 +0000
@@ -22,6 +22,9 @@
 
 #include "config.h"
 
+// libunity-2d
+#include <unity2dtr.h>
+
 #include <QDebug>
 #include <QAction>
 
@@ -68,7 +71,7 @@
 QString
 Trash::name() const
 {
-    return tr("Trash");
+    return u2dTr("Trash");
 }
 
 QString
@@ -188,14 +191,14 @@
     if (c == 0) return;
 
     QAction* contents = new QAction(m_menu);
-    contents->setText(tr("%n item(s) in trash", 0, c));
+    contents->setText(u2dTr("%n item in trash", "%n items in trash", c));
     contents->setEnabled(false);
     m_menu->addAction(contents);
 
     m_menu->addSeparator();
 
     QAction* empty = new QAction(m_menu);
-    empty->setText(tr("Empty Trash"));
+    empty->setText(u2dTr("Empty Trash"));
     m_menu->addAction(empty);
     QObject::connect(empty, SIGNAL(triggered()), this, SLOT(onEmptyTriggered()));
 }

=== modified file 'launcher/UnityApplications/workspaces.cpp'
--- launcher/UnityApplications/workspaces.cpp	2011-02-10 01:00:41 +0000
+++ launcher/UnityApplications/workspaces.cpp	2011-03-16 17:45:58 +0000
@@ -24,6 +24,9 @@
 #include <QDBusInterface>
 #include <QDBusReply>
 
+// libunity-2d
+#include <unity2dtr.h>
+
 Workspaces::Workspaces()
 {
 }
@@ -63,7 +66,7 @@
 QString
 Workspaces::name() const
 {
-    return tr("Workspaces");
+    return u2dTr("Workspaces");
 }
 
 QString

=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2011-03-14 15:25:50 +0000
+++ launcher/app/launcher.cpp	2011-03-16 17:45:58 +0000
@@ -20,9 +20,9 @@
 #include <gtk/gtk.h>
 
 // unity-2d
-#include <gettexttranslator.h>
 #include <gnomesessionclient.h>
 #include <unity2dapplication.h>
+#include <unity2dtr.h>
 #include <propertybinder.h>
 
 // libqtgconf
@@ -36,8 +36,6 @@
 #include <QDir>
 #include <QGraphicsObject>
 
-#include <unity2dapplication.h>
-
 #include "config.h"
 #include "launcherview.h"
 #include "launcherdbus.h"
@@ -73,9 +71,7 @@
     QDir::addSearchPath("artwork", unity2dDirectory() + "/launcher/artwork");
 
     /* Configure translations */
-    GettextTranslator translator;
-    translator.init("unity-2d", INSTALL_PREFIX "/share/locale");
-    QApplication::installTranslator(&translator);
+    Unity2dTr::init("unity-2d", INSTALL_PREFIX "/share/locale");
 
     /* Panel containing the QML declarative view */
     Unity2dPanel panel;
@@ -109,6 +105,8 @@
     launcherView->rootContext()->setContextProperty("engineBaseUrl",
                                                     launcherView->engine()->baseUrl().toLocalFile());
 
+    Unity2dTr::qmlInit(launcherView->rootContext());
+
     LauncherDBus launcherDBus(visibilityController, launcherView);
     launcherDBus.connectToBus();
 

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-03-07 14:26:03 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-03-16 17:45:58 +0000
@@ -3,7 +3,6 @@
 
 # Sources
 set(libunity-2d-private_SRCS
-    gettexttranslator.cpp
     gnomesessionclient.cpp
     keyboardmodifiersmonitor.cpp
     hotkeymonitor.cpp
@@ -12,6 +11,7 @@
     unity2dapplication.cpp
     unity2ddebug.cpp
     unity2dpanel.cpp
+    unity2dtr.cpp
     mimedata.cpp
     dragdropevent.cpp
     propertybinder.cpp
@@ -36,6 +36,7 @@
     ${QT_QTGUI_LIBRARIES}
     ${QT_QTCORE_LIBRARIES}
     ${QT_QTDBUS_LIBRARIES}
+    ${QT_QTDECLARATIVE_LIBRARIES}
     ${X11_LIBRARIES}
     ${GLIB_LDFLAGS}
     )

=== removed file 'libunity-2d-private/src/gettexttranslator.cpp'
--- libunity-2d-private/src/gettexttranslator.cpp	2011-02-18 16:17:59 +0000
+++ libunity-2d-private/src/gettexttranslator.cpp	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-// Self
-#include "gettexttranslator.h"
-
-// Local
-#include <debug_p.h>
-
-// Qt
-
-// libc
-#include <libintl.h>
-
-struct GettextTranslatorPrivate
-{
-};
-
-GettextTranslator::GettextTranslator(QObject* parent)
-: QTranslator(parent)
-, d(new GettextTranslatorPrivate)
-{
-}
-
-GettextTranslator::~GettextTranslator()
-{
-    delete d;
-}
-
-QString GettextTranslator::translate(const char* context, const char* sourceText, const char* disambiguation) const
-{
-    char* text;
-    if (qstrlen(disambiguation) > 0) {
-        // Constant copied from /usr/share/gettext/gettext.h
-        const char GETTEXT_CONTEXT_GLUE = '\004';
-        QByteArray array(disambiguation);
-        array.append(GETTEXT_CONTEXT_GLUE);
-        array.append(sourceText);
-        text = gettext(array.constData());
-    } else {
-        text = gettext(sourceText);
-    }
-    return QString::fromUtf8(text);
-}
-
-bool GettextTranslator::init(const QString& domain_, const QString& directory)
-{
-    const char* domain = domain_.toLocal8Bit().constData();
-    char* out;
-    setlocale(LC_ALL, "");
-    out = bindtextdomain(domain, directory.toLocal8Bit().constData());
-    if (!out) {
-        qWarning("bindtextdomain() failed: %s", strerror(errno));
-        return false;
-    }
-
-    out = textdomain(domain);
-    if (!out) {
-        qWarning("textdomain() failed: %s", strerror(errno));
-        return false;
-    }
-
-    bind_textdomain_codeset(domain, "UTF-8");
-
-    return true;
-}
-
-#include "gettexttranslator.moc"

=== removed file 'libunity-2d-private/src/gettexttranslator.h'
--- libunity-2d-private/src/gettexttranslator.h	2011-02-18 15:46:24 +0000
+++ libunity-2d-private/src/gettexttranslator.h	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef GETTEXTTRANSLATOR_H
-#define GETTEXTTRANSLATOR_H
-
-// Local
-
-// Qt
-#include <QTranslator>
-
-struct GettextTranslatorPrivate;
-/**
- * A QTranslator which uses gettext
- */
-class GettextTranslator : public QTranslator
-{
-    Q_OBJECT
-public:
-    GettextTranslator(QObject* parent = 0);
-    ~GettextTranslator();
-
-    /**
-     * Reimplemented. Note that context is ignored.
-     */
-    QString translate(const char* context, const char* sourceText, const char* disambiguation=0) const;
-
-    /**
-     * Initialize the translator.
-     * Translations are then loaded from:
-     * $directory/$lang/locale/LC_MESSAGES/$domainName.mo
-     */
-    bool init(const QString& domainName, const QString& directory);
-
-private:
-    Q_DISABLE_COPY(GettextTranslator)
-    GettextTranslatorPrivate* const d;
-
-    // Hide "load" methods because they are used to load .qm
-    bool load(const QString& filename, const QString& directory = QString(), const QString& search_delimiters = QString(), const QString& suffix = QString());
-    bool load(const uchar* data, int len);
-};
-
-#endif /* GETTEXTTRANSLATOR_H */

=== added file 'libunity-2d-private/src/unity2dtr.cpp'
--- libunity-2d-private/src/unity2dtr.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/unity2dtr.cpp	2011-03-16 17:45:58 +0000
@@ -0,0 +1,78 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+// Self
+#include <unity2dtr.h>
+
+// local
+#include <config.h>
+
+// Qt
+#include <QDeclarativeContext>
+
+// libc
+#include <libintl.h>
+
+namespace Unity2dTr
+{
+
+void init(const char* domain, const char* localeDir)
+{
+    setlocale(LC_ALL, "");
+    bindtextdomain(domain, localeDir);
+    textdomain(domain);
+}
+
+void qmlInit(QDeclarativeContext* context)
+{
+    static QmlHelper helper;
+    context->setContextProperty("u2d", &helper);
+}
+
+QString QmlHelper::tr(const QString& text)
+{
+    return ::u2dTr(text.toUtf8().constData());
+}
+
+QString QmlHelper::tr(const QString& singular, const QString& plural, int n)
+{
+    return ::u2dTr(
+        singular.toUtf8().constData(),
+        plural.toUtf8().constData(),
+        n);
+}
+
+} // namespace
+
+QString u2dTr(const char* text)
+{
+    return QString::fromUtf8(gettext(text));
+}
+
+QString u2dTr(const char* singular, const char* plural, int n)
+{
+    QString text = QString::fromUtf8(ngettext(singular, plural, n));
+    // Note: if `text` is "%%n" (meaning the string on screen should be "%n"
+    // literally), this will fail. I think we don't care for now.
+    text.replace("%n", QString::number(n));
+    return text;
+}
+
+#include <unity2dtr.moc>

=== added file 'libunity-2d-private/src/unity2dtr.h'
--- libunity-2d-private/src/unity2dtr.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/unity2dtr.h	2011-03-16 17:45:58 +0000
@@ -0,0 +1,70 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef UNITY2DTR_H
+#define UNITY2DTR_H
+
+// Qt
+#include <QObject>
+
+class QString;
+class QDeclarativeContext;
+
+namespace Unity2dTr
+{
+
+/**
+ * Installs our gettext catalog
+ */
+void init(const char* domain, const char* localeDir);
+
+/**
+ * Add an object named "u2d" to context.
+ *
+ * One can then get translations with u2d.tr("english text")
+ */
+void qmlInit(QDeclarativeContext* context);
+
+/**
+ * @internal
+ */
+class QmlHelper : public QObject
+{
+    Q_OBJECT
+public:
+    Q_INVOKABLE QString tr(const QString&);
+    Q_INVOKABLE QString tr(const QString& singular, const QString& plural, int n);
+};
+
+} // namespace
+
+/**
+ * Translate the string text
+ */
+QString u2dTr(const char* text);
+
+/**
+ * Plural version of utr. Should be called like this:
+ *
+ * u2dTr("%n file", "%n files", count)
+ */
+QString u2dTr(const char* singular, const char* plural, int n);
+
+#endif /* UNITY2DTR_H */

=== modified file 'libunity-2d-private/tests/CMakeLists.txt'
--- libunity-2d-private/tests/CMakeLists.txt	2011-02-24 00:31:39 +0000
+++ libunity-2d-private/tests/CMakeLists.txt	2011-03-16 17:45:58 +0000
@@ -31,18 +31,18 @@
 endmacro(libunity_2d_tests)
 
 libunity_2d_tests(
-    gettexttest
     keyboardmodifiersmonitortest
     paneltest
+    unity2dtrtest
     )
 
-add_custom_target(gettexttest_po COMMAND
+add_custom_target(unity2dtr_po COMMAND
     mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/locale/fr/LC_MESSAGES/
     && ${GETTEXT_MSGFMT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/fr.po
-        -o ${CMAKE_CURRENT_BINARY_DIR}/locale/fr/LC_MESSAGES/gettexttest.mo
+        -o ${CMAKE_CURRENT_BINARY_DIR}/locale/fr/LC_MESSAGES/unity2dtrtest.mo
     )
 
-add_dependencies(gettexttest gettexttest_po)
+add_dependencies(unity2dtrtest unity2dtr_po)
 
 # gnomesessionclienttest
 add_executable(gnomesessionclienttesthelper

=== modified file 'libunity-2d-private/tests/fr.po'
--- libunity-2d-private/tests/fr.po	2011-02-18 14:21:08 +0000
+++ libunity-2d-private/tests/fr.po	2011-03-16 17:45:58 +0000
@@ -8,3 +8,8 @@
 msgctxt "Not far"
 msgid "Close"
 msgstr "Près"
+
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fichier"
+msgstr[1] "%n fichiers"

=== removed file 'libunity-2d-private/tests/gettexttest.cpp'
--- libunity-2d-private/tests/gettexttest.cpp	2011-02-18 16:18:16 +0000
+++ libunity-2d-private/tests/gettexttest.cpp	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Local
-#include <gettexttranslator.h>
-
-// Qt
-#include <QCoreApplication>
-#include <QtTest>
-
-#include <config-test.h>
-
-class GettextTest : public QObject
-{
-    Q_OBJECT
-private Q_SLOTS:
-    void initTestCase()
-    {
-        setenv("LC_MESSAGES", "fr_FR.utf8", 1 /* overwrite */);
-        GettextTranslator* translator = new GettextTranslator(QCoreApplication::instance());
-        QVERIFY(translator->init("gettexttest", TEST_LOCALE_DIR));
-        QCoreApplication::installTranslator(translator);
-    }
-
-    void testTranslate()
-    {
-        QCOMPARE(QCoreApplication::translate("", "Hello"),
-            QString("Bonjour"));
-
-        QCOMPARE(QCoreApplication::translate("Qt-context-is-ignored", "Hello"),
-            QString("Bonjour"));
-
-        QCOMPARE(QCoreApplication::translate("", "Not translated"),
-            QString("Not translated"));
-    }
-
-    void testTranslateWithDisambiguation()
-    {
-        QCOMPARE(QCoreApplication::translate("", "Close", "Closing a door"),
-            QString("Fermer"));
-
-        QCOMPARE(QCoreApplication::translate("", "Close", "Not far"),
-            QString::fromUtf8("Près"));
-    }
-
-    void testTranslateWithEmptyNonNullDisambiguation()
-    {
-        // qsTr in QML calls translate with an empty but non-null disambiguation string
-        QCOMPARE(QCoreApplication::translate("", "Hello", ""),
-            QString("Bonjour"));
-    }
-};
-
-QTEST_MAIN(GettextTest)
-
-#include "gettexttest.moc"

=== added file 'libunity-2d-private/tests/unity2dtrtest.cpp'
--- libunity-2d-private/tests/unity2dtrtest.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/tests/unity2dtrtest.cpp	2011-03-16 17:45:58 +0000
@@ -0,0 +1,55 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Local
+#include <unity2dtr.h>
+
+// Qt
+#include <QCoreApplication>
+#include <QtTest>
+
+#include <config-test.h>
+
+class Unity2dTrTest : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void initTestCase()
+    {
+        Unity2dTr::init("unity2dtrtest", TEST_LOCALE_DIR);
+    }
+
+    void testTranslate()
+    {
+        QCOMPARE(u2dTr("Hello"), QString("Bonjour"));
+        QCOMPARE(u2dTr("Not translated"), QString("Not translated"));
+    }
+
+    void testPluralHandling()
+    {
+        QCOMPARE(u2dTr("%n file", "%n files", 1), QString("1 fichier"));
+        QCOMPARE(u2dTr("%n file", "%n files", 2), QString("2 fichiers"));
+    }
+};
+
+QTEST_MAIN(Unity2dTrTest)
+
+#include "unity2dtrtest.moc"

=== modified file 'panel/app/main.cpp'
--- panel/app/main.cpp	2011-03-07 14:52:11 +0000
+++ panel/app/main.cpp	2011-03-16 17:45:58 +0000
@@ -30,12 +30,12 @@
 #include <legacytray/legacytrayapplet.h>
 
 // Unity
-#include <gettexttranslator.h>
 #include <gnomesessionclient.h>
 #include <unity2ddebug.h>
 #include <unity2dpanel.h>
 #include <unity2dapplication.h>
 #include <unity2dstyle.h>
+#include <unity2dtr.h>
 
 // Qt
 #include <QAbstractFileEngineHandler>
@@ -107,9 +107,7 @@
     client.connectToSessionManager();
 
     /* Configure translations */
-    GettextTranslator translator;
-    translator.init("unity-2d", INSTALL_PREFIX "/share/locale");
-    QApplication::installTranslator(&translator);
+    Unity2dTr::init("unity-2d", INSTALL_PREFIX "/share/locale");
 
     Unity2dPanel panel;
     panel.setEdge(Unity2dPanel::TopEdge);

=== modified file 'places/GroupHeader.qml'
--- places/GroupHeader.qml	2011-02-21 21:04:36 +0000
+++ places/GroupHeader.qml	2011-03-16 17:45:58 +0000
@@ -65,7 +65,7 @@
         TextCustom {
             id: label
 
-            text: groupHeader.folded ? qsTr("See %1 more results").arg(availableCount) : qsTr("See fewer results")
+            text: groupHeader.folded ? u2d.tr("See %1 more results").arg(availableCount) : u2d.tr("See fewer results")
             anchors.left: parent.left
             anchors.baseline: parent.baseline
         }

=== modified file 'places/Home.qml'
--- places/Home.qml	2011-03-12 14:41:36 +0000
+++ places/Home.qml	2011-03-16 17:45:58 +0000
@@ -155,47 +155,47 @@
 
             /* FIXME: dummy icons need to be replaced by design's */
             HomeButton {
-                label: qsTr("Find Media Apps")
+                label: u2d.tr("Find Media Apps")
                 icon: "artwork/find_media_apps.png"
                 onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 9)
             }
 
             HomeButton {
-                label: qsTr("Find Internet Apps")
+                label: u2d.tr("Find Internet Apps")
                 icon: "artwork/find_internet_apps.png"
                 onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 8)
             }
 
             HomeButton {
-                label: qsTr("Find More Apps")
+                label: u2d.tr("Find More Apps")
                 icon: "artwork/find_more_apps.png"
                 onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 0)
             }
 
             HomeButton {
-                label: qsTr("Find Files")
+                label: u2d.tr("Find Files")
                 icon: "artwork/find_files.png"
                 onClicked: activatePlaceEntry("/usr/share/unity/places/files.place", "Files", 0)
             }
 
             /* FIXME: use user's preferred applications instead of hardcoding them */
             HomeButtonApplication {
-                label: qsTr("Browse the Web")
+                label: u2d.tr("Browse the Web")
                 desktopFile: "firefox.desktop"
             }
 
             HomeButtonApplication {
-                label: qsTr("View Photos")
+                label: u2d.tr("View Photos")
                 desktopFile: "shotwell.desktop"
             }
 
             HomeButtonApplication {
-                label: qsTr("Check Email")
+                label: u2d.tr("Check Email")
                 desktopFile: "evolution.desktop"
             }
 
             HomeButtonApplication {
-                label: qsTr("Listen to Music")
+                label: u2d.tr("Listen to Music")
                 desktopFile: "banshee-1.desktop"
             }
         }

=== modified file 'places/SearchEntry.qml'
--- places/SearchEntry.qml	2011-03-11 14:36:05 +0000
+++ places/SearchEntry.qml	2011-03-16 17:45:58 +0000
@@ -140,9 +140,9 @@
                     if(search_input.text)
                         return ""
                     else if(dash.currentPage != undefined && dash.currentPage.model.name)
-                        return qsTr("Search for %1").arg(dash.currentPage.model.name)
+                        return u2d.tr("Search for %1").arg(dash.currentPage.model.name)
                     else
-                        return qsTr("Search")
+                        return u2d.tr("Search")
                 }
             }
         }

=== modified file 'places/SearchRefine.qml'
--- places/SearchRefine.qml	2011-02-14 13:53:03 +0000
+++ places/SearchRefine.qml	2011-03-16 17:45:58 +0000
@@ -40,7 +40,7 @@
         TextCustom {
             id: title
 
-            text: qsTr("Refine search")
+            text: u2d.tr("Refine search")
             font.bold: true
             font.pixelSize: 16
 
@@ -63,7 +63,7 @@
         id: optionsModel
 
         SearchRefineOptionType {
-            title: qsTr("Type")
+            title: u2d.tr("Type")
             placeEntryModel: searchRefine.placeEntryModel
         }
     }

=== modified file 'places/app/places.cpp'
--- places/app/places.cpp	2011-03-12 14:12:29 +0000
+++ places/app/places.cpp	2011-03-16 17:45:58 +0000
@@ -34,8 +34,8 @@
 #include <gtk/gtk.h>
 
 // unity-2d
-#include <gettexttranslator.h>
 #include <unity2ddebug.h>
+#include <unity2dtr.h>
 
 #include "dashdeclarativeview.h"
 #include "config.h"
@@ -65,9 +65,8 @@
     }
 
     /* Configure translations */
-    GettextTranslator translator;
-    translator.init("unity-2d", INSTALL_PREFIX "/share/locale");
-    QApplication::installTranslator(&translator);
+    Unity2dTr::init("unity-2d", INSTALL_PREFIX "/share/locale");
+    Unity2dTr::qmlInit(view.rootContext());
 
     view.engine()->addImportPath(unity2dImportPath());
     /* Note: baseUrl seems to be picky: if it does not end with a slash,

=== modified file 'po/fr.po'
--- po/fr.po	2011-03-01 16:40:00 +0000
+++ po/fr.po	2011-03-16 17:45:58 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/unity-2d/+filebug\n"
-"POT-Creation-Date: 2011-02-21 11:06+0100\n"
+"POT-Creation-Date: 2011-03-16 18:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,76 +17,95 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: launcher/UnityApplications/trash.cpp:198
+#: launcher/UnityApplications/trash.cpp:194
 #, c-format, qt-plural-format
-msgid "%n item(s) in trash"
-msgstr ""
-
-#: launcher/UnityApplications/launcherdevice.cpp:222
+msgid "%n item in trash"
+msgid_plural "%n items in trash"
+msgstr[0] "%n élément dans la corbeille"
+msgstr[1] "%n éléments dans la corbeille"
+
+#: places/Home.qml:183
+msgid "Browse the Web"
+msgstr ""
+
+#: places/Home.qml:193
+msgid "Check Email"
+msgstr ""
+
+#: launcher/UnityApplications/launcherdevice.cpp:228
 msgid "Eject"
 msgstr ""
 
-#: places/Home.qml:111
-msgid "Email & Chat"
-msgstr ""
-
-#: launcher/UnityApplications/trash.cpp:205
+#: launcher/UnityApplications/trash.cpp:201
 msgid "Empty Trash"
 msgstr ""
 
-#: places/Home.qml:123
-msgid "Files & Folders"
-msgstr ""
-
-#: places/Home.qml:105
-msgid "Games"
-msgstr ""
-
-#: places/Home.qml:129
-msgid "Get New Apps"
-msgstr ""
-
-#: launcher/UnityApplications/launcherapplication.cpp:719
+#: places/Home.qml:176
+msgid "Find Files"
+msgstr ""
+
+#: places/Home.qml:164
+msgid "Find Internet Apps"
+msgstr ""
+
+#: places/Home.qml:158
+msgid "Find Media Apps"
+msgstr ""
+
+#: places/Home.qml:170
+msgid "Find More Apps"
+msgstr ""
+
+#: launcher/UnityApplications/launcherapplication.cpp:751
 msgid "Keep In Launcher"
 msgstr ""
 
-#: places/Home.qml:93
-msgid "Music"
-msgstr ""
-
-#: places/Home.qml:117
-msgid "Office"
-msgstr ""
-
-#: places/Home.qml:99
-msgid "Photos & Videos"
-msgstr ""
-
-#: launcher/UnityApplications/launcherapplication.cpp:727
+#: places/Home.qml:198
+msgid "Listen to Music"
+msgstr ""
+
+#: launcher/UnityApplications/launcherapplication.cpp:758
 msgid "Quit"
 msgstr ""
 
-#: launcher/UnityApplications/launcherapplication.cpp:719
+#: places/SearchRefine.qml:43
+msgid "Refine search"
+msgstr ""
+
+#: launcher/UnityApplications/launcherapplication.cpp:751
 msgid "Remove From Launcher"
 msgstr ""
 
-#: places/SearchEntry.qml:114
+#: places/SearchEntry.qml:145
 msgid "Search"
 msgstr ""
 
-#: places/SearchEntry.qml:112
-#, qt-format
-msgid "Search %1"
-msgstr ""
-
-#: launcher/UnityApplications/trash.cpp:71
+#: places/SearchEntry.qml:143
+#, qt-format
+msgid "Search for %1"
+msgstr ""
+
+#: places/GroupHeader.qml:68
+#, qt-format
+msgid "See %1 more results"
+msgstr ""
+
+#: places/GroupHeader.qml:68
+msgid "See fewer results"
+msgstr ""
+
+#: launcher/UnityApplications/trash.cpp:74
 msgid "Trash"
 msgstr ""
 
-#: places/Home.qml:77
-msgid "Web"
-msgstr ""
-
-#: launcher/UnityApplications/workspaces.cpp:66
+#: places/SearchRefine.qml:66
+msgid "Type"
+msgstr ""
+
+#: places/Home.qml:188
+msgid "View Photos"
+msgstr ""
+
+#: launcher/UnityApplications/workspaces.cpp:69
 msgid "Workspaces"
 msgstr ""

=== modified file 'po/unity-2d.pot'
--- po/unity-2d.pot	2011-02-24 14:01:49 +0000
+++ po/unity-2d.pot	2011-03-16 17:45:58 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity-2d\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/unity-2d/+filebug\n"
-"POT-Creation-Date: 2011-02-24 14:57+0100\n"
+"POT-Creation-Date: 2011-03-16 18:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: places/Home.qml:158
 msgid "Find Media Apps"
@@ -57,12 +58,12 @@
 msgid "Type"
 msgstr ""
 
-#: places/SearchEntry.qml:137
+#: places/SearchEntry.qml:143
 #, qt-format
 msgid "Search for %1"
 msgstr ""
 
-#: places/SearchEntry.qml:139
+#: places/SearchEntry.qml:145
 msgid "Search"
 msgstr ""
 
@@ -75,35 +76,37 @@
 msgid "See fewer results"
 msgstr ""
 
-#: launcher/UnityApplications/launcherapplication.cpp:758
+#: launcher/UnityApplications/launcherapplication.cpp:751
 msgid "Keep In Launcher"
 msgstr ""
 
-#: launcher/UnityApplications/launcherapplication.cpp:758
+#: launcher/UnityApplications/launcherapplication.cpp:751
 msgid "Remove From Launcher"
 msgstr ""
 
-#: launcher/UnityApplications/launcherapplication.cpp:766
+#: launcher/UnityApplications/launcherapplication.cpp:758
 msgid "Quit"
 msgstr ""
 
-#: launcher/UnityApplications/launcherdevice.cpp:222
+#: launcher/UnityApplications/launcherdevice.cpp:228
 msgid "Eject"
 msgstr ""
 
-#: launcher/UnityApplications/workspaces.cpp:66
+#: launcher/UnityApplications/workspaces.cpp:69
 msgid "Workspaces"
 msgstr ""
 
-#: launcher/UnityApplications/trash.cpp:71
+#: launcher/UnityApplications/trash.cpp:74
 msgid "Trash"
 msgstr ""
 
-#: launcher/UnityApplications/trash.cpp:198
+#: launcher/UnityApplications/trash.cpp:194
 #, c-format, qt-plural-format
-msgid "%n item(s) in trash"
-msgstr ""
+msgid "%n item in trash"
+msgid_plural "%n items in trash"
+msgstr[0] ""
+msgstr[1] ""
 
-#: launcher/UnityApplications/trash.cpp:205
+#: launcher/UnityApplications/trash.cpp:201
 msgid "Empty Trash"
 msgstr ""

=== modified file 'po/update-unity-2d-pot'
--- po/update-unity-2d-pot	2011-02-24 14:01:26 +0000
+++ po/update-unity-2d-pot	2011-03-16 17:45:58 +0000
@@ -10,15 +10,18 @@
 trap 'rm -f "$GETTEXT_FILES"' EXIT
 cd ..
 find \( -name '*.cpp' -o -name '*.qml' \) \
-    -a ! \( -path './debian/*' -o -path './build/*' -o -path './obj-*-linux-gnu/*' -o -path './.bzr/*' \) \
+    -a ! \( -path './debian/*' -o -path './build/*' -o -path './obj-*-linux-gnu/*' -o -path './.bzr/*'  -o -path './libunity-2d-private/tests/*' \) \
 > $GETTEXT_FILES
 
 # Generate pot from our list
+# Note: we use --keyword=tr for QML files because --keyword=u2d.tr does not
+# work
 xgettext \
     --output $PO_DIR/unity-2d.pot \
     --files-from $GETTEXT_FILES \
     --qt --c++ \
-    --keyword=tr --keyword=qsTr \
+    --keyword=u2dTr:1,1t --keyword=u2dTr:1,2,3t \
+    --keyword=tr:1,1t --keyword=tr:1,2,3t \
     --package-name unity-2d \
     --copyright-holder "Canonical Ltd" \
     --msgid-bugs-address "https://bugs.launchpad.net/unity-2d/+filebug"