diff options
| -rw-r--r-- | src/libsync/utility.cpp | 5 | ||||
| -rw-r--r-- | test/testutility.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libsync/utility.cpp b/src/libsync/utility.cpp index 7868aeb5a..2a140f89e 100644 --- a/src/libsync/utility.cpp +++ b/src/libsync/utility.cpp @@ -122,8 +122,8 @@ QString Utility::octetsToString( qint64 octets ) QString s; qreal value = octets; - // Whether we care about decimals: only for GB and only - // if it's less than 10 GB. + // Whether we care about decimals: only for GB/MB and only + // if it's less than 10 units. bool round = true; // do not display terra byte with the current units, as when @@ -137,6 +137,7 @@ QString Utility::octetsToString( qint64 octets ) } else if (octets >= mb) { s = QCoreApplication::translate("Utility", "%L1 MB"); value /= mb; + round = false; } else if (octets >= kb) { s = QCoreApplication::translate("Utility", "%L1 KB"); value /= kb; diff --git a/test/testutility.cpp b/test/testutility.cpp index ce3905a6e..5a656ac84 100644 --- a/test/testutility.cpp +++ b/test/testutility.cpp @@ -40,7 +40,7 @@ private slots: QCOMPARE(octetsToString(10240) , QString("10 KB")); QCOMPARE(octetsToString(123456) , QString("121 KB")); - QCOMPARE(octetsToString(1234567) , QString("1 MB")); + QCOMPARE(octetsToString(1234567) , QString("1.2 MB")); QCOMPARE(octetsToString(12345678) , QString("12 MB")); QCOMPARE(octetsToString(123456789) , QString("118 MB")); QCOMPARE(octetsToString(1000LL*1000*1000 * 5) , QString("4.7 GB")); |