X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_status%2Fbandwidth.htm;h=0c53c95bed3f6b50babe38639b8a86017098283e;hp=003c3ebdc011018375fee74b7401d9db35105d89;hb=a1415d74302e12459379437ca8d6af0ff4cf1921;hpb=2c844d42d819f1d2b5f9827b3e079801f238938d

diff --git a/modules/admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/admin-full/luasrc/view/admin_status/bandwidth.htm
index 003c3ebdc..0c53c95be 100644
--- a/modules/admin-full/luasrc/view/admin_status/bandwidth.htm
+++ b/modules/admin-full/luasrc/view/admin_status/bandwidth.htm
@@ -71,25 +71,25 @@ $Id$
 
 	function bandwidth_label(bytes, br)
 	{
-		var uby = 'KByte';
+		var uby = '<%:kB/s%>';
 		var kby = (bytes / 1024);
 
 		if (kby >= 1024)
 		{
-			uby = 'MByte';
+			uby = '<%:MB/s%>';
 			kby = kby / 1024;
 		}
 
-		var ubi = 'KBit';
+		var ubi = '<%:kbit/s%>';
 		var kbi = (bytes * 8 / 1024);
 
 		if (kbi >= 1024)
 		{
-			ubi = 'MBit';
+			ubi = '<%:Mbit/s%>';
 			kbi = kbi / 1024;
 		}
 
-		return String.format("%f %s/s%s(%f %s/s)",
+		return String.format("%f %s%s(%f %s)",
 			kbi.toFixed(2), ubi,
 			br ? '<br />' : ' ',
 			kby.toFixed(2), uby
@@ -288,23 +288,23 @@ $Id$
 <table style="width:100%; table-layout:fixed" cellspacing="5">
 	<tr>
 		<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid blue"><%:Inbound:%></strong></td>
-		<td id="rx_bw_cur">0 kbit/s<br />(0 KB/s)</td>
+		<td id="rx_bw_cur">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
 
 		<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
-		<td id="rx_bw_avg">0 kbit/s<br />(0 KB/s)</td>
+		<td id="rx_bw_avg">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
 
 		<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
-		<td id="rx_bw_peak">0 kbit/s<br />(0 KB/s)</td>
+		<td id="rx_bw_peak">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
 	</tr>
 	<tr>
 		<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid green"><%:Outbound:%></strong></td>
-		<td id="tx_bw_cur">0 kbit/s<br />(0 KB/s)</td>
+		<td id="tx_bw_cur">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
 
 		<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
-		<td id="tx_bw_avg">0 kbit/s<br />(0 KB/s)</td>
+		<td id="tx_bw_avg">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
 
 		<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
-		<td id="tx_bw_peak">0 kbit/s<br />(0 KB/s)</td>
+		<td id="tx_bw_peak">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
 	</tr>
 </table>