X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=41139dd5e7c35f8f341c99ba6421d65434a5064c;hb=62192fb6cd9cc211b5b9fe844c9b4c2f98f923cc;hp=f0a7a749e060adca231d0e901a4bfdb2dd2d4e81;hpb=4831a16871344dc46a8ae9da4e9fd3125f87b785;p=quassel.git

diff --git a/src/common/util.cpp b/src/common/util.cpp
index f0a7a749..41139dd5 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -189,19 +189,19 @@ void loadTranslation(const QLocale &locale) {
 
 QString secondsToString(int timeInSeconds) {
     QList< QPair<int, QString> > timeUnit;
-    timeUnit.append(qMakePair(365*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")));
+    timeUnit.append(qMakePair(365*24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")));
     timeUnit.append(qMakePair(24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "day")));
     timeUnit.append(qMakePair(60*60, QCoreApplication::translate("Quassel::secondsToString()", "h")));
     timeUnit.append(qMakePair(60, QCoreApplication::translate("Quassel::secondsToString()", "min")));
     timeUnit.append(qMakePair(1, QCoreApplication::translate("Quassel::secondsToString()", "sec")));
 
-    QString returnString;
+    QStringList returnString;
     for(int i=0; i < timeUnit.size(); i++) {
       int n = timeInSeconds / timeUnit[i].first;
       if(n > 0) {
-        returnString += QString("%1 %2 ").arg(QString::number(n), timeUnit[i].second);
+        returnString += QString("%1 %2").arg(QString::number(n), timeUnit[i].second);
       }
       timeInSeconds = timeInSeconds % timeUnit[i].first;
     }
-    return returnString;
+    return returnString.join(", ");
 }