From 8ff5e8deb3662e1b540574e8f7a07d39edcf737e Mon Sep 17 00:00:00 2001 From: Daniel Albers Date: Fri, 15 Aug 2008 00:01:19 +0200 Subject: [PATCH] secondsToString() correct year calculation, remove double spaces --- src/common/util.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 > 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(", "); } -- 2.20.1