/***************************************************************************
- * Copyright (C) 2005-2014 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
//qDebug() << "Detected utf8:" << s;
return s;
}
- //QTextCodec *codec = QTextCodec::codecForName(encoding.toAscii());
- if (!codec) return QString::fromAscii(input);
+ //QTextCodec *codec = QTextCodec::codecForName(encoding.toLatin1());
+ if (!codec) return QString::fromLatin1(input);
return codec->toUnicode(input);
}
timeUnit.append(qMakePair(60, QCoreApplication::translate("Quassel::secondsToString()", "min")));
timeUnit.append(qMakePair(1, QCoreApplication::translate("Quassel::secondsToString()", "sec")));
- 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);
+ if (timeInSeconds != 0) {
+ 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);
+ }
+ timeInSeconds = timeInSeconds % timeUnit[i].first;
}
- timeInSeconds = timeInSeconds % timeUnit[i].first;
+ return returnString.join(", ");
+ }
+ else {
+ return QString("%1 %2").arg(QString::number(timeInSeconds), timeUnit.last().second);
}
- return returnString.join(", ");
}