[Pkg-owncloud-commits] [owncloud-client] 167/470: Fix timeAgoInWords

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit f71fdab997fffa2cbf832f46dbaf9b1a568062e4
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Mar 18 08:20:23 2016 +0100

    Fix timeAgoInWords
---
 src/libsync/utility.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/libsync/utility.cpp b/src/libsync/utility.cpp
index 85e42c4..bb3f563 100644
--- a/src/libsync/utility.cpp
+++ b/src/libsync/utility.cpp
@@ -434,15 +434,17 @@ QByteArray Utility::versionOfInstalledBinary( const QString& command )
 
 QString Utility::timeAgoInWords(const QDateTime& dt, const QDateTime& from)
 {
-    QDateTime now = QDateTime::currentDateTime();
+    QDateTime now = QDateTime::currentDateTimeUtc();
 
     if( from.isValid() ) {
         now = from;
     }
 
+    Q_ASSERT(dt.timeSpec() == Qt::UTC);
+
     if( dt.daysTo(now)>0 ) {
         int dtn = dt.daysTo(now);
-        return QObject::tr("%1 day(s) ago", "", dtn).arg(dtn);
+        return QObject::tr("%n day(s) ago", "", dtn).arg(dtn);
     } else {
         qint64 secs = dt.secsTo(now);
         if( secs < 0 ) {
@@ -450,7 +452,7 @@ QString Utility::timeAgoInWords(const QDateTime& dt, const QDateTime& from)
         }
         if( floor(secs / 3600.0) > 0 ) {
             int hours = floor(secs/3600.0);
-            return( QObject::tr("%1 hour(s) ago", "", hours).arg(hours));
+            return( QObject::tr("%n hour(s) ago", "", hours).arg(hours));
         } else {
             int minutes = qRound(secs/60.0);
             if( minutes == 0 ) {
@@ -460,7 +462,7 @@ QString Utility::timeAgoInWords(const QDateTime& dt, const QDateTime& from)
                     return QObject::tr("Less than a minute ago");
                 }
             }
-            return( QObject::tr("%1 minute(s) ago", "", minutes).arg(minutes));
+            return( QObject::tr("%n minute(s) ago", "", minutes).arg(minutes));
         }
     }
     return QObject::tr("Some time ago");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git