]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Revert "Utility: Make sure to use UTC timestamp to compare in timeAgoInWords"
authorChristian Kamm <mail@ckamm.de>
Fri, 18 Mar 2016 12:15:35 +0000 (13:15 +0100)
committerChristian Kamm <mail@ckamm.de>
Fri, 18 Mar 2016 12:15:35 +0000 (13:15 +0100)
This reverts commit 41b43bf961bf933f53099ca09142bdc4f143c3e4.

Using now in UTC should make no difference, but that assert might
trigger...

src/libsync/utility.cpp

index bb3f563a638771f73f556ac8a08d088b3fdc2b63..b5353860b5b338ccdf97d0af89a989ba18c42c4e 100644 (file)
@@ -434,14 +434,12 @@ QByteArray Utility::versionOfInstalledBinary( const QString& command )
 
 QString Utility::timeAgoInWords(const QDateTime& dt, const QDateTime& from)
 {
-    QDateTime now = QDateTime::currentDateTimeUtc();
+    QDateTime now = QDateTime::currentDateTime();
 
     if( from.isValid() ) {
         now = from;
     }
 
-    Q_ASSERT(dt.timeSpec() == Qt::UTC);
-
     if( dt.daysTo(now)>0 ) {
         int dtn = dt.daysTo(now);
         return QObject::tr("%n day(s) ago", "", dtn).arg(dtn);