webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-24 01:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change case of the unit "bit" from "Bit" to "bit" in web UI

Browse Source 
The correct case for "kilobit" is "kilobit", not "kiloBit".
And the same applies for Mbit, Gbit etc.
Reference is https://en.wikipedia.org/wiki/Kilobit

This commit changes the texts used in the web UI, so
that it correctly displays as "bit", "kbit", "Mbit" etc.

This fixes bugzilla item 10918.

Signed-off-by: Alf Høgemark <alf@i100.no>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Alf Høgemark
2016-07-14 13:14:55 +02:00
committed by Michael Tremer
parent 5261a13d3c
commit f00699e8bb
13 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
html/cgi-bin/proxy.cgi
View File

@@ -1532,7 +1532,7 @@ END
;
foreach (@throttle_limits) {
print "\t<option value='$_' $selected{'THROTTLING_GREEN_TOTAL'}{$_}>$_ kBit/s</option>\n";
print "\t<option value='$_' $selected{'THROTTLING_GREEN_TOTAL'}{$_}>$_ kbit/s</option>\n";
}
print <<END
@@ -1546,7 +1546,7 @@ END
;
foreach (@throttle_limits) {
print "\t<option value='$_' $selected{'THROTTLING_GREEN_HOST'}{$_}>$_ kBit/s</option>\n";
print "\t<option value='$_' $selected{'THROTTLING_GREEN_HOST'}{$_}>$_ kbit/s</option>\n";
}
print <<END
@@ -1567,7 +1567,7 @@ END
;
foreach (@throttle_limits) {
print "\t<option value='$_' $selected{'THROTTLING_BLUE_TOTAL'}{$_}>$_ kBit/s</option>\n";
print "\t<option value='$_' $selected{'THROTTLING_BLUE_TOTAL'}{$_}>$_ kbit/s</option>\n";
}
print <<END
@@ -1581,7 +1581,7 @@ END
;
foreach (@throttle_limits) {
print "\t<option value='$_' $selected{'THROTTLING_BLUE_HOST'}{$_}>$_ kBit/s</option>\n";
print "\t<option value='$_' $selected{'THROTTLING_BLUE_HOST'}{$_}>$_ kbit/s</option>\n";
}
print <<END

10
html/cgi-bin/tor.cgi
View File

@@ -432,9 +432,9 @@ END
foreach (@bandwidth_limits) {
if ($_ >= 1024) {
print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_}>". $_ / 1024 ." MBit/s</option>\n";
print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_}>". $_ / 1024 ." Mbit/s</option>\n";
} else {
print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_}>$_ kBit/s</option>\n";
print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_RATE'}{$_}>$_ kbit/s</option>\n";
}
}
@@ -455,9 +455,9 @@ END
foreach (@bandwidth_limits) {
if ($_ >= 1024) {
print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_}>". $_ / 1024 ." MBit/s</option>\n";
print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_}>". $_ / 1024 ." Mbit/s</option>\n";
} else {
print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_}>$_ kBit/s</option>\n";
print "<option value='$_' $selected{'TOR_RELAY_BANDWIDTH_BURST'}{$_}>$_ kbit/s</option>\n";
}
}
print <<END;
@@ -978,7 +978,7 @@ sub FormatBytes() {
sub FormatBitsPerSecond() {
my $bits = shift;
my @units = ("Bit/s", "KBit/s", "MBit/s", "GBit/s", "TBit/s");
my @units = ("bit/s", "kbit/s", "Mbit/s", "Gbit/s", "Tbit/s");
my $units_index = 0;
while (($units_index <= $#units) && ($bits >= 1024)) {

4
html/html/themes/ipfire/include/functions.pl
View File

@@ -70,8 +70,8 @@ sub showmenu() {
print <<EOF;
<div id='traffic'>
<strong>Traffic:</strong>
In <span id='rx_kbs'>--.-- Bit/s</span> &nbsp;
Out <span id='tx_kbs'>--.-- Bit/s</span>
In <span id='rx_kbs'>--.-- bit/s</span> &nbsp;
Out <span id='tx_kbs'>--.-- bit/s</span>
</div>
EOF
}

2
html/html/themes/ipfire/include/js/refreshInetInfo.js
View File

@@ -51,7 +51,7 @@ function refreshInetInfo() {
}
function format_bytes(bytes) {
var units = ["Bit/s", "kBit/s", "MBit/s", "GBit/s", "TBit/s"];
var units = ["bit/s", "kbit/s", "Mbit/s", "Gbit/s", "Tbit/s"];
var unit = units[0];
for (var i = 1; i < units.length; i++) {