Merge lp:~bzoltan/ubuntu-ui-toolkit/restructure_i18n into lp:ubuntu-ui-toolkit/staging

[Zoltan Balogh]

Restructure i18n API implementation for non Ubuntu platforms

Restructure i18n API implementation for non Ubuntu platforms

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2121
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1227/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6681/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1227/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2121
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1261/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6682/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1261/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2121
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/41/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6683/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/41/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2121
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1477/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6684/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1477/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2121
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1470/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6685/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1470/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2121
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/789/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1470/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1477/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1261/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1227/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/41/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6686/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6685
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6684
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6682
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6681
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6683

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/789/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/restructure_i18n]

2122. By Zoltan Balogh on 2016-09-22

Missed backslash

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1262/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6687/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1262/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/42/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6688/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/42/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1478/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6689/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1478/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1228/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6690/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1228/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1471/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6691/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1471/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/790/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1471/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1478/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1262/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1228
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/42/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6692/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6691
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6689
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6687
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6690
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6688

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/790/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1267/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6715/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1267/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1483/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6716/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1483/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/47/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6717/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/47/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1233/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6718/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1233/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1476/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6719/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1476/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/794/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1476/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1483/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1267/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1233
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/47/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6720/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6719
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6716
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6715
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6718
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6717

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/794/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Just to clear up the review queue: this needs a rationale as to what the split is trying to achieve. From the current code I barely see a difference in the implementations and no platform-specific code.

Unmerged revisions

2122. By Zoltan Balogh on 2016-09-22

Missed backslash

2121. By Zoltan Balogh on 2016-09-22

Restructure i18n API implementation for non Ubuntu platforms

=== modified file 'src/UbuntuToolkit/UbuntuToolkit.pro'
--- src/UbuntuToolkit/UbuntuToolkit.pro	2016-09-12 14:56:56 +0000
+++ src/UbuntuToolkit/UbuntuToolkit.pro	2016-09-22 08:32:15 +0000
@@ -2,7 +2,7 @@
 QT = core-private gui-private qml-private quick-private testlib dbus svg organizer \
      UbuntuGestures-private UbuntuMetrics
 
-unix {
+linux {
     CONFIG += link_pkgconfig
     PKGCONFIG += gio-2.0 dbus-1 libnih libnih-dbus
 }
@@ -142,7 +142,6 @@
     $$PWD/colorutils.cpp \
     $$PWD/exclusivegroup.cpp \
     $$PWD/filterbehavior.cpp \
-    $$PWD/i18n.cpp \
     $$PWD/inversemouseareatype.cpp \
     $$PWD/listener.cpp \
     $$PWD/livetimer.cpp \
@@ -237,4 +236,22 @@
     $$PWD/privates/shaders/frame.vert \
     $$PWD/privates/shaders/frame.frag
 
+macx { 
+    # OSX and iOS specific
+    SOURCES += \
+        $$PWD/i18n-osx.cpp 
+} else:android {
+    # Android specific
+    SOURCES += \
+        $$PWD/i18n-android.cpp 
+} else:windows {
+    # Windows specific
+    SOURCES += \
+        $$PWD/i18n-windows.cpp 
+} else {
+    # Ubuntu specific
+    SOURCES += \
+        $$PWD/i18n-ubuntu.cpp 
+}
+
 load(ubuntu_qt_module)

=== added file 'src/UbuntuToolkit/i18n-android.cpp'
--- src/UbuntuToolkit/i18n-android.cpp	1970-01-01 00:00:00 +0000
+++ src/UbuntuToolkit/i18n-android.cpp	2016-09-22 08:32:15 +0000
@@ -0,0 +1,365 @@
+/*
+ * Copyright 2012-2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Tim Peeters <[e-mail]>
+ */
+
+#include "i18n_p.h"
+
+namespace C {
+#include <libintl.h>
+#include <glib.h>
+#include <glib/gi18n.h>
+}
+#include <stdlib.h>
+#include <locale.h>
+
+#include <QtCore/QDir>
+
+#include "timeutils_p.h"
+
+UT_NAMESPACE_BEGIN
+/*!
+ * \qmltype i18n
+ * \inqmlmodule Ubuntu.Components
+ * \ingroup ubuntu
+ * \brief i18n is a context property that provides internationalization support.
+ *
+ * i18n cannot be instantiated, and is already available as a context property.
+ * It is based on \l {https://www.gnu.org/software/gettext/} {gettext}, and thus the standard gettext tools can be used for translating
+ * a project. Example:
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 0.1
+ *
+ * Item {
+ *      width: units.gu(40)
+ *      height: units.gu(50)
+ *
+ *      Button {
+ *          anchors.centerIn: parent
+ *          text: i18n.tr("Press me")
+ *      }
+ * }
+ * \endqml
+ */
+UbuntuI18n *UbuntuI18n::m_i18 = nullptr;
+
+UbuntuI18n::UbuntuI18n(QObject* parent) : QObject(parent)
+{
+    /*
+     * setlocale
+     * category = LC_ALL: All types of i18n: LC_MESSAGES, LC_NUMERIC, LC_TIME
+     * locale = "": Lookup the environment for $LC_ALL, $LC_* and $LANG in that order
+     * Returns: for example en_US.utf8, da_DK or POSIX
+     *
+     * Note: $LANGUAGE is implicitly respected by gettext() calls and
+     *   defines the order of multiple locales
+     */
+    m_language = QString::fromLocal8Bit(setlocale(LC_ALL, ""));
+}
+
+UbuntuI18n::~UbuntuI18n()
+{
+    m_i18 = nullptr;
+}
+
+/*!
+ * \qmlproperty string i18n::domain
+ * The gettext domain to be used for the translation. The default domain
+ * is the applicationName specified in the application's \l MainView, or the empty string "" if
+ * no applicationName was given or no \l MainView is used.
+ * Use dtr() functions instead of tr() to use a different domain for a single translation
+ * that ignores i18n.domain.
+ */
+QString UbuntuI18n::domain() const {
+    return m_domain;
+}
+
+/*!
+ * \qmlproperty string i18n::language
+ * The language that is used for the translation. The default value is
+ * the user's locale dending on $LC_ALL, $LC_MESSAGES and $LANG at the time
+ * of running the application. See the gettext manual for details.
+ */
+QString UbuntuI18n::language() const {
+    return m_language;
+}
+
+/**
+ * \qmlmethod void i18n::bindtextdomain(string domain_name, string dir_name)
+ * Specify that the domain_name message catalog can be found
+ * in dir_name rather than in the system locale data base.
+ */
+void UbuntuI18n::bindtextdomain(const QString& domain_name, const QString& dir_name) {
+    C::bindtextdomain(domain_name.toUtf8(), dir_name.toUtf8());
+    Q_EMIT domainChanged();
+}
+
+void UbuntuI18n::setDomain(const QString &domain) {
+    if (m_domain == domain)
+        return;
+
+    m_domain = domain;
+    C::textdomain(domain.toUtf8());
+    /*
+     The default is /usr/share/locale if we don't set a folder
+     For click we use APP_DIR/share/locale
+     e.g. /usr/share/click/preinstalled/com.example.foo/current/share/locale
+     */
+    QString appDir = QString::fromLocal8Bit(getenv("APP_DIR"));
+    if (!QDir::isAbsolutePath (appDir)) {
+        appDir = QStringLiteral("/usr");
+    }
+    QString localePath(QDir(appDir).filePath(QStringLiteral("share/locale")));
+    C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
+    Q_EMIT domainChanged();
+}
+
+void UbuntuI18n::setLanguage(const QString &lang) {
+    if (m_language == lang)
+        return;
+
+    m_language = lang;
+
+    /*
+     This is needed for LP: #1263163.
+
+     LANGUAGE may be set to one or more languages for example "fi" or
+     "sv:de". gettext prioritizes LANGUAGE over LC_ALL, LC_*, and
+     LANG, so if the session has already set LANGUAGE, calls to
+     gettext will only use that.  We must override it here so that
+     future calls to gettext are done in the new language.
+
+     This only affects the current process. It does not override the
+     user's session LANGUAGE.
+     */
+    setenv("LANGUAGE", lang.toUtf8().constData(), 1);
+
+    /*
+     The inverse form of setlocale as used in the constructor, passing
+     a valid locale string updates all category type defaults.
+     */
+    setlocale(LC_ALL, lang.toUtf8());
+    Q_EMIT languageChanged();
+}
+
+/*!
+ * \qmlmethod string i18n::tr(string text)
+ * Translate \a text using gettext and return the translation.
+ */
+QString UbuntuI18n::tr(const QString& text)
+{
+    return QString::fromUtf8(C::gettext(text.toUtf8()));
+}
+
+/*!
+ * \qmlmethod string i18n::tr(string singular, string plural, int n)
+ * Translate the given input string \a singular or \a plural (depending on the number of items \a n)
+ * using gettext.
+ * Note that tr() does not automatically insert the values in the QString,
+ * so it should be called like this:
+ *          tr("%1 file", "%1 files", count).arg(count)
+ */
+QString UbuntuI18n::tr(const QString &singular, const QString &plural, int n)
+{
+    return QString::fromUtf8(C::ngettext(singular.toUtf8(), plural.toUtf8(), n));
+}
+
+/*!
+ * \qmlmethod string i18n::dtr(string domain, string text)
+ * Translate \a text using gettext. Uses the specified domain \a domain instead of i18n.domain.
+ */
+QString UbuntuI18n::dtr(const QString& domain, const QString& text)
+{
+    if (domain.isNull()) {
+        return QString::fromUtf8(C::dgettext(NULL, text.toUtf8()));
+    } else {
+        return QString::fromUtf8(C::dgettext(domain.toUtf8(), text.toUtf8()));
+    }
+}
+
+/*!
+ * \qmlmethod string i18n::dtr(string domain, string singular, string plural, int n)
+ * Translate the given text using gettext. Should be called like this:
+ *          tr(domain, "%1 file", "%1 files", count).arg(count)
+ * Uses \a domain for the domain instead of i18n.domain, and \a singular or \a plural
+ * as input for the translation depending on the number of items \a n.
+ */
+QString UbuntuI18n::dtr(const QString& domain, const QString& singular, const QString& plural, int n)
+{
+    if (domain.isNull()) {
+        return QString::fromUtf8(C::dngettext(NULL, singular.toUtf8(), plural.toUtf8(), n));
+    } else {
+        return QString::fromUtf8(C::dngettext(domain.toUtf8(), singular.toUtf8(), plural.toUtf8(), n));
+    }
+}
+
+/*!
+ * \qmlmethod string i18n::ctr(string context, string text)
+ * Translate \a text using gettext and return the translation.
+ * \a context is only visible to the translator and helps disambiguating for very short texts
+ */
+QString UbuntuI18n::ctr(const QString& context, const QString& text)
+{
+    return dctr(QString(), context, text);
+}
+
+/*!
+ * \qmlmethod string i18n::dctr(string domain, string context, string text)
+ * Translate \a text using gettext. Uses the specified domain \a domain instead of i18n.domain.
+ * \a context is only visible to the translator and helps disambiguating for very short texts
+ */
+QString UbuntuI18n::dctr(const QString& domain, const QString& context, const QString& text)
+{
+    if (domain.isNull()) {
+        return QString::fromUtf8(C::g_dpgettext2(NULL, context.toUtf8(), text.toUtf8()));
+    } else {
+        return QString::fromUtf8(C::g_dpgettext2(domain.toUtf8(), context.toUtf8(), text.toUtf8()));
+    }
+}
+
+/*!
+ * \qmlmethod string i18n::tag(string text)
+ * Mark \a text for translation at a later point. Typically this allows an API
+ * to take the original string and pass it to dtr (or dgettext).
+ *
+ * \qml
+ * import QtQuick 2.4
+ * import UserMetrics 0.1
+ *
+ * Metric {
+ *     name: "distance"
+ *     format: i18n.tag("Distance covered today: %1 km")
+ *     emptyFormat: i18n.tag("No running today")
+ *     domain: "runner.forest"
+ * }
+ * \endqml
+ *
+ * The strings tagged for localzation above are passed to the implementation
+ * of UserMetrics verbatim, as well as the domain of the app. Display and
+ * translation of the strings will happen in the lockscreen, where the same
+ * strings will be passed to i18n.tr.
+ */
+QString UbuntuI18n::tag(const QString& text)
+{
+    return text;
+}
+
+/*!
+ * \qmlmethod string i18n::tag(string context, string text)
+ * Mark \a text for translation at a later point. Typically this allows an API
+ * to take the original string and pass it to dctr (or g_dpgettext2).
+ * \a context is only visible to the translator and helps disambiguating for very short texts
+ */
+QString UbuntuI18n::tag(const QString& context, const QString& text)
+{
+    Q_UNUSED(context);
+    return text;
+}
+/*!
+ * \qmlmethod string i18n::relativeDateTime(datetime dateTime)
+ * Translate a datetime based on proximity to current time.
+ */
+QString UbuntuI18n::relativeDateTime(const QDateTime& datetime)
+{
+    static const QString ubuntuUiToolkit = QStringLiteral("ubuntu-ui-toolkit");
+
+    QDateTime relativeTo(QDateTime::currentDateTime());
+    const date_proximity_t prox = getDateProximity(relativeTo, datetime);
+
+    switch (prox)  {
+        case DATE_PROXIMITY_NOW:
+            /* TRANSLATORS: Time based "this is happening/happened now" */
+            return dtr(ubuntuUiToolkit, QStringLiteral("Now"));
+
+        case DATE_PROXIMITY_HOUR:
+        {
+            qint64 diff = datetime.toMSecsSinceEpoch() - relativeTo.toMSecsSinceEpoch();
+            qint64 minutes = qRound(float(diff) / 60000);
+            if (minutes < 0) {
+                return dtr(ubuntuUiToolkit, QStringLiteral("%1 minute ago"),
+                           QStringLiteral("%1 minutes ago"), qAbs(minutes)).arg(qAbs(minutes));
+            }
+            return dtr(ubuntuUiToolkit, QStringLiteral("%1 minute"),
+                       QStringLiteral("%1 minutes"), minutes).arg(minutes);
+        }
+
+        case DATE_PROXIMITY_TODAY:
+            /* en_US example: "1:00 PM" */
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("HH:mm")));
+
+        case DATE_PROXIMITY_YESTERDAY:
+            /* en_US example: "Yesterday  13:00" */
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("'Yesterday\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("'Yesterday\u2003'HH:mm")));
+
+        case DATE_PROXIMITY_TOMORROW:
+            /* en_US example: "Tomorrow  1:00 PM" */
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("'Tomorrow\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("'Tomorrow\u2003'HH:mm")));
+
+        case DATE_PROXIMITY_LAST_WEEK:
+        case DATE_PROXIMITY_NEXT_WEEK:
+            /* en_US example: "Fri  1:00 PM" */
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("ddd'\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("ddd'\u2003'HH:mm")));
+
+        case DATE_PROXIMITY_FAR_BACK:
+        case DATE_PROXIMITY_FAR_FORWARD:
+        default:
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("ddd d MMM'\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("ddd d MMM'\u2003'HH:mm")));
+    }
+    return datetime.toString(Qt::DefaultLocaleShortDate);
+}
+
+UT_NAMESPACE_END

=== added file 'src/UbuntuToolkit/i18n-macx.cpp'
--- src/UbuntuToolkit/i18n-macx.cpp	1970-01-01 00:00:00 +0000
+++ src/UbuntuToolkit/i18n-macx.cpp	2016-09-22 08:32:15 +0000
@@ -0,0 +1,365 @@
+/*
+ * Copyright 2012-2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Tim Peeters <[e-mail]>
+ */
+
+#include "i18n_p.h"
+
+namespace C {
+#include <libintl.h>
+#include <glib.h>
+#include <glib/gi18n.h>
+}
+#include <stdlib.h>
+#include <locale.h>
+
+#include <QtCore/QDir>
+
+#include "timeutils_p.h"
+
+UT_NAMESPACE_BEGIN
+/*!
+ * \qmltype i18n
+ * \inqmlmodule Ubuntu.Components
+ * \ingroup ubuntu
+ * \brief i18n is a context property that provides internationalization support.
+ *
+ * i18n cannot be instantiated, and is already available as a context property.
+ * It is based on \l {https://www.gnu.org/software/gettext/} {gettext}, and thus the standard gettext tools can be used for translating
+ * a project. Example:
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 0.1
+ *
+ * Item {
+ *      width: units.gu(40)
+ *      height: units.gu(50)
+ *
+ *      Button {
+ *          anchors.centerIn: parent
+ *          text: i18n.tr("Press me")
+ *      }
+ * }
+ * \endqml
+ */
+UbuntuI18n *UbuntuI18n::m_i18 = nullptr;
+
+UbuntuI18n::UbuntuI18n(QObject* parent) : QObject(parent)
+{
+    /*
+     * setlocale
+     * category = LC_ALL: All types of i18n: LC_MESSAGES, LC_NUMERIC, LC_TIME
+     * locale = "": Lookup the environment for $LC_ALL, $LC_* and $LANG in that order
+     * Returns: for example en_US.utf8, da_DK or POSIX
+     *
+     * Note: $LANGUAGE is implicitly respected by gettext() calls and
+     *   defines the order of multiple locales
+     */
+    m_language = QString::fromLocal8Bit(setlocale(LC_ALL, ""));
+}
+
+UbuntuI18n::~UbuntuI18n()
+{
+    m_i18 = nullptr;
+}
+
+/*!
+ * \qmlproperty string i18n::domain
+ * The gettext domain to be used for the translation. The default domain
+ * is the applicationName specified in the application's \l MainView, or the empty string "" if
+ * no applicationName was given or no \l MainView is used.
+ * Use dtr() functions instead of tr() to use a different domain for a single translation
+ * that ignores i18n.domain.
+ */
+QString UbuntuI18n::domain() const {
+    return m_domain;
+}
+
+/*!
+ * \qmlproperty string i18n::language
+ * The language that is used for the translation. The default value is
+ * the user's locale dending on $LC_ALL, $LC_MESSAGES and $LANG at the time
+ * of running the application. See the gettext manual for details.
+ */
+QString UbuntuI18n::language() const {
+    return m_language;
+}
+
+/**
+ * \qmlmethod void i18n::bindtextdomain(string domain_name, string dir_name)
+ * Specify that the domain_name message catalog can be found
+ * in dir_name rather than in the system locale data base.
+ */
+void UbuntuI18n::bindtextdomain(const QString& domain_name, const QString& dir_name) {
+    C::bindtextdomain(domain_name.toUtf8(), dir_name.toUtf8());
+    Q_EMIT domainChanged();
+}
+
+void UbuntuI18n::setDomain(const QString &domain) {
+    if (m_domain == domain)
+        return;
+
+    m_domain = domain;
+    C::textdomain(domain.toUtf8());
+    /*
+     The default is /usr/share/locale if we don't set a folder
+     For click we use APP_DIR/share/locale
+     e.g. /usr/share/click/preinstalled/com.example.foo/current/share/locale
+     */
+    QString appDir = QString::fromLocal8Bit(getenv("APP_DIR"));
+    if (!QDir::isAbsolutePath (appDir)) {
+        appDir = QStringLiteral("/usr");
+    }
+    QString localePath(QDir(appDir).filePath(QStringLiteral("share/locale")));
+    C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
+    Q_EMIT domainChanged();
+}
+
+void UbuntuI18n::setLanguage(const QString &lang) {
+    if (m_language == lang)
+        return;
+
+    m_language = lang;
+
+    /*
+     This is needed for LP: #1263163.
+
+     LANGUAGE may be set to one or more languages for example "fi" or
+     "sv:de". gettext prioritizes LANGUAGE over LC_ALL, LC_*, and
+     LANG, so if the session has already set LANGUAGE, calls to
+     gettext will only use that.  We must override it here so that
+     future calls to gettext are done in the new language.
+
+     This only affects the current process. It does not override the
+     user's session LANGUAGE.
+     */
+    setenv("LANGUAGE", lang.toUtf8().constData(), 1);
+
+    /*
+     The inverse form of setlocale as used in the constructor, passing
+     a valid locale string updates all category type defaults.
+     */
+    setlocale(LC_ALL, lang.toUtf8());
+    Q_EMIT languageChanged();
+}
+
+/*!
+ * \qmlmethod string i18n::tr(string text)
+ * Translate \a text using gettext and return the translation.
+ */
+QString UbuntuI18n::tr(const QString& text)
+{
+    return QString::fromUtf8(C::gettext(text.toUtf8()));
+}
+
+/*!
+ * \qmlmethod string i18n::tr(string singular, string plural, int n)
+ * Translate the given input string \a singular or \a plural (depending on the number of items \a n)
+ * using gettext.
+ * Note that tr() does not automatically insert the values in the QString,
+ * so it should be called like this:
+ *          tr("%1 file", "%1 files", count).arg(count)
+ */
+QString UbuntuI18n::tr(const QString &singular, const QString &plural, int n)
+{
+    return QString::fromUtf8(C::ngettext(singular.toUtf8(), plural.toUtf8(), n));
+}
+
+/*!
+ * \qmlmethod string i18n::dtr(string domain, string text)
+ * Translate \a text using gettext. Uses the specified domain \a domain instead of i18n.domain.
+ */
+QString UbuntuI18n::dtr(const QString& domain, const QString& text)
+{
+    if (domain.isNull()) {
+        return QString::fromUtf8(C::dgettext(NULL, text.toUtf8()));
+    } else {
+        return QString::fromUtf8(C::dgettext(domain.toUtf8(), text.toUtf8()));
+    }
+}
+
+/*!
+ * \qmlmethod string i18n::dtr(string domain, string singular, string plural, int n)
+ * Translate the given text using gettext. Should be called like this:
+ *          tr(domain, "%1 file", "%1 files", count).arg(count)
+ * Uses \a domain for the domain instead of i18n.domain, and \a singular or \a plural
+ * as input for the translation depending on the number of items \a n.
+ */
+QString UbuntuI18n::dtr(const QString& domain, const QString& singular, const QString& plural, int n)
+{
+    if (domain.isNull()) {
+        return QString::fromUtf8(C::dngettext(NULL, singular.toUtf8(), plural.toUtf8(), n));
+    } else {
+        return QString::fromUtf8(C::dngettext(domain.toUtf8(), singular.toUtf8(), plural.toUtf8(), n));
+    }
+}
+
+/*!
+ * \qmlmethod string i18n::ctr(string context, string text)
+ * Translate \a text using gettext and return the translation.
+ * \a context is only visible to the translator and helps disambiguating for very short texts
+ */
+QString UbuntuI18n::ctr(const QString& context, const QString& text)
+{
+    return dctr(QString(), context, text);
+}
+
+/*!
+ * \qmlmethod string i18n::dctr(string domain, string context, string text)
+ * Translate \a text using gettext. Uses the specified domain \a domain instead of i18n.domain.
+ * \a context is only visible to the translator and helps disambiguating for very short texts
+ */
+QString UbuntuI18n::dctr(const QString& domain, const QString& context, const QString& text)
+{
+    if (domain.isNull()) {
+        return QString::fromUtf8(C::g_dpgettext2(NULL, context.toUtf8(), text.toUtf8()));
+    } else {
+        return QString::fromUtf8(C::g_dpgettext2(domain.toUtf8(), context.toUtf8(), text.toUtf8()));
+    }
+}
+
+/*!
+ * \qmlmethod string i18n::tag(string text)
+ * Mark \a text for translation at a later point. Typically this allows an API
+ * to take the original string and pass it to dtr (or dgettext).
+ *
+ * \qml
+ * import QtQuick 2.4
+ * import UserMetrics 0.1
+ *
+ * Metric {
+ *     name: "distance"
+ *     format: i18n.tag("Distance covered today: %1 km")
+ *     emptyFormat: i18n.tag("No running today")
+ *     domain: "runner.forest"
+ * }
+ * \endqml
+ *
+ * The strings tagged for localzation above are passed to the implementation
+ * of UserMetrics verbatim, as well as the domain of the app. Display and
+ * translation of the strings will happen in the lockscreen, where the same
+ * strings will be passed to i18n.tr.
+ */
+QString UbuntuI18n::tag(const QString& text)
+{
+    return text;
+}
+
+/*!
+ * \qmlmethod string i18n::tag(string context, string text)
+ * Mark \a text for translation at a later point. Typically this allows an API
+ * to take the original string and pass it to dctr (or g_dpgettext2).
+ * \a context is only visible to the translator and helps disambiguating for very short texts
+ */
+QString UbuntuI18n::tag(const QString& context, const QString& text)
+{
+    Q_UNUSED(context);
+    return text;
+}
+/*!
+ * \qmlmethod string i18n::relativeDateTime(datetime dateTime)
+ * Translate a datetime based on proximity to current time.
+ */
+QString UbuntuI18n::relativeDateTime(const QDateTime& datetime)
+{
+    static const QString ubuntuUiToolkit = QStringLiteral("ubuntu-ui-toolkit");
+
+    QDateTime relativeTo(QDateTime::currentDateTime());
+    const date_proximity_t prox = getDateProximity(relativeTo, datetime);
+
+    switch (prox)  {
+        case DATE_PROXIMITY_NOW:
+            /* TRANSLATORS: Time based "this is happening/happened now" */
+            return dtr(ubuntuUiToolkit, QStringLiteral("Now"));
+
+        case DATE_PROXIMITY_HOUR:
+        {
+            qint64 diff = datetime.toMSecsSinceEpoch() - relativeTo.toMSecsSinceEpoch();
+            qint64 minutes = qRound(float(diff) / 60000);
+            if (minutes < 0) {
+                return dtr(ubuntuUiToolkit, QStringLiteral("%1 minute ago"),
+                           QStringLiteral("%1 minutes ago"), qAbs(minutes)).arg(qAbs(minutes));
+            }
+            return dtr(ubuntuUiToolkit, QStringLiteral("%1 minute"),
+                       QStringLiteral("%1 minutes"), minutes).arg(minutes);
+        }
+
+        case DATE_PROXIMITY_TODAY:
+            /* en_US example: "1:00 PM" */
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("HH:mm")));
+
+        case DATE_PROXIMITY_YESTERDAY:
+            /* en_US example: "Yesterday  13:00" */
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("'Yesterday\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("'Yesterday\u2003'HH:mm")));
+
+        case DATE_PROXIMITY_TOMORROW:
+            /* en_US example: "Tomorrow  1:00 PM" */
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("'Tomorrow\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("'Tomorrow\u2003'HH:mm")));
+
+        case DATE_PROXIMITY_LAST_WEEK:
+        case DATE_PROXIMITY_NEXT_WEEK:
+            /* en_US example: "Fri  1:00 PM" */
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("ddd'\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("ddd'\u2003'HH:mm")));
+
+        case DATE_PROXIMITY_FAR_BACK:
+        case DATE_PROXIMITY_FAR_FORWARD:
+        default:
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("ddd d MMM'\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("ddd d MMM'\u2003'HH:mm")));
+    }
+    return datetime.toString(Qt::DefaultLocaleShortDate);
+}
+
+UT_NAMESPACE_END

=== renamed file 'src/UbuntuToolkit/i18n.cpp' => 'src/UbuntuToolkit/i18n-ubuntu.cpp'
=== added file 'src/UbuntuToolkit/i18n-windows.cpp'
--- src/UbuntuToolkit/i18n-windows.cpp	1970-01-01 00:00:00 +0000
+++ src/UbuntuToolkit/i18n-windows.cpp	2016-09-22 08:32:15 +0000
@@ -0,0 +1,365 @@
+/*
+ * Copyright 2012-2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Tim Peeters <[e-mail]>
+ */
+
+#include "i18n_p.h"
+
+namespace C {
+#include <libintl.h>
+#include <glib.h>
+#include <glib/gi18n.h>
+}
+#include <stdlib.h>
+#include <locale.h>
+
+#include <QtCore/QDir>
+
+#include "timeutils_p.h"
+
+UT_NAMESPACE_BEGIN
+/*!
+ * \qmltype i18n
+ * \inqmlmodule Ubuntu.Components
+ * \ingroup ubuntu
+ * \brief i18n is a context property that provides internationalization support.
+ *
+ * i18n cannot be instantiated, and is already available as a context property.
+ * It is based on \l {https://www.gnu.org/software/gettext/} {gettext}, and thus the standard gettext tools can be used for translating
+ * a project. Example:
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 0.1
+ *
+ * Item {
+ *      width: units.gu(40)
+ *      height: units.gu(50)
+ *
+ *      Button {
+ *          anchors.centerIn: parent
+ *          text: i18n.tr("Press me")
+ *      }
+ * }
+ * \endqml
+ */
+UbuntuI18n *UbuntuI18n::m_i18 = nullptr;
+
+UbuntuI18n::UbuntuI18n(QObject* parent) : QObject(parent)
+{
+    /*
+     * setlocale
+     * category = LC_ALL: All types of i18n: LC_MESSAGES, LC_NUMERIC, LC_TIME
+     * locale = "": Lookup the environment for $LC_ALL, $LC_* and $LANG in that order
+     * Returns: for example en_US.utf8, da_DK or POSIX
+     *
+     * Note: $LANGUAGE is implicitly respected by gettext() calls and
+     *   defines the order of multiple locales
+     */
+    m_language = QString::fromLocal8Bit(setlocale(LC_ALL, ""));
+}
+
+UbuntuI18n::~UbuntuI18n()
+{
+    m_i18 = nullptr;
+}
+
+/*!
+ * \qmlproperty string i18n::domain
+ * The gettext domain to be used for the translation. The default domain
+ * is the applicationName specified in the application's \l MainView, or the empty string "" if
+ * no applicationName was given or no \l MainView is used.
+ * Use dtr() functions instead of tr() to use a different domain for a single translation
+ * that ignores i18n.domain.
+ */
+QString UbuntuI18n::domain() const {
+    return m_domain;
+}
+
+/*!
+ * \qmlproperty string i18n::language
+ * The language that is used for the translation. The default value is
+ * the user's locale dending on $LC_ALL, $LC_MESSAGES and $LANG at the time
+ * of running the application. See the gettext manual for details.
+ */
+QString UbuntuI18n::language() const {
+    return m_language;
+}
+
+/**
+ * \qmlmethod void i18n::bindtextdomain(string domain_name, string dir_name)
+ * Specify that the domain_name message catalog can be found
+ * in dir_name rather than in the system locale data base.
+ */
+void UbuntuI18n::bindtextdomain(const QString& domain_name, const QString& dir_name) {
+    C::bindtextdomain(domain_name.toUtf8(), dir_name.toUtf8());
+    Q_EMIT domainChanged();
+}
+
+void UbuntuI18n::setDomain(const QString &domain) {
+    if (m_domain == domain)
+        return;
+
+    m_domain = domain;
+    C::textdomain(domain.toUtf8());
+    /*
+     The default is /usr/share/locale if we don't set a folder
+     For click we use APP_DIR/share/locale
+     e.g. /usr/share/click/preinstalled/com.example.foo/current/share/locale
+     */
+    QString appDir = QString::fromLocal8Bit(getenv("APP_DIR"));
+    if (!QDir::isAbsolutePath (appDir)) {
+        appDir = QStringLiteral("/usr");
+    }
+    QString localePath(QDir(appDir).filePath(QStringLiteral("share/locale")));
+    C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
+    Q_EMIT domainChanged();
+}
+
+void UbuntuI18n::setLanguage(const QString &lang) {
+    if (m_language == lang)
+        return;
+
+    m_language = lang;
+
+    /*
+     This is needed for LP: #1263163.
+
+     LANGUAGE may be set to one or more languages for example "fi" or
+     "sv:de". gettext prioritizes LANGUAGE over LC_ALL, LC_*, and
+     LANG, so if the session has already set LANGUAGE, calls to
+     gettext will only use that.  We must override it here so that
+     future calls to gettext are done in the new language.
+
+     This only affects the current process. It does not override the
+     user's session LANGUAGE.
+     */
+    setenv("LANGUAGE", lang.toUtf8().constData(), 1);
+
+    /*
+     The inverse form of setlocale as used in the constructor, passing
+     a valid locale string updates all category type defaults.
+     */
+    setlocale(LC_ALL, lang.toUtf8());
+    Q_EMIT languageChanged();
+}
+
+/*!
+ * \qmlmethod string i18n::tr(string text)
+ * Translate \a text using gettext and return the translation.
+ */
+QString UbuntuI18n::tr(const QString& text)
+{
+    return QString::fromUtf8(C::gettext(text.toUtf8()));
+}
+
+/*!
+ * \qmlmethod string i18n::tr(string singular, string plural, int n)
+ * Translate the given input string \a singular or \a plural (depending on the number of items \a n)
+ * using gettext.
+ * Note that tr() does not automatically insert the values in the QString,
+ * so it should be called like this:
+ *          tr("%1 file", "%1 files", count).arg(count)
+ */
+QString UbuntuI18n::tr(const QString &singular, const QString &plural, int n)
+{
+    return QString::fromUtf8(C::ngettext(singular.toUtf8(), plural.toUtf8(), n));
+}
+
+/*!
+ * \qmlmethod string i18n::dtr(string domain, string text)
+ * Translate \a text using gettext. Uses the specified domain \a domain instead of i18n.domain.
+ */
+QString UbuntuI18n::dtr(const QString& domain, const QString& text)
+{
+    if (domain.isNull()) {
+        return QString::fromUtf8(C::dgettext(NULL, text.toUtf8()));
+    } else {
+        return QString::fromUtf8(C::dgettext(domain.toUtf8(), text.toUtf8()));
+    }
+}
+
+/*!
+ * \qmlmethod string i18n::dtr(string domain, string singular, string plural, int n)
+ * Translate the given text using gettext. Should be called like this:
+ *          tr(domain, "%1 file", "%1 files", count).arg(count)
+ * Uses \a domain for the domain instead of i18n.domain, and \a singular or \a plural
+ * as input for the translation depending on the number of items \a n.
+ */
+QString UbuntuI18n::dtr(const QString& domain, const QString& singular, const QString& plural, int n)
+{
+    if (domain.isNull()) {
+        return QString::fromUtf8(C::dngettext(NULL, singular.toUtf8(), plural.toUtf8(), n));
+    } else {
+        return QString::fromUtf8(C::dngettext(domain.toUtf8(), singular.toUtf8(), plural.toUtf8(), n));
+    }
+}
+
+/*!
+ * \qmlmethod string i18n::ctr(string context, string text)
+ * Translate \a text using gettext and return the translation.
+ * \a context is only visible to the translator and helps disambiguating for very short texts
+ */
+QString UbuntuI18n::ctr(const QString& context, const QString& text)
+{
+    return dctr(QString(), context, text);
+}
+
+/*!
+ * \qmlmethod string i18n::dctr(string domain, string context, string text)
+ * Translate \a text using gettext. Uses the specified domain \a domain instead of i18n.domain.
+ * \a context is only visible to the translator and helps disambiguating for very short texts
+ */
+QString UbuntuI18n::dctr(const QString& domain, const QString& context, const QString& text)
+{
+    if (domain.isNull()) {
+        return QString::fromUtf8(C::g_dpgettext2(NULL, context.toUtf8(), text.toUtf8()));
+    } else {
+        return QString::fromUtf8(C::g_dpgettext2(domain.toUtf8(), context.toUtf8(), text.toUtf8()));
+    }
+}
+
+/*!
+ * \qmlmethod string i18n::tag(string text)
+ * Mark \a text for translation at a later point. Typically this allows an API
+ * to take the original string and pass it to dtr (or dgettext).
+ *
+ * \qml
+ * import QtQuick 2.4
+ * import UserMetrics 0.1
+ *
+ * Metric {
+ *     name: "distance"
+ *     format: i18n.tag("Distance covered today: %1 km")
+ *     emptyFormat: i18n.tag("No running today")
+ *     domain: "runner.forest"
+ * }
+ * \endqml
+ *
+ * The strings tagged for localzation above are passed to the implementation
+ * of UserMetrics verbatim, as well as the domain of the app. Display and
+ * translation of the strings will happen in the lockscreen, where the same
+ * strings will be passed to i18n.tr.
+ */
+QString UbuntuI18n::tag(const QString& text)
+{
+    return text;
+}
+
+/*!
+ * \qmlmethod string i18n::tag(string context, string text)
+ * Mark \a text for translation at a later point. Typically this allows an API
+ * to take the original string and pass it to dctr (or g_dpgettext2).
+ * \a context is only visible to the translator and helps disambiguating for very short texts
+ */
+QString UbuntuI18n::tag(const QString& context, const QString& text)
+{
+    Q_UNUSED(context);
+    return text;
+}
+/*!
+ * \qmlmethod string i18n::relativeDateTime(datetime dateTime)
+ * Translate a datetime based on proximity to current time.
+ */
+QString UbuntuI18n::relativeDateTime(const QDateTime& datetime)
+{
+    static const QString ubuntuUiToolkit = QStringLiteral("ubuntu-ui-toolkit");
+
+    QDateTime relativeTo(QDateTime::currentDateTime());
+    const date_proximity_t prox = getDateProximity(relativeTo, datetime);
+
+    switch (prox)  {
+        case DATE_PROXIMITY_NOW:
+            /* TRANSLATORS: Time based "this is happening/happened now" */
+            return dtr(ubuntuUiToolkit, QStringLiteral("Now"));
+
+        case DATE_PROXIMITY_HOUR:
+        {
+            qint64 diff = datetime.toMSecsSinceEpoch() - relativeTo.toMSecsSinceEpoch();
+            qint64 minutes = qRound(float(diff) / 60000);
+            if (minutes < 0) {
+                return dtr(ubuntuUiToolkit, QStringLiteral("%1 minute ago"),
+                           QStringLiteral("%1 minutes ago"), qAbs(minutes)).arg(qAbs(minutes));
+            }
+            return dtr(ubuntuUiToolkit, QStringLiteral("%1 minute"),
+                       QStringLiteral("%1 minutes"), minutes).arg(minutes);
+        }
+
+        case DATE_PROXIMITY_TODAY:
+            /* en_US example: "1:00 PM" */
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("HH:mm")));
+
+        case DATE_PROXIMITY_YESTERDAY:
+            /* en_US example: "Yesterday  13:00" */
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("'Yesterday\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("'Yesterday\u2003'HH:mm")));
+
+        case DATE_PROXIMITY_TOMORROW:
+            /* en_US example: "Tomorrow  1:00 PM" */
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("'Tomorrow\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("'Tomorrow\u2003'HH:mm")));
+
+        case DATE_PROXIMITY_LAST_WEEK:
+        case DATE_PROXIMITY_NEXT_WEEK:
+            /* en_US example: "Fri  1:00 PM" */
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("ddd'\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("ddd'\u2003'HH:mm")));
+
+        case DATE_PROXIMITY_FAR_BACK:
+        case DATE_PROXIMITY_FAR_FORWARD:
+        default:
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("ddd d MMM'\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("ddd d MMM'\u2003'HH:mm")));
+    }
+    return datetime.toString(Qt::DefaultLocaleShortDate);
+}
+
+UT_NAMESPACE_END