Merge lp:~aacid/ubuntu-ui-toolkit/i18n-RelativeDateTime into lp:ubuntu-ui-toolkit/staging

[Albert Astals Cid]

Added relative date time i18n

Added relative date time i18n

[lp:~aacid/ubuntu-ui-toolkit/i18n-RelativeDateTime]

1608. By Nick Dedekind on 2015-08-12

i18n.relativeDateTime

1609. By Nick Dedekind on 2015-08-12

review comments

1610. By Nick Dedekind on 2015-08-12

split relative time i18n

1611. By Nick Dedekind on 2015-08-12

split relative time i18n from localizedApp

[Albert Astals Cid (aacid)]

It's just a re-merged version of https://code.launchpad.net/~nick-dedekind/ubuntu-ui-toolkit/i18n-RelativeDateTime/+merge/265282

[Zsombor Egri (zsombi)]

This one too.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1213
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/847
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/849
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/849/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/846

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2119/rebuild

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

One small optimization comment

review: Needs Fixing (code-review)

=== modified file 'components.api'
--- components.api	2015-08-12 10:11:43 +0000
+++ components.api	2015-08-12 10:11:44 +0000
@@ -1405,3 +1405,4 @@
     function string dctr(string domain, string context, string text)
     function string tag(string text)
     function string tag(string context, string text)
+    function string relativeDateTime(QDateTime datetime)
 
=== modified file 'src/Ubuntu/Components/plugin/i18n.cpp'
--- src/Ubuntu/Components/plugin/i18n.cpp	2015-03-03 13:47:48 +0000
+++ src/Ubuntu/Components/plugin/i18n.cpp	2015-08-12 10:11:44 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "i18n.h"
+#include "timeutils_p.h"
 #include <QtCore/QDir>
 
 namespace C {
@@ -252,3 +253,76 @@
     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)
+{
+    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("ubuntu-ui-toolkit", "Now");
+
+        case DATE_PROXIMITY_HOUR:
+        {
+            qint64 diff = datetime.toMSecsSinceEpoch() - relativeTo.toMSecsSinceEpoch();
+            qint64 minutes = qRound(float(diff) / 60000);
+            if (minutes < 0) {
+                return dtr("ubuntu-ui-toolkit", "%1 minute ago", "%1 minutes ago", qAbs(minutes)).arg(qAbs(minutes));
+            }
+            return dtr("ubuntu-ui-toolkit", "%1 minute", "%1 minutes", minutes).arg(minutes);
+        }
+
+        case DATE_PROXIMITY_TODAY:
+            /* en_US example: "1:00 PM" */
+            /* TRANSLATORS: Please translated 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("ubuntu-ui-toolkit", "h:mm ap"):
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                                                     dtr("ubuntu-ui-toolkit", "HH:mm"));
+
+        case DATE_PROXIMITY_YESTERDAY:
+            /* en_US example: "Yesterday  13:00" */
+            /* TRANSLATORS: Please translated 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("ubuntu-ui-toolkit", "'Yesterday\u2003'h:mm ap") :
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                                                     dtr("ubuntu-ui-toolkit", "'Yesterday\u2003'HH:mm"));
+
+        case DATE_PROXIMITY_TOMORROW:
+            /* en_US example: "Tomorrow  1:00 PM" */
+            /* TRANSLATORS: Please translated 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("ubuntu-ui-toolkit", "'Tomorrow\u2003'h:mm ap") :
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                                                     dtr("ubuntu-ui-toolkit", "'Tomorrow\u2003'HH:mm"));
+
+        case DATE_PROXIMITY_LAST_WEEK:
+        case DATE_PROXIMITY_NEXT_WEEK:
+            /* en_US example: "Fri  1:00 PM" */
+            /* TRANSLATORS: Please translated 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("ubuntu-ui-toolkit", "ddd'\u2003'h:mm ap") :
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                                                     dtr("ubuntu-ui-toolkit", "ddd'\u2003'HH:mm"));
+
+        case DATE_PROXIMITY_FAR_BACK:
+        case DATE_PROXIMITY_FAR_FORWARD:
+        default:
+            /* TRANSLATORS: Please translated 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("ubuntu-ui-toolkit", "ddd d MMM'\u2003'h:mm ap") :
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                                                     dtr("ubuntu-ui-toolkit", "ddd d MMM'\u2003'HH:mm"));
+    }
+    return datetime.toString(Qt::DefaultLocaleShortDate);
+}
 
=== modified file 'src/Ubuntu/Components/plugin/i18n.h'
--- src/Ubuntu/Components/plugin/i18n.h	2015-02-03 18:11:32 +0000
+++ src/Ubuntu/Components/plugin/i18n.h	2015-08-12 10:11:44 +0000
@@ -50,6 +50,7 @@
     Q_INVOKABLE QString dctr(const QString& domain, const QString& context, const QString& text);
     Q_INVOKABLE QString tag(const QString& text);
     Q_INVOKABLE QString tag(const QString& context, const QString& text);
+    Q_INVOKABLE QString relativeDateTime(const QDateTime& datetime);
 
     // getter
     QString domain() const;
 
=== modified file 'src/Ubuntu/Components/plugin/timeutils_p.h'
--- src/Ubuntu/Components/plugin/timeutils_p.h	2015-08-12 10:11:43 +0000
+++ src/Ubuntu/Components/plugin/timeutils_p.h	2015-08-12 10:11:44 +0000
@@ -20,9 +20,33 @@
 #include "livetimer.h"
 
 #include <QDateTime>
+#include <QLocale>
 #include <QObject>
 #include <QTimer>
 
+/* Check the system locale setting to see if the format is 24-hour
+  time or 12-hour time */
+inline bool isLocale12h(void)
+{
+   QString strTimeFormat = QLocale::system().timeFormat();
+   QStringList includes; includes << "AP"; includes << "ap";
+   QStringList excludes; excludes << "H"; excludes << "HH";
+
+   Q_FOREACH(const QString& exclude, excludes) {
+       if (strTimeFormat.contains(exclude)) {
+           return false;
+       }
+   }
+
+   Q_FOREACH(const QString& include, includes) {
+       if (strTimeFormat.contains(include)) {
+           return true;
+       }
+   }
+
+   return false;
+}
+
 typedef enum
 {
    DATE_PROXIMITY_NOW,
 
=== modified file 'tests/unit/tst_i18n/tst_i18n.pro'
--- tests/unit/tst_i18n/tst_i18n.pro	2015-05-18 09:53:55 +0000
+++ tests/unit/tst_i18n/tst_i18n.pro	2015-08-12 10:11:44 +0000
@@ -1,18 +1,3 @@
-include(../test-include.pri)
-QT += gui
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
-
-DOMAIN = localizedApp
-mo.target = mo
-mo.commands = set -e;
-mo.commands += echo Generating localization for $$DOMAIN;
-mo.commands += mkdir -p $${DOMAIN}/share/locale/en/LC_MESSAGES;
-mo.commands += msgfmt $$PWD/po/en_US.po -o $${DOMAIN}/share/locale/en/LC_MESSAGES/$${DOMAIN}.mo;
-QMAKE_EXTRA_TARGETS += mo
-PRE_TARGETDEPS += mo
-
-SOURCES += \
-    src/tst_i18n.cpp
-
-OTHER_FILES += \
-    src/LocalizedApp.qml
+TEMPLATE = subdirs
+SUBDIRS += tst_i18n_LocalizedApp
+SUBDIRS += tst_i18n_RelativeTime
 
=== added directory 'tests/unit/tst_i18n/tst_i18n_LocalizedApp'
=== added file 'tests/unit/tst_i18n/tst_i18n_LocalizedApp.o'
 Binary files tests/unit/tst_i18n/tst_i18n_LocalizedApp.o	1970-01-01 00:00:00 +0000 and tests/unit/tst_i18n/tst_i18n_LocalizedApp.o	2015-08-12 10:11:44 +0000 differ
=== renamed directory 'tests/unit/tst_i18n/localizedApp' => 'tests/unit/tst_i18n/tst_i18n_LocalizedApp/localizedApp'
=== renamed directory 'tests/unit/tst_i18n/po' => 'tests/unit/tst_i18n/tst_i18n_LocalizedApp/po'
=== renamed directory 'tests/unit/tst_i18n/src' => 'tests/unit/tst_i18n/tst_i18n_LocalizedApp/src'
=== modified file 'tests/unit/tst_i18n/tst_i18n_LocalizedApp/src/LocalizedApp.qml'
--- tests/unit/tst_i18n/src/LocalizedApp.qml	2015-03-03 13:20:06 +0000
+++ tests/unit/tst_i18n/tst_i18n_LocalizedApp/src/LocalizedApp.qml	2015-08-12 10:11:44 +0000
@@ -28,7 +28,7 @@
         Button {
             id: button
             objectName: 'button'
-            anchors.centerIn: parent
+            anchors.horizontalCenter: parent.horizontalCenter
             text: i18n.tr('Count the kilometres')
             width: units.gu(15)
         }
@@ -60,5 +60,47 @@
             anchors.horizontalCenter: all2.horizontalCenter
             text: i18n.tag('All Cats', 'All')
         }
+        Label {
+            id: timeNow
+            objectName: 'timeNow'
+            anchors.top: all3.bottom
+            anchors.horizontalCenter: all3.horizontalCenter
+            text: i18n.relativeDateTime(new Date())
+        }
+        Label {
+            id: timeMinuteBefore
+            objectName: 'timeMinuteBefore'
+            anchors.top: timeNow.bottom
+            anchors.horizontalCenter: timeNow.horizontalCenter
+            text: i18n.relativeDateTime(new Date(new Date().getTime() - 60000))
+        }
+        Label {
+            id: timeMinuteAfter
+            objectName: 'timeMinuteAfter'
+            anchors.top: timeMinuteBefore.bottom
+            anchors.horizontalCenter: timeMinuteBefore.horizontalCenter
+            text: i18n.relativeDateTime(new Date(new Date().getTime() + 60000))
+        }
+        Label {
+            id: tenMinutesBefore
+            objectName: 'tenMinutesBefore'
+            anchors.top: timeMinuteAfter.bottom
+            anchors.horizontalCenter: timeMinuteAfter.horizontalCenter
+            text: i18n.relativeDateTime(new Date(new Date().getTime() - 600000))
+        }
+        Label {
+            id: tenMinutesAfter
+            objectName: 'tenMinutesAfter'
+            anchors.top: tenMinutesBefore.bottom
+            anchors.horizontalCenter: tenMinutesBefore.horizontalCenter
+            text: i18n.relativeDateTime(new Date(new Date().getTime() + 600000))
+        }
+        Label {
+            id: timeFarAway
+            objectName: 'timeFarAway'
+            anchors.top: tenMinutesAfter.bottom
+            anchors.horizontalCenter: tenMinutesAfter.horizontalCenter
+            text: i18n.relativeDateTime(new Date(2000, 0, 1, 0, 0, 0, 0))
+        }
     }
 }
 
=== renamed file 'tests/unit/tst_i18n/src/tst_i18n.cpp' => 'tests/unit/tst_i18n/tst_i18n_LocalizedApp/src/tst_i18n_LocalizedApp.cpp'
--- tests/unit/tst_i18n/src/tst_i18n.cpp	2015-02-03 18:11:32 +0000
+++ tests/unit/tst_i18n/tst_i18n_LocalizedApp/src/tst_i18n_LocalizedApp.cpp	2015-08-12 10:11:44 +0000
@@ -39,7 +39,7 @@
 #include "ucunits.h"
 #include "i18n.h"
 
-class tst_I18n : public QObject
+class tst_I18n_LocalizedApp : public QObject
 {
     Q_OBJECT
 
@@ -47,7 +47,7 @@
     QQuickView *view;
 
 public:
-    tst_I18n() :
+    tst_I18n_LocalizedApp() :
         view(0)
     {
     }
@@ -191,7 +191,7 @@
     }
 };
 
-// The C++ equivalent of QTEST_MAIN(tst_I18n) with added initialization
+// The C++ equivalent of QTEST_MAIN(tst_I18n_LocalizedApp) with added initialization
 int main(int argc, char *argv[])
 {
     // LC_ALL would fail the test case; it must be unset before execution
@@ -199,8 +199,8 @@
 
     QGuiApplication app(argc, argv);
     app.setAttribute(Qt::AA_Use96Dpi, true);
-    tst_I18n* testObject = new tst_I18n();
+    tst_I18n_LocalizedApp* testObject = new tst_I18n_LocalizedApp();
     return QTest::qExec(static_cast<QObject*>(testObject), argc, argv);
 }
 
-#include "tst_i18n.moc"
+#include "tst_i18n_LocalizedApp.moc"
 
=== added file 'tests/unit/tst_i18n/tst_i18n_LocalizedApp/tst_i18n_LocalizedApp.pro'
--- tests/unit/tst_i18n/tst_i18n_LocalizedApp/tst_i18n_LocalizedApp.pro	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_i18n/tst_i18n_LocalizedApp/tst_i18n_LocalizedApp.pro	2015-08-12 10:11:44 +0000
@@ -0,0 +1,17 @@
+include(../../test-include.pri)
+QT += gui
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+DOMAIN = localizedApp
+mo.target = mo
+mo.commands = set -e;
+mo.commands += echo Generating localization;
+mo.commands += msgfmt po/en_US.po -o $${DOMAIN}/share/locale/en/LC_MESSAGES/$${DOMAIN}.mo;
+QMAKE_EXTRA_TARGETS += mo
+PRE_TARGETDEPS += mo
+
+SOURCES += \
+    src/tst_i18n_LocalizedApp.cpp
+
+OTHER_FILES += \
+    src/LocalizedApp.qml
 
=== added directory 'tests/unit/tst_i18n/tst_i18n_RelativeTime'
=== added file 'tests/unit/tst_i18n/tst_i18n_RelativeTime.o'
 Binary files tests/unit/tst_i18n/tst_i18n_RelativeTime.o	1970-01-01 00:00:00 +0000 and tests/unit/tst_i18n/tst_i18n_RelativeTime.o	2015-08-12 10:11:44 +0000 differ
=== added directory 'tests/unit/tst_i18n/tst_i18n_RelativeTime/po'
=== added file 'tests/unit/tst_i18n/tst_i18n_RelativeTime/po/en_US.po'
--- tests/unit/tst_i18n/tst_i18n_RelativeTime/po/en_US.po	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_i18n/tst_i18n_RelativeTime/po/en_US.po	2015-08-12 10:11:44 +0000
@@ -0,0 +1,54 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Christian Dywan <[e-mail]>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Now"
+msgstr "tr:Now"
+
+msgid "%1 minute ago"
+msgid_plural "%1 minutes ago"
+msgstr[0] "tr:%1 minute ago"
+msgstr[1] "tr:%1 minutes ago"
+
+msgid "%1 minute"
+msgid_plural "%1 minutes"
+msgstr[0] "tr:%1 minute"
+msgstr[1] "tr:%1 minutes"
+
+msgid "h:mm ap"
+msgstr "'tr:'h:mm ap"
+
+msgid "HH:mm"
+msgstr "'tr:'HH:mm"
+
+msgid "'Yesterday 'h:mm ap"
+msgstr "'tr:Yesterday 'h:mm ap"
+
+msgid "'Yesterday 'HH:mm"
+msgstr "'tr:Yesterday 'HH:mm"
+
+msgid "'Tomorrow 'h:mm ap"
+msgstr "'tr:Tomorrow 'h:mm ap"
+
+msgid "'Tomorrow 'HH:mm"
+msgstr "'tr:Tomorrow 'HH:mm"
+
+msgid "ddd' 'h:mm ap"
+msgstr "'tr:'ddd' 'h:mm ap"
+
+msgid "ddd' 'HH:mm"
+msgstr "'tr:'ddd' 'HH:mm"
+
+msgid "ddd d MMM' 'h:mm ap"
+msgstr "'tr:FarAway'"
+
+msgid "ddd d MMM' 'HH:mm"
+msgstr "'tr:FarAway'"
 
=== added directory 'tests/unit/tst_i18n/tst_i18n_RelativeTime/src'
=== added file 'tests/unit/tst_i18n/tst_i18n_RelativeTime/src/RelativeTime.qml'
--- tests/unit/tst_i18n/tst_i18n_RelativeTime/src/RelativeTime.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_i18n/tst_i18n_RelativeTime/src/RelativeTime.qml	2015-08-12 10:11:44 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2013 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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    applicationName: "ubuntu-ui-toolkit"
+
+    Page {
+        objectName: 'page'
+
+        Label {
+            id: timeNow
+            objectName: 'timeNow'
+            anchors.top: parent.top
+            anchors.horizontalCenter: parent.horizontalCenter
+            text: i18n.relativeDateTime(new Date())
+        }
+        Label {
+            id: timeMinuteBefore
+            objectName: 'timeMinuteBefore'
+            anchors.top: timeNow.bottom
+            anchors.horizontalCenter: timeNow.horizontalCenter
+            text: i18n.relativeDateTime(new Date(new Date().getTime() - 60000))
+        }
+        Label {
+            id: timeMinuteAfter
+            objectName: 'timeMinuteAfter'
+            anchors.top: timeMinuteBefore.bottom
+            anchors.horizontalCenter: timeMinuteBefore.horizontalCenter
+            text: i18n.relativeDateTime(new Date(new Date().getTime() + 60000))
+        }
+        Label {
+            id: tenMinutesBefore
+            objectName: 'tenMinutesBefore'
+            anchors.top: timeMinuteAfter.bottom
+            anchors.horizontalCenter: timeMinuteAfter.horizontalCenter
+            text: i18n.relativeDateTime(new Date(new Date().getTime() - 600000))
+        }
+        Label {
+            id: tenMinutesAfter
+            objectName: 'tenMinutesAfter'
+            anchors.top: tenMinutesBefore.bottom
+            anchors.horizontalCenter: tenMinutesBefore.horizontalCenter
+            text: i18n.relativeDateTime(new Date(new Date().getTime() + 600000))
+        }
+        Label {
+            id: timeFarAway
+            objectName: 'timeFarAway'
+            anchors.top: tenMinutesAfter.bottom
+            anchors.horizontalCenter: tenMinutesAfter.horizontalCenter
+            text: i18n.relativeDateTime(new Date(2000, 0, 1, 0, 0, 0, 0))
+        }
+    }
+}
 
=== added file 'tests/unit/tst_i18n/tst_i18n_RelativeTime/src/tst_i18n_RelativeTime.cpp'
--- tests/unit/tst_i18n/tst_i18n_RelativeTime/src/tst_i18n_RelativeTime.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_i18n/tst_i18n_RelativeTime/src/tst_i18n_RelativeTime.cpp	2015-08-12 10:11:44 +0000
@@ -0,0 +1,202 @@
+
+/*
+ * Copyright 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: Nick Dedekind <[e-mail]>
+ */
+
+#include <QtCore/QString>
+#include <QtCore/QTextCodec>
+#include <QtCore/QStandardPaths>
+#include <QtCore/QDir>
+#include <QtCore/QProcessEnvironment>
+#include <QtTest/QTest>
+#include <QtTest/QSignalSpy>
+#include <QtCore/QCoreApplication>
+#include <QtQml/QQmlEngine>
+#include <QtQuick/QQuickView>
+#include <QtQuick/QQuickItem>
+#include <QtCore/QThread>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+#include <QtTest/qtest_gui.h>
+
+namespace C {
+#include <libintl.h>
+}
+
+#include "ucunits.h"
+#include "i18n.h"
+
+class tst_I18n_RelativeTime : public QObject
+{
+    Q_OBJECT
+
+private:
+    QQuickView *view;
+
+public:
+    tst_I18n_RelativeTime() :
+        view(0)
+    {
+    }
+
+    QQuickItem *loadTest(const QString &document)
+    {
+        // load the document
+        view->setSource(QUrl::fromLocalFile(document));
+        QTest::waitForEvents();
+
+        return view->rootObject();
+    }
+
+    QQuickItem *testItem(QQuickItem *that, const QString &identifier)
+    {
+        if (that->property(identifier.toLocal8Bit()).isValid())
+            return that->property(identifier.toLocal8Bit()).value<QQuickItem*>();
+
+        QList<QQuickItem*> children = that->findChildren<QQuickItem*>(identifier);
+        return (children.count() > 0) ? children[0] : 0;
+    }
+
+private Q_SLOTS:
+
+    void initTestCase()
+    {
+        // Set test locale folder in the environment
+        // Using setenv because QProcessEnvironment ignores changes
+        QString testAppDir(QDir::currentPath() + "/ubuntu-ui-toolkit");
+        setenv("APP_DIR", testAppDir.toUtf8(), 1);
+
+        // Verify that we set it correctly
+        QVERIFY(QFileInfo(testAppDir + "/share/locale/en/LC_MESSAGES/ubuntu-ui-toolkit.mo").exists());
+
+        QString modules(UBUNTU_QML_IMPORT_PATH);
+        QVERIFY(QDir(modules).exists());
+
+        view = new QQuickView;
+        QQmlEngine *quickEngine = view->engine();
+
+        view->setGeometry(0,0, UCUnits::instance().gu(40), UCUnits::instance().gu(30));
+        //add modules folder so we have access to the plugin from QML
+        QStringList imports = quickEngine->importPathList();
+        imports.prepend(QDir(modules).absolutePath());
+        quickEngine->setImportPathList(imports);
+    }
+
+    void cleanupTestCase()
+    {
+        delete view;
+    }
+
+    void testCase_RelativeTime()
+    {
+        UbuntuI18n* i18n = &UbuntuI18n::instance();
+        // By default no domain is set
+        QCOMPARE(i18n->domain(), QString(""));
+
+        // Start out with no localization
+        i18n->setLanguage("C");
+        // Load the app which should pick up the locale we prepared
+        QQuickItem *root = loadTest("src/RelativeTime.qml");
+        QVERIFY(root);
+        QQuickItem *mainView = root;
+
+        // There no translation happens
+        QQuickItem* page(testItem(mainView, "page"));
+        QVERIFY(page);
+
+        QQuickItem* timeFarAway(testItem(page, "timeFarAway"));
+        QVERIFY(timeFarAway);
+        QCOMPARE(timeFarAway->property("text").toString(),
+                 QDateTime(QDate(2000,1,1), QTime(0,0,0,0)).toString("ddd d MMM'\u2003'HH:mm"));
+        QQuickItem* timeNow(testItem(page, "timeNow"));
+        QVERIFY(timeNow);
+        QCOMPARE(timeNow->property("text").toString(), QString("Now"));
+        QQuickItem* timeMinuteBefore(testItem(page, "timeMinuteBefore"));
+        QVERIFY(timeMinuteBefore);
+        QCOMPARE(timeMinuteBefore->property("text").toString(), QString("1 minute ago"));
+        QQuickItem* timeMinuteAfter(testItem(page, "timeMinuteAfter"));
+        QVERIFY(timeMinuteAfter);
+        QCOMPARE(timeMinuteAfter->property("text").toString(), QString("1 minute"));
+        QQuickItem* tenMinutesBefore(testItem(page, "tenMinutesBefore"));
+        QVERIFY(tenMinutesBefore);
+        QCOMPARE(tenMinutesBefore->property("text").toString(), QString("10 minutes ago"));
+        QQuickItem* tenMinutesAfter(testItem(page, "tenMinutesAfter"));
+        QVERIFY(tenMinutesAfter);
+        QCOMPARE(tenMinutesAfter->property("text").toString(), QString("10 minutes"));
+
+        // There no translation happens in C++ either
+        QCOMPARE(i18n->relativeDateTime(QDateTime::currentDateTime()), QString("Now"));
+        QCOMPARE(i18n->relativeDateTime(QDateTime(QDate(2000,1,1), QTime(0,0,0,0))),
+                 QDateTime(QDate(2000,1,1), QTime(0,0,0,0)).toString("ddd d MMM'\u2003'HH:mm"));
+        QCOMPARE(i18n->relativeDateTime(QDateTime::currentDateTime().addSecs(-60)), QString("1 minute ago"));
+        QCOMPARE(i18n->relativeDateTime(QDateTime::currentDateTime().addSecs(60)), QString("1 minute"));
+        QCOMPARE(i18n->relativeDateTime(QDateTime::currentDateTime().addSecs(-600)), QString("10 minutes ago"));
+        QCOMPARE(i18n->relativeDateTime(QDateTime::currentDateTime().addSecs(600)), QString("10 minutes"));
+
+        // Was the locale folder detected and set?
+        QString boundDomain(C::bindtextdomain(i18n->domain().toUtf8(), ((const char*)0)));
+        QString testAppDir(QDir::currentPath() + "/ubuntu-ui-toolkit");
+        QString expectedLocalePath(QDir(testAppDir).filePath("share/locale"));
+        QCOMPARE(boundDomain, expectedLocalePath);
+        // Is the domain gettext uses correct?
+        QString gettextDomain(C::textdomain(((const char*)0)));
+        QCOMPARE(gettextDomain, i18n->domain());
+        // Is the compiled en_US message catalog in the right location?
+        QString messageCatalog(boundDomain + "/en/LC_MESSAGES/ubuntu-ui-toolkit.mo");
+        QVERIFY(QFileInfo(messageCatalog).exists());
+
+        // Check if system has en_US locale, otherwise gettext won't work
+        QProcess localeA;
+        localeA.start("locale -a");
+        QVERIFY(localeA.waitForFinished());
+        QVERIFY(QString(localeA.readAll()).split("\n").contains("en_US.utf8"));
+
+        i18n->setLanguage("en_US.utf8");
+        QSignalSpy spy(i18n, SIGNAL(languageChanged()));
+        spy.wait();
+
+        // Inspect translated strings in QML
+        QCOMPARE(timeNow->property("text").toString(), QString("tr:Now"));
+        QCOMPARE(timeMinuteBefore->property("text").toString(), QString("tr:1 minute ago"));
+        QCOMPARE(timeMinuteAfter->property("text").toString(), QString("tr:1 minute"));
+        QCOMPARE(tenMinutesBefore->property("text").toString(), QString("tr:10 minutes ago"));
+        QCOMPARE(tenMinutesAfter->property("text").toString(), QString("tr:10 minutes"));
+        QCOMPARE(timeFarAway->property("text").toString(), QString("tr:FarAway"));
+
+        // Translate in C++
+        QCOMPARE(i18n->relativeDateTime(QDateTime::currentDateTime()), QString("tr:Now"));
+        QCOMPARE(i18n->relativeDateTime(QDateTime(QDate(2000,1,1), QTime(0,0,0,0))),  QString("tr:FarAway"));
+        QCOMPARE(i18n->relativeDateTime(QDateTime::currentDateTime().addSecs(-60)), QString("tr:1 minute ago"));
+        QCOMPARE(i18n->relativeDateTime(QDateTime::currentDateTime().addSecs(60)), QString("tr:1 minute"));
+        QCOMPARE(i18n->relativeDateTime(QDateTime::currentDateTime().addSecs(-600)), QString("tr:10 minutes ago"));
+        QCOMPARE(i18n->relativeDateTime(QDateTime::currentDateTime().addSecs(600)), QString("tr:10 minutes"));
+    }
+};
+
+// The C++ equivalent of QTEST_MAIN(tst_I18n_RelativeTime) with added initialization
+int main(int argc, char *argv[])
+{
+    // LC_ALL would fail the test case; it must be unset before execution
+    unsetenv("LC_ALL");
+
+    QGuiApplication app(argc, argv);
+    app.setAttribute(Qt::AA_Use96Dpi, true);
+    tst_I18n_RelativeTime* testObject = new tst_I18n_RelativeTime();
+    return QTest::qExec(static_cast<QObject*>(testObject), argc, argv);
+}
+
+#include "tst_i18n_RelativeTime.moc"
 
=== added file 'tests/unit/tst_i18n/tst_i18n_RelativeTime/tst_i18n_RelativeTime.pro'
--- tests/unit/tst_i18n/tst_i18n_RelativeTime/tst_i18n_RelativeTime.pro	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_i18n/tst_i18n_RelativeTime/tst_i18n_RelativeTime.pro	2015-08-12 10:11:44 +0000
@@ -0,0 +1,17 @@
+include(../../test-include.pri)
+QT += gui
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+DOMAIN = ubuntu-ui-toolkit
+mo.target = mo
+mo.commands = set -e;
+mo.commands += echo Generating localization;
+mo.commands += msgfmt po/en_US.po -o $${DOMAIN}/share/locale/en/LC_MESSAGES/$${DOMAIN}.mo;
+QMAKE_EXTRA_TARGETS += mo
+PRE_TARGETDEPS += mo
+
+SOURCES += \
+    src/tst_i18n_RelativeTime.cpp
+
+OTHER_FILES += \
+    src/RelativeTime.qml
 
=== added directory 'tests/unit/tst_i18n/tst_i18n_RelativeTime/ubuntu-ui-toolkit'
=== added directory 'tests/unit/tst_i18n/tst_i18n_RelativeTime/ubuntu-ui-toolkit/share'
=== added directory 'tests/unit/tst_i18n/tst_i18n_RelativeTime/ubuntu-ui-toolkit/share/locale'
=== added directory 'tests/unit/tst_i18n/tst_i18n_RelativeTime/ubuntu-ui-toolkit/share/locale/en'
=== added directory 'tests/unit/tst_i18n/tst_i18n_RelativeTime/ubuntu-ui-toolkit/share/locale/en/LC_MESSAGES'