Merge lp:~nick-dedekind/ubuntu-ui-toolkit/lp1378821.time-translation into lp:ubuntu-ui-toolkit

[Nick Dedekind]

Move the time formatter to SDK.

Move the time formatter to SDK.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1119
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2183/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/778/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/384/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/776/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/390/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2183/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

You need to update the .api file here.

[Zoltan Balogh (bzoltan)]

Please re-target the MR to the rtm or the staging branch.

review: Needs Fixing

[Cris Dywan (kalikiana)]

First and foremost, let's have an API proposal for this. Adding new API to the UITK means it will stay for a few years and if we just drop code like this we get in trouble (thumbnailer anyone?).

Second, we already have i18n for localization features. It seems to me like we'd want to extend that instead of a whole new component.

Third, how urgent is this? Who's using this aside from Unity? API should only be added to UITK if it's useful for several apps, otherwise there's little benefit and we still pay the cost of maintenance.

review: Needs Fixing

[Albert Astals Cid (aacid)]

Are you telling me you can't really see the use case for this in multiple apps? Phone? Calendar? Email?

[Michał Sawicz (saviq)]

FWIW, see the linked spec for use cases for this:

https://blueprints.launchpad.net/ubuntu-ui-toolkit/+spec/time-formatter

[Cris Dywan (kalikiana)]

Albert, when I asked in IRC I was told Unity was the only currently known use case. It's not about whether I can envision use cases but we need to know who will use the API so that we know if it actually solves the problem.

Thanks for the blueprint!
The point "Timestamps displayed differently depending on the available space" needs clarification. Is this explicitly to be done by the application or part of the formatter?

Please extend API proposal 1 https://docs.google.com/a/canonical.com/document/d/1qDcfbu9aAj7uU9qzjXCOJn8zGexBnXwZCgO8pLDsO5M/edit# to incorporate the relative time formatter. This makes more sense to Tim and I than an entierely new component which only has one feature. I imagine it could be as simple as i18n.relativeTime(timestamp) and i18n.absoluteTime(timestamp) - the unit test don't currently cover the latter but the spec lists it as a use case.
A short brainstorming meeting might be helpful, if you're interested we should arrange one in IRC.

[lp:~nick-dedekind/ubuntu-ui-toolkit/lp1378821.time-translation]

1120. By Nick Dedekind on 2015-07-14

live timer

1121. By Nick Dedekind on 2015-07-15

fixed time translation

1122. By Nick Dedekind on 2015-07-15

updated potfile

1123. By Nick Dedekind on 2015-07-15

LiveTimer & i18n.relativeDateTime tests

1124. By Nick Dedekind on 2015-07-15

version bumped

1125. By Nick Dedekind on 2015-07-15

merged with trunk

1126. By Nick Dedekind on 2015-07-15

updated potfile

1127. By Nick Dedekind on 2015-07-15

removed old file

1128. By Nick Dedekind on 2015-07-15

version bump

1129. By Nick Dedekind on 2015-07-15

updated api

1130. By Nick Dedekind on 2015-07-15

reverted old changelogs

1131. By Nick Dedekind on 2015-07-15

better frequency handling

1132. By Nick Dedekind on 2015-07-15

whitespace

1133. By Nick Dedekind on 2015-07-20

unsubscribe live timer on destruction

Unmerged revisions

1133. By Nick Dedekind on 2015-07-20

unsubscribe live timer on destruction

1132. By Nick Dedekind on 2015-07-15

whitespace

1131. By Nick Dedekind on 2015-07-15

better frequency handling

1130. By Nick Dedekind on 2015-07-15

reverted old changelogs

1129. By Nick Dedekind on 2015-07-15

updated api

1128. By Nick Dedekind on 2015-07-15

version bump

1127. By Nick Dedekind on 2015-07-15

removed old file

1126. By Nick Dedekind on 2015-07-15

updated potfile

1125. By Nick Dedekind on 2015-07-15

merged with trunk

1124. By Nick Dedekind on 2015-07-15

version bumped

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-17 09:52:56 +0000
+++ debian/changelog	2015-01-12 17:27:26 +0000
@@ -348,6 +348,13 @@
 
  -- Zoltán Balogh <[e-mail]>  Fri, 10 Oct 2014 11:19:10 +0300
 
+ubuntu-ui-toolkit (1.1.1279.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Nick Dedekind ]
+  * Added time formatter
+
+ -- Nick Dedekind <[e-mail]>  Mon, 15 Dec 2014 09:57:12 +0000
+
 ubuntu-ui-toolkit (1.1.1279.1+14.10.20141014-0ubuntu1) 14.09; urgency=low
 
   [ Ubuntu daily release ]
 
=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-12-03 14:43:27 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2015-01-12 17:27:26 +0000
@@ -35,6 +35,7 @@
 #include "inversemouseareatype.h"
 #include "qquickclipboard.h"
 #include "qquickmimedata.h"
+#include "timeformatter.h"
 #include "ucubuntuanimation.h"
 #include "ucfontutils.h"
 #include "ucarguments.h"
@@ -166,11 +167,10 @@
     qmlRegisterType<QSortFilterProxyModelQML>(uri, 1, 1, "SortFilterModel");
     qmlRegisterUncreatableType<FilterBehavior>(uri, 1, 1, "FilterBehavior", "Not instantiable");
     qmlRegisterUncreatableType<SortBehavior>(uri, 1, 1, "SortBehavior", "Not instantiable");
-
-    // ListItem and related types, released to 1.2
     qmlRegisterType<UCListItem, 2>(uri, 1, 2, "ListItem");
     qmlRegisterType<UCListItemDivider>();
     qmlRegisterType<UCListItemActions, 2>(uri, 1, 2, "ListItemActions");
+    qmlRegisterType<TimeFormatter>(uri, 1, 1, "TimeFormatter");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 
=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2014-12-03 14:43:27 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2015-01-12 17:27:26 +0000
@@ -72,7 +72,9 @@
     uclistitemactions.h \
     uclistitemactions_p.h \
     propertychange_p.h \
-    uclistitemstyle.h
+    uclistitemstyle.h \
+    timeformatter.h \
+    timeformatter_p.h
 
 SOURCES += plugin.cpp \
     uctheme.cpp \
@@ -114,7 +116,8 @@
     uclistitemactionsattached.cpp \
     uclistitemattached.cpp \
     propertychange_p.cpp \
-    uclistitemstyle.cpp
+    uclistitemstyle.cpp \
+    timeformatter.cpp
 
 # adapters
 SOURCES += adapters/alarmsadapter_organizer.cpp
 
=== added file 'modules/Ubuntu/Components/plugin/timeformatter.cpp'
--- modules/Ubuntu/Components/plugin/timeformatter.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/timeformatter.cpp	2015-01-12 17:27:26 +0000
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * 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/>.
+ */
+
+#include "timeformatter.h"
+#include "timeformatter_p.h"
+
+TimeFormatterShared* TimeFormatterShared::s_timeformatter = NULL;
+
+TimeFormatterShared::TimeFormatterShared()
+{
+    QDBusConnection::systemBus().connect("org.freedesktop.timedate1",
+                                         "/org/freedesktop/timedate1",
+                                         "org.freedesktop.DBus.Properties",
+                                         "PropertiesChanged",
+                                         this,
+                                         SLOT(timedate1PropertiesChanged(QString, QVariantMap, QStringList)));
+}
+
+QString TimeFormatterPrivate::relativeTime(const QDateTime &datetime)
+{
+    QDateTime now = m_timeSource ? m_timeSource->property("time").toDateTime() : QDateTime::currentDateTime();
+    const date_proximity_t prox = getDateProximity(now, datetime);
+
+    switch (prox)  {
+        case DATE_PROXIMITY_NOW:
+            m_proximityTimer.setInterval(1000);
+            if (!m_proximityTimer.isActive()) m_proximityTimer.start();
+
+            /* TRANSLATORS: Time based "this is happening/happened now" */
+            return UbuntuI18n::instance().tr("Now");
+
+        case DATE_PROXIMITY_HOUR:
+        {
+            m_proximityTimer.setInterval(1000);
+            if (!m_proximityTimer.isActive()) m_proximityTimer.start();
+
+            qint64 diff = datetime.toMSecsSinceEpoch() - now.toMSecsSinceEpoch();
+            qint64 minutes = qRound(float(diff) / 60000);
+            if (minutes < 0) {
+                if (minutes == -1) return UbuntuI18n::instance().tr("%1 minute ago").arg(qAbs(minutes));
+                return UbuntuI18n::instance().tr("%1 minutes ago").arg(qAbs(minutes));
+            }
+            if (minutes == 1) return UbuntuI18n::instance().tr("%1 minute").arg(qAbs(minutes));
+            return UbuntuI18n::instance().tr("%1 minutes").arg(qAbs(minutes));
+        }
+
+        case DATE_PROXIMITY_TODAY:
+            /* en_US example: "1:00 PM" */
+            m_proximityTimer.stop();
+            /* 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() ? UbuntuI18n::instance().tr("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 */
+                                                     UbuntuI18n::instance().tr("HH:mm"));
+
+        case DATE_PROXIMITY_YESTERDAY:
+            /* en_US example: "Yesterday  13:00" */
+            m_proximityTimer.stop();
+            /* 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() ? UbuntuI18n::instance().tr("'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 */
+                                                     UbuntuI18n::instance().tr("'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() ? UbuntuI18n::instance().tr("'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 */
+                                                     UbuntuI18n::instance().tr("'Tomorrow\u2003'HH:mm"));
+
+        case DATE_PROXIMITY_LAST_WEEK:
+        case DATE_PROXIMITY_NEXT_WEEK:
+            /* en_US example: "Fri  1:00 PM" */
+            m_proximityTimer.stop();
+            /* 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() ? UbuntuI18n::instance().tr("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 */
+                                                     UbuntuI18n::instance().tr("ddd'\u2003'HH:mm"));
+
+        case DATE_PROXIMITY_FAR:
+        default:
+            m_proximityTimer.stop();
+            /* 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() ? UbuntuI18n::instance().tr("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 */
+                                                     UbuntuI18n::instance().tr("ddd d MMM'\u2003'HH:mm"));
+    }
+    m_proximityTimer.stop();
+    return datetime.toString(Qt::DefaultLocaleShortDate);
+}
+
+TimeFormatter::TimeFormatter(QObject *parent)
+    : QObject(parent)
+    , d(new TimeFormatterPrivate)
+{
+    connect(TimeFormatterShared::s_timeformatter, &TimeFormatterShared::updated, this, &TimeFormatter::update);
+    connect(&d->m_proximityTimer, &QTimer::timeout, this, &TimeFormatter::update);
+}
+
+TimeFormatter::~TimeFormatter()
+{
+}
+
+QString TimeFormatter::format() const
+{
+    return d->m_format;
+}
+
+QString TimeFormatter::timeString() const
+{
+    return d->m_timeString;
+}
+
+qint64 TimeFormatter::millisecondsSinceEpoc() const
+{
+    return d->m_millisecondsSinceEpoc;
+}
+
+bool TimeFormatter::relative() const
+{
+    return d->m_relative;
+}
+
+QObject* TimeFormatter::timeSource() const
+{
+    return d->m_timeSource;
+}
+
+void TimeFormatter::setFormat(const QString &format)
+{
+    if (d->m_format != format) {
+        d->m_format = format;
+        Q_EMIT formatChanged(d->m_format);
+        update();
+    }
+}
+
+void TimeFormatter::setMilliSeccondsSinceEpoc(qint64 millisecondsSinceEpoc)
+{
+    if (d->m_millisecondsSinceEpoc != millisecondsSinceEpoc) {
+        d->m_millisecondsSinceEpoc = millisecondsSinceEpoc;
+        Q_EMIT millisecondsSinceEpocChanged(d->m_millisecondsSinceEpoc);
+        update();
+    }
+}
+
+void TimeFormatter::setRelative(bool relative)
+{
+    if (d->m_relative != relative) {
+        if (!relative) d->m_proximityTimer.stop();
+        d->m_relative = relative;
+        Q_EMIT relativeChanged(d->m_relative);
+        update();
+    }
+}
+
+void TimeFormatter::setTimeSource(QObject* timeSource)
+{
+    if (timeSource != d->m_timeSource) {
+        d->m_timeSource = timeSource;
+        Q_EMIT timeSourceChanged(d->m_timeSource);
+        update();
+    }
+}
+
+void TimeFormatter::update()
+{
+    if (format().isEmpty() && !d->m_relative) return;
+
+    QDateTime datetime(QDateTime::fromMSecsSinceEpoch(millisecondsSinceEpoc()));
+    QString timeString = d->m_relative ? d->relativeTime(datetime) : datetime.toString(format());
+
+    if (d->m_timeString != timeString) {
+        d->m_timeString = timeString;
+        Q_EMIT timeStringChanged(d->m_timeString);
+    }
+}
 
=== added file 'modules/Ubuntu/Components/plugin/timeformatter.h'
--- modules/Ubuntu/Components/plugin/timeformatter.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/timeformatter.h	2015-01-12 17:27:26 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * 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 TIME_FORMATTER_H
+#define TIME_FORMATTER_H
+
+#include <QObject>
+
+// TODO - bug #1260728
+class TimeFormatter : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString format READ format WRITE setFormat NOTIFY formatChanged)
+    Q_PROPERTY(QString timeString READ timeString NOTIFY timeStringChanged)
+    Q_PROPERTY(qint64 millisecondsSinceEpoc READ millisecondsSinceEpoc WRITE setMilliSeccondsSinceEpoc NOTIFY millisecondsSinceEpocChanged)
+    Q_PROPERTY(bool relative READ relative WRITE setRelative NOTIFY relativeChanged)
+
+    /* for testing */
+    Q_PROPERTY(QObject* timeSource READ timeSource WRITE setTimeSource NOTIFY timeSourceChanged)
+public:
+    TimeFormatter(QObject *parent = 0);
+    virtual ~TimeFormatter();
+
+    virtual QString format() const;
+    QString timeString() const;
+    qint64 millisecondsSinceEpoc() const;
+    bool relative() const;
+    QObject* timeSource() const;
+
+    void setFormat(const QString &format);
+    void setMilliSeccondsSinceEpoc(qint64 millisecondsSinceEpoc);
+    void setRelative(bool relative);
+    void setTimeSource(QObject* timeSource);
+
+    void update();
+
+Q_SIGNALS:
+    void formatChanged(const QString &format);
+    void timeStringChanged(const QString &timeString);
+    void millisecondsSinceEpocChanged(qint64 millisecondsSinceEpoc);
+    void relativeChanged(bool relative);
+    void timeSourceChanged(QObject* timeSource);
+
+private:
+    class TimeFormatterPrivate *d;
+};
+
+#endif
 
=== added file 'modules/Ubuntu/Components/plugin/timeformatter_p.h'
--- modules/Ubuntu/Components/plugin/timeformatter_p.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/timeformatter_p.h	2015-01-12 17:27:26 +0000
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * 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 TIMEFORMATTER_P_H
+#define TIMEFORMATTER_P_H
+
+#include "i18n.h"
+
+#include <QDateTime>
+#include <QDBusConnection>
+#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,
+   DATE_PROXIMITY_HOUR,
+   DATE_PROXIMITY_TODAY,
+   DATE_PROXIMITY_YESTERDAY,
+   DATE_PROXIMITY_TOMORROW,
+   DATE_PROXIMITY_LAST_WEEK,
+   DATE_PROXIMITY_NEXT_WEEK,
+   DATE_PROXIMITY_FAR
+} date_proximity_t;
+
+inline date_proximity_t getDateProximity(const QDateTime& now, const QDateTime& time)
+{
+   int now_day = now.date().day();
+   int now_month = now.date().month();
+   int now_year = now.date().year();
+
+   int time_day = time.date().day();
+   int time_month = time.date().month();
+   int time_year = time.date().year();
+
+   qint64 diff = time.toMSecsSinceEpoch() - now.toMSecsSinceEpoch();
+   if (qAbs(diff) < 30000) return DATE_PROXIMITY_NOW;
+   else if (qAbs(diff) < 3600000) return DATE_PROXIMITY_HOUR;
+
+   // does it happen today?
+   if ((now_year == time_year) && (now_month == time_month) && (now_day == time_day)) {
+       return DATE_PROXIMITY_TODAY;
+   }
+
+   // did it happen yesterday?
+   QDateTime yesterday(now.addDays(-1));
+   int yesterday_day = yesterday.date().day();
+   int yesterday_month = yesterday.date().month();
+   int yesterday_year = yesterday.date().year();
+   if ((yesterday_year == time_year) && (yesterday_month == time_month) && (yesterday_day == time_day)) {
+       return DATE_PROXIMITY_YESTERDAY;
+   }
+
+   // does it happen tomorrow?
+   QDateTime tomorrow(now.addDays(1));
+   int tomorrow_day = tomorrow.date().day();
+   int tomorrow_month = tomorrow.date().month();
+   int tomorrow_year = tomorrow.date().year();
+   if ((tomorrow_year == time_year) && (tomorrow_month == time_month) && (tomorrow_day == time_day)) {
+       return DATE_PROXIMITY_TOMORROW;
+   }
+
+   if (time < now) {
+       QDateTime lastWeek(now.addDays(-6));
+       QDateTime lastWeekBound(lastWeek.date(), QTime(0, 0, 0, 0));
+
+       // does it happen last week?
+       if (time >= lastWeekBound) {
+           return DATE_PROXIMITY_LAST_WEEK;
+       }
+   } else {
+
+       QDateTime nextWeek(now.addDays(6));
+       QDateTime nextWeekBound(nextWeek.date(), QTime(23, 59, 59, 999));
+
+       // does it happen this week?
+       if (time <= nextWeekBound) {
+           return DATE_PROXIMITY_NEXT_WEEK;
+       }
+   }
+
+   return DATE_PROXIMITY_FAR;
+}
+
+class TimeFormatterShared : public QObject
+{
+    Q_OBJECT
+public:
+    TimeFormatterShared();
+
+    ~TimeFormatterShared()
+    {
+        s_timeformatter = NULL;
+    }
+
+public Q_SLOTS:
+    void timedate1PropertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList&)
+    {
+        if (interface != "org.freedesktop.timedate1") return;
+        if (changed.contains("Timezone")) {
+            Q_EMIT updated();
+        }
+    }
+
+Q_SIGNALS:
+    void updated();
+
+public:
+    static TimeFormatterShared* s_timeformatter;
+};
+
+class TimeFormatterPrivate
+{
+public:
+    TimeFormatterPrivate()
+        : m_format(QLocale::system().dateTimeFormat())
+        , m_millisecondsSinceEpoc(0)
+        , m_relative(false)
+        , m_timeSource(NULL)
+    {
+        if (!TimeFormatterShared::s_timeformatter) { TimeFormatterShared::s_timeformatter = new TimeFormatterShared(); }
+        m_shared.reset(TimeFormatterShared::s_timeformatter);
+
+        m_proximityTimer.setSingleShot(false);
+    }
+
+    QString relativeTime(const QDateTime &datetime);
+
+    QString m_format;
+    QString m_timeString;
+    qint64 m_millisecondsSinceEpoc;
+    bool m_relative;
+    date_proximity_t m_lastProximity;
+    QObject* m_timeSource;
+    QTimer m_proximityTimer;
+
+    QSharedPointer<TimeFormatterShared> m_shared;
+};
+
+#endif // TIMEFORMATTER_P_H
 
=== modified file 'po/ubuntu-ui-toolkit.pot'
--- po/ubuntu-ui-toolkit.pot	2014-11-06 15:50:17 +0000
+++ po/ubuntu-ui-toolkit.pot	2015-01-12 17:27:26 +0000
@@ -8,19 +8,28 @@
 msgstr ""
 "Project-Id-Version: ubuntu-ui-toolkit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-05 14:29+0100\n"
+"POT-Creation-Date: 2014-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Ubuntu/Components/ListItems/Empty.qml:413
+#: Ubuntu/Components/ListItems/Empty.qml:397
 msgid "Delete"
 msgstr ""
 
+#: Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.cpp:51
+msgid "No service/path specified"
+msgstr ""
+
+#: Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.cpp:69
+#, qt-format
+msgid "Invalid bus type: %1."
+msgstr ""
+
 #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176
 #, qt-format
 msgid ""
@@ -33,13 +42,98 @@
 msgid "property \"%1\" does not exist or is not writable for object %2"
 msgstr ""
 
-#: Ubuntu/Components/plugin/ucalarm.cpp:42
-#: Ubuntu/Components/plugin/ucalarm.cpp:136
+#. TRANSLATORS: Time based "this is happening/happened now"
+#: Ubuntu/Components/plugin/timeformatter.cpp:43
+msgid "Now"
+msgstr ""
+
+#: Ubuntu/Components/plugin/timeformatter.cpp:53
+#, qt-format
+msgid "%1 minute ago"
+msgstr ""
+
+#: Ubuntu/Components/plugin/timeformatter.cpp:54
+#, qt-format
+msgid "%1 minutes ago"
+msgstr ""
+
+#: Ubuntu/Components/plugin/timeformatter.cpp:56
+#, qt-format
+msgid "%1 minute"
+msgstr ""
+
+#: Ubuntu/Components/plugin/timeformatter.cpp:57
+#, qt-format
+msgid "%1 minutes"
+msgstr ""
+
+#. 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
+#: Ubuntu/Components/plugin/timeformatter.cpp:65
+msgid "h:mm ap"
+msgstr ""
+
+#. 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
+#: Ubuntu/Components/plugin/timeformatter.cpp:68
+msgid "HH:mm"
+msgstr ""
+
+#. 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
+#: Ubuntu/Components/plugin/timeformatter.cpp:75
+msgid "'Yesterday 'h:mm ap"
+msgstr ""
+
+#. 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
+#: Ubuntu/Components/plugin/timeformatter.cpp:78
+msgid "'Yesterday 'HH:mm"
+msgstr ""
+
+#. 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
+#: Ubuntu/Components/plugin/timeformatter.cpp:84
+msgid "'Tomorrow 'h:mm ap"
+msgstr ""
+
+#. 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
+#: Ubuntu/Components/plugin/timeformatter.cpp:87
+msgid "'Tomorrow 'HH:mm"
+msgstr ""
+
+#. 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
+#: Ubuntu/Components/plugin/timeformatter.cpp:95
+msgid "ddd' 'h:mm ap"
+msgstr ""
+
+#. 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
+#: Ubuntu/Components/plugin/timeformatter.cpp:98
+msgid "ddd' 'HH:mm"
+msgstr ""
+
+#. 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
+#: Ubuntu/Components/plugin/timeformatter.cpp:105
+msgid "ddd d MMM' 'h:mm ap"
+msgstr ""
+
+#. 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
+#: Ubuntu/Components/plugin/timeformatter.cpp:108
+msgid "ddd d MMM' 'HH:mm"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucalarm.cpp:41
+#: Ubuntu/Components/plugin/ucalarm.cpp:641
 msgid "Alarm"
 msgstr ""
 
-#: Ubuntu/Components/plugin/ucalarm.cpp:684
-#: Ubuntu/Components/plugin/ucalarm.cpp:716
+#: Ubuntu/Components/plugin/ucalarm.cpp:633
+#: Ubuntu/Components/plugin/ucalarm.cpp:665
 msgid "Alarm has a pending operation."
 msgstr ""
 
@@ -66,10 +160,29 @@
 msgid "%1 is expecting additional arguments: %2"
 msgstr ""
 
-#: Ubuntu/Components/plugin/ucmousefilters.cpp:1064
+#: Ubuntu/Components/plugin/uclistitemactions.cpp:155
+msgid "actionsDelegate not set!"
+msgstr ""
+
+#: Ubuntu/Components/plugin/uclistitem.cpp:1040
+#: Ubuntu/Components/plugin/uclistitem.cpp:1074
+msgid "leadingActions and trailingActions cannot share the same object!"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucmousefilters.cpp:1065
 msgid "Ignoring AfterItem priority for InverseMouse filters."
 msgstr ""
 
+#: Ubuntu/Components/plugin/ucserviceproperties.cpp:62
+msgid "Changing connection parameters forbidden."
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucserviceproperties.cpp:145
+#, qt-format
+msgid ""
+"Binding detected on property '%1' will be removed by the service updates."
+msgstr ""
+
 #: Ubuntu/Components/plugin/ucstatesaver.cpp:46
 msgid "Warning: attachee must have an ID. State will not be saved."
 msgstr ""
@@ -87,23 +200,24 @@
 "State saving disabled for %1, class %2"
 msgstr ""
 
-#: Ubuntu/Components/plugin/uctheme.cpp:233
-msgid "Theme not found: "
+#: Ubuntu/Components/plugin/uctheme.cpp:240
+#, qt-format
+msgid "Theme not found: \"%1\""
 msgstr ""
 
-#: Ubuntu/Components/Popups/ComposerSheet.qml:80
+#: Ubuntu/Components/Popups/ComposerSheet.qml:78
 msgid "Cancel"
 msgstr ""
 
-#: Ubuntu/Components/Popups/ComposerSheet.qml:90
+#: Ubuntu/Components/Popups/ComposerSheet.qml:88
 msgid "Confirm"
 msgstr ""
 
-#: Ubuntu/Components/Popups/DefaultSheet.qml:89
+#: Ubuntu/Components/Popups/DefaultSheet.qml:85
 msgid "Close"
 msgstr ""
 
-#: Ubuntu/Components/Popups/DefaultSheet.qml:99
+#: Ubuntu/Components/Popups/DefaultSheet.qml:95
 msgid "Done"
 msgstr ""
 
@@ -111,19 +225,19 @@
 msgid "Select All"
 msgstr ""
 
-#: Ubuntu/Components/TextInputPopover.qml:33
+#: Ubuntu/Components/TextInputPopover.qml:34
 msgid "Cut"
 msgstr ""
 
-#: Ubuntu/Components/TextInputPopover.qml:42
+#: Ubuntu/Components/TextInputPopover.qml:46
 msgid "Copy"
 msgstr ""
 
-#: Ubuntu/Components/TextInputPopover.qml:49
+#: Ubuntu/Components/TextInputPopover.qml:56
 msgid "Paste"
 msgstr ""
 
-#: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57
+#: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:62
 msgid "In Progress"
 msgstr ""
 
@@ -135,6 +249,6 @@
 msgid "Pull to refresh..."
 msgstr ""
 
-#: Ubuntu/Components/ToolbarItems.qml:142
+#: Ubuntu/Components/ToolbarItems.qml:145
 msgid "Back"
 msgstr ""
 
=== added file 'tests/unit/tst_components/dateExt.js'
--- tests/unit/tst_components/dateExt.js	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_components/dateExt.js	2015-01-12 17:27:26 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2014 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/>.
+ */
+
+.pragma library
+
+Date.msPerMinute = 60e3
+Date.msPerHour = 3600e3
+Date.msPerDay = 86400e3
+Date.msPerWeek = Date.msPerDay * 7
+
+Date.leapYear = function(year) {
+    return year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)
+}
+
+Date.prototype.addMinutes = function(minutes) {
+    var date = new Date(this)
+    date.setTime(date.getTime() + Date.msPerMinute * minutes)
+    return date
+}
+
+Date.prototype.addHours = function(hours) {
+    var date = new Date(this)
+    date.setTime(date.getTime() + Date.msPerHour * hours)
+    return date
+}
+
+Date.prototype.addDays = function(days) {
+    var date = new Date(this)
+    date.setTime(date.getTime() + Date.msPerDay * days)
+    return date
+}
+
+Date.prototype.addMonths = function(months) {
+    var date = new Date(this)
+    date.setMonth(date.getMonth() + months)
+    return date
+}
+
+Date.prototype.weekStart = function(weekStartDay) {
+    var date = this.midnight()
+    var day = date.getDay(), n = 0
+    while (day != weekStartDay) {
+        if (day == 0) day = 6
+        else day = day - 1
+        n = n + 1
+    }
+    return date.addDays(-n)
+}
+
+Date.prototype.midday = function() {
+    var date = new Date(this)
+    date.setHours(12,0,0,0);
+    return date
+}
 
=== modified file 'tests/unit/tst_components/tst_components.pro'
--- tests/unit/tst_components/tst_components.pro	2012-12-04 08:11:38 +0000
+++ tests/unit/tst_components/tst_components.pro	2015-01-12 17:27:26 +0000
@@ -6,4 +6,5 @@
 
 SOURCES += tst_components.cpp
 
-OTHER_FILES += $$system(ls *.qml)
+OTHER_FILES += $$system(ls *.qml) \
+    dateExt.js
 
=== added file 'tests/unit/tst_components/tst_timeformatter.qml'
--- tests/unit/tst_components/tst_timeformatter.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_components/tst_timeformatter.qml	2015-01-12 17:27:26 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014 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 QtTest 1.0
+import Ubuntu.Components 1.1
+import "dateExt.js" as DateExt
+
+TestCase {
+    name: "TimeFormatter"
+
+    function init() {
+        timeFormatter.relative = false;
+    }
+
+    property date testTime: (new Date(2014, 10, 27, 14, 48, 0, 0))
+
+    function test_relative_data() {
+    return [
+            { tag: "now", datetime: testTime, expected: "Now" },
+            { tag: "last minute", datetime: testTime.addMinutes(-1), expected: "1 minute ago" },
+            { tag: "next minute", datetime: testTime.addMinutes(1), expected: "1 minute" },
+            { tag: "last hour", datetime: testTime.addMinutes(-50), expected: "50 minutes ago" },
+            { tag: "next hour", datetime: testTime.addMinutes(50), expected: "50 minutes" },
+            { tag: "today-before", datetime: testTime.addHours(-4), expected: "10:48" },
+            { tag: "today-after", datetime: testTime.addHours(4), expected: "18:48" },
+            { tag: "yesterday", datetime: testTime.addDays(-1), expected: "Yesterday\u200314:48" },
+            { tag: "tomorrow", datetime: testTime.addDays(1), expected: "Tomorrow\u200314:48" },
+            { tag: "last-week", datetime: testTime.addDays(-6), expected: "Fri\u200314:48" },
+            { tag: "next-week", datetime: testTime.addDays(6), expected: "Wed\u200314:48" },
+            { tag: "far-past", datetime: testTime.addDays(-7), expected: "Thu 20 Nov\u200314:48" },
+            { tag: "far-future", datetime: testTime.addDays(7), expected: "Thu 4 Dec\u200314:48" }
+        ];
+    }
+
+    function test_relative(data) {
+        timeFormatter.relative = true;
+        timeFormatter.millisecondsSinceEpoc = data.datetime.getTime();
+
+        if (data.expected !== undefined) {
+            compare(timeFormatter.timeString, data.expected);
+        }
+    }
+
+    TimeFormatter {
+        id: timeFormatter
+
+        timeSource: QtObject {
+            property date time: testTime
+        }
+    }
+}