aboutsummaryrefslogtreecommitdiff
path: root/launcher/net
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/net')
-rw-r--r--launcher/net/Download.cpp13
-rw-r--r--launcher/net/NetAction.h4
2 files changed, 9 insertions, 8 deletions
diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index bf0e5c26..082f963d 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -247,19 +247,20 @@ void Download::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
// use milliseconds for speed precision
auto elapsed_ms = std::chrono::duration_cast<std::chrono::milliseconds>(elapsed);
- auto bytes_recived_since = bytesReceived - m_last_progress_bytes;
- auto dl_speed_bps = (double)bytes_recived_since / elapsed_ms.count() * 1000;
+ auto bytes_received_since = bytesReceived - m_last_progress_bytes;
+ auto dl_speed_bps = (double)bytes_received_since / elapsed_ms.count() * 1000;
auto remaing_time_s = (bytesTotal - bytesReceived) / dl_speed_bps;
- // current bytes out of total bytes
+ //: Current amount of bytes downloaded, out of the total amount of bytes in the download
QString dl_progress = tr("%1 / %2").arg(humanReadableFileSize(bytesReceived)).arg(humanReadableFileSize(bytesTotal));
QString dl_speed_str;
if (elapsed_ms.count() > 0) {
- // bytes per second
- dl_speed_str = tr("%1/s (%2)").arg(humanReadableFileSize(dl_speed_bps)).arg(humanReadableDuration(remaing_time_s));
+ //: Download speed, in bytes per second (remaining download time in parenthesis)
+ dl_speed_str = tr("%1 /s (%2)").arg(humanReadableFileSize(dl_speed_bps)).arg(humanReadableDuration(remaing_time_s));
} else {
- dl_speed_str = tr("0 b/s");
+ //: Download speed at 0 bytes per second
+ dl_speed_str = tr("0 B/s");
}
setDetails(dl_progress + "\n" + dl_speed_str);
diff --git a/launcher/net/NetAction.h b/launcher/net/NetAction.h
index df6ed995..a13d115f 100644
--- a/launcher/net/NetAction.h
+++ b/launcher/net/NetAction.h
@@ -44,8 +44,8 @@
#include "QObjectPtr.h"
#include "tasks/Task.h"
-static const QStringList s_units_si {"kb", "MB", "GB", "TB"};
-static const QStringList s_units_kibi {"kiB", "MiB", "Gib", "TiB"};
+static const QStringList s_units_si {"kB", "MB", "GB", "TB"};
+static const QStringList s_units_kibi {"KiB", "MiB", "Gib", "TiB"};
inline QString humanReadableFileSize(double bytes, bool use_si = false, int decimal_points = 1) {
const QStringList units = use_si ? s_units_si : s_units_kibi;