frodovdr
/
raspap-webgui
mirror of https://github.com/billz/raspap-webgui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Translatable strings in bandwidthcharts.js. 

Signed-off-by: D9ping <D9ping@users.noreply.github.com>
This commit is contained in:
D9ping 2018-09-11 21:00:23 +02:00
parent 23d2718854
commit b3d7c06c60
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
includes/bandwidth.php
View File

@ -27,7 +27,8 @@ function DisplayBandwidth(&$extraFooterScripts)
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<h4><?php echo _('Daily traffic amount'); ?></h4> <h4><?php echo _('Daily traffic amount'); ?></h4>
<label for="cbxInterfacedaily"><?php echo _('interface'); ?></label> <select id="cbxInterfacedaily" class="form-control" name="interface"> <label for="cbxInterfacedaily"><?php echo _('interface'); ?></label>
<select id="cbxInterfacedaily" class="form-control" name="interfacedaily">
<?php <?php
exec("ip -o link show | awk -F ': ' '{print $2}' | grep -v lo ", $interfacesWlo); exec("ip -o link show | awk -F ': ' '{print $2}' | grep -v lo ", $interfacesWlo);
foreach ($interfacesWlo as $interface) { foreach ($interfacesWlo as $interface) {
@ -37,9 +38,8 @@ foreach ($interfacesWlo as $interface) {
?> ?>
</select> </select>
<div class="hidden alert alert-info" id="divLoaderBandwidthdaily"> <div class="hidden alert alert-info" id="divLoaderBandwidthdaily"><?php
<?php echo sprintf(_("Loading %s bandwidth chart"), _('daily')); ?> echo sprintf(_("Loading %s bandwidth chart"), _('daily')); ?></div>
</div>
<div id="divChartBandwidthdaily"></div> <div id="divChartBandwidthdaily"></div>
<div id="divTableBandwidthdaily"></div> <div id="divTableBandwidthdaily"></div>
</div> </div>
@ -49,7 +49,8 @@ foreach ($interfacesWlo as $interface) {
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<h4><?php echo _("Monthly traffic amount"); ?></h4> <h4><?php echo _("Monthly traffic amount"); ?></h4>
<label for="cbxInterfacemonthly"><?php echo _('interface'); ?></label> <select id="cbxInterfacemonthly" class="form-control" name="interface"> <label for="cbxInterfacemonthly"><?php echo _('interface'); ?></label>
<select id="cbxInterfacemonthly" class="form-control" name="interfacemonthly">
<?php <?php
foreach ($interfacesWlo as $interface) { foreach ($interfacesWlo as $interface) {
echo ' <option value="' , htmlentities($interface, ENT_QUOTES) , '">' , echo ' <option value="' , htmlentities($interface, ENT_QUOTES) , '">' ,
@ -76,7 +77,14 @@ foreach ($interfacesWlo as $interface) {
</div><!-- /.panel-primary --> </div><!-- /.panel-primary -->
</div><!-- /.col-lg-12 --> </div><!-- /.col-lg-12 -->
</div><!-- /.row --> </div><!-- /.row -->
<script type="text/javascript"<?php //echo ' nonce="'.$csp_page_nonce.'"'; ?>>
// js translations:
var t = new Array();
t['send'] = '<?php echo addslashes(_('Send')); ?>';
t['receive'] = '<?php echo addslashes(_('Receive')); ?>';
</script>
<?php <?php
$extraFooterScripts[] = array('src'=>'vendor/raphael/raphael.min.js', $extraFooterScripts[] = array('src'=>'vendor/raphael/raphael.min.js',
'defer'=>false); 'defer'=>false);
$extraFooterScripts[] = array('src'=>'vendor/morrisjs/morris.min.js', 'defer'=>false); $extraFooterScripts[] = array('src'=>'vendor/morrisjs/morris.min.js', 'defer'=>false);

17
js/bandwidthcharts.js
View File

@ -1,4 +1,4 @@
(function($) { (function($, _t) {
"use strict"; "use strict";
/** /**
@ -9,7 +9,8 @@
element: placeholder, element: placeholder,
xkey: 'date', xkey: 'date',
ykeys: ['rx', 'tx'], ykeys: ['rx', 'tx'],
labels: ['Received '+datasizeunits, 'Send '+datasizeunits] // NOI18N labels: [_t['send']+' '+datasizeunits.toUpperCase(),
_t['receive']+' '+datasizeunits.toUpperCase()]
}); });
return barchart; return barchart;
@ -19,7 +20,9 @@
* Create a bootstrap data table. * Create a bootstrap data table.
*/ */
function CreateDataTable(placeholder, timeunits) { function CreateDataTable(placeholder, timeunits) {
$("#"+placeholder).append('<table id="tableBandwidth'+timeunits+'" class="table table-striped container-fluid"><thead><tr><th>date</th><th>rx</th><th>tx</th></tr></thead><tbody></tbody></table>'); $("#"+placeholder).append('<table id="tableBandwidth'+timeunits+
'" class="table table-responsive table-striped container-fluid"><thead>'+
'<tr><th>date</th><th>rx</th><th>tx</th></tr></thead><tbody></tbody></table>');
} }
/** /**
@ -62,8 +65,8 @@
data: jsondata, data: jsondata,
columns: [ columns: [
{ "data": "date" }, { "data": "date" },
{ "data": "rx", "title": "received "+datasizeunits }, { "data": "rx", "title": _t['send']+' '+datasizeunits.toUpperCase() },
{ "data": "tx", "title": "send "+datasizeunits }] { "data": "tx", "title": _t['receive']+' '+datasizeunits.toUpperCase() }]
}); });
}).fail(function(xhr, textStatus) { }).fail(function(xhr, textStatus) {
if (window.console) { if (window.console) {
@ -74,7 +77,7 @@
}); });
} }
$( document ).ready(function() { $(document).ready(function() {
$('#tabbarBandwidth a[data-toggle="tab"]').on('shown.bs.tab', ShowBandwidthChartHandler); $('#tabbarBandwidth a[data-toggle="tab"]').on('shown.bs.tab', ShowBandwidthChartHandler);
$('#cbxInterfacedaily').on('change', ShowBandwidthChartHandler); $('#cbxInterfacedaily').on('change', ShowBandwidthChartHandler);
$('#cbxInterfaceweekly').on('change', ShowBandwidthChartHandler); $('#cbxInterfaceweekly').on('change', ShowBandwidthChartHandler);
@ -82,5 +85,5 @@
ShowBandwidthChartHandler(); ShowBandwidthChartHandler();
}); });
})(jQuery); })(jQuery, t);