Skip to content

Fix format_network_speed util function calculation #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vjr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix format_network_speed util function calculation #562

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/Utils.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
namespace Monitor.Utils {
const int BITS_IN_BYTES = 8;
const int MHZ_IN_GHZ = 1000;
const int IEC_UNIT_BASE = 1024;
const int NON_IEC_UNIT_BASE = 1000;

const string NOT_AVAILABLE = (_("N/A"));
const string NO_DATA = "\u2014";
Expand Down Expand Up @@ -67,11 +69,14 @@ public class Monitor.Utils.Strings {
}

public static string format_network_speed (uint64 speed_in_bytes_per_second) {
var speed_for_iec_units = speed_in_bytes_per_second * BITS_IN_BYTES;
var speed_adjusted_for_non_iec_units = speed_for_iec_units * NON_IEC_UNIT_BASE / IEC_UNIT_BASE;

///TRANSLATORS: The first param is the numeric value (as string) of network speed.
///The second param with the appended "/s" is the network speed unit such as "Mb/s" for megabits per second.
return _("%s %s/s").printf (
format_size (speed_in_bytes_per_second * BITS_IN_BYTES, BITS | IEC_UNITS | ONLY_VALUE),
format_size (speed_in_bytes_per_second * BITS_IN_BYTES, BITS | ONLY_UNIT)
format_size (speed_for_iec_units, BITS | IEC_UNITS | ONLY_VALUE),
format_size (speed_adjusted_for_non_iec_units, BITS | ONLY_UNIT)
);
}
}
Expand Down
Loading