Fix superfluous QString() usage and provide proper plural support

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index bf4f5bf..75a18af 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -158,11 +158,11 @@ QString NetworkItem::toolTip(int column) const {
   Q_UNUSED(column);
 
   QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
-  toolTip.append(QString(tr("Server: %1")).arg(currentServer()));
-  toolTip.append(QString(tr("Users: %1")).arg(nickCount()));
+  toolTip.append(tr("Server: %1").arg(currentServer()));
+  toolTip.append(tr("Users: %1").arg(nickCount()));
 
   if(_network) {
-    toolTip.append(QString(tr("Lag: %1 msecs")).arg(_network->latency()));
+    toolTip.append(tr("Lag: %1 msecs").arg(_network->latency()));
   }
 
   return QString("<p> %1 </p>").arg(toolTip.join("<br />"));

diff --git a/src/qtui/coreinfodlg.cpp b/src/qtui/coreinfodlg.cpp
index a63d78d..f367c03 100644 (file)
--- a/src/qtui/coreinfodlg.cpp
+++ b/src/qtui/coreinfodlg.cpp
@@ -48,6 +48,7 @@ void CoreInfoDlg::updateUptime() {
   int uphours = uptime / 3600; uptime %= 3600;
   int upmins = uptime / 60; uptime %= 60;
 
-  QString uptimeText = QString(tr("%1 Day(s) %2:%3:%4 (since %5)")).arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(uptime,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate));
+  QString uptimeText = tr("%n Day(s)", "", updays)
+                     + tr(" %1:%2:%3 (since %4)").arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(uptime,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate));
   ui.labelUptime->setText(uptimeText);
 }