diff options
5 files changed, 10 insertions, 10 deletions
diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php index bfa6908..cbe5896 100644 --- a/src/usr/local/www/services_captiveportal_filemanager.php +++ b/src/usr/local/www/services_captiveportal_filemanager.php @@ -132,8 +132,8 @@ if ($_POST) { // check total file size if (($total_size + $size) > $g['captiveportal_element_sizelimit']) { - $input_errors[] = gettext("The total size of all files uploaded may not exceed ") . - format_bytes($g['captiveportal_element_sizelimit']) . "."; + $input_errors[] = sprintf(gettext("The total size of all files uploaded may not exceed %s."), + format_bytes($g['captiveportal_element_sizelimit'])); } if (!$input_errors) { diff --git a/src/usr/local/www/services_captiveportal_hostname_edit.php b/src/usr/local/www/services_captiveportal_hostname_edit.php index 5d828d1..d36fc80 100644 --- a/src/usr/local/www/services_captiveportal_hostname_edit.php +++ b/src/usr/local/www/services_captiveportal_hostname_edit.php @@ -145,7 +145,7 @@ if ($_POST) { } if ($ipent['hostname'] == $_POST['hostname']) { - $input_errors[] = sprintf("[%s] %s.", $_POST['hostname'], gettext("already allowed")) ; + $input_errors[] = sprintf(gettext("Hostname [%s] already allowed."), $_POST['hostname']) ; break ; } } diff --git a/src/usr/local/www/services_captiveportal_ip.php b/src/usr/local/www/services_captiveportal_ip.php index bdba3f7..9f90c9a 100644 --- a/src/usr/local/www/services_captiveportal_ip.php +++ b/src/usr/local/www/services_captiveportal_ip.php @@ -91,7 +91,7 @@ if (isset($cpzone) && !empty($cpzone) && isset($a_cp[$cpzone]['zoneid'])) { $cpzoneid = $a_cp[$cpzone]['zoneid']; } -$pgtitle = array(gettext("Services"), gettext("Captive Portal"), "Zone " . $a_cp[$cpzone]['zone'], gettext("Allowed IP Addresses")); +$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone %s"), $a_cp[$cpzone]['zone']), gettext("Allowed IP Addresses")); $shortcut_section = "captiveportal"; if ($_GET['act'] == "del" && !empty($cpzone) && isset($cpzoneid)) { diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php index 895e19e..277f665 100644 --- a/src/usr/local/www/services_captiveportal_vouchers.php +++ b/src/usr/local/www/services_captiveportal_vouchers.php @@ -108,7 +108,7 @@ if (empty($a_cp[$cpzone])) { exit; } -$pgtitle = array(gettext("Services"), gettext("Captive Portal"), "Zone " . $a_cp[$cpzone]['zone'], gettext("Vouchers")); +$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone %s"), $a_cp[$cpzone]['zone']), gettext("Vouchers")); $shortcut_section = "captiveportal-vouchers"; if (!is_array($config['voucher'][$cpzone]['roll'])) { @@ -258,7 +258,7 @@ if ($_POST) { $input_errors[] = gettext("Double quotes aren't allowed."); } if ($_POST['charset'] && (strpos($_POST['charset'], ",") > 0)) { - $input_errors[] = "',' " . gettext("aren't allowed."); + $input_errors[] = gettext("',' aren't allowed."); } if ($_POST['rollbits'] && (!is_numeric($_POST['rollbits']) || ($_POST['rollbits'] < 1) || ($_POST['rollbits'] > 31))) { $input_errors[] = gettext("# of Bits to store Roll Id needs to be between 1..31."); @@ -408,7 +408,7 @@ EOF; if ($toreturn['voucher']['descrmsgexpired']) { $newvoucher['descrmsgexpired'] = $toreturn['voucher']['descrmsgexpired']; } - $savemsg = gettext("Voucher database has been synchronized from {$url}:{$port}"); + $savemsg = sprintf(gettext('Voucher database has been synchronized from %1$s:%2$s'), $url, $port); $config['voucher'][$cpzone] = $newvoucher; write_config(); @@ -452,9 +452,9 @@ display_top_tabs($tab_array, true); <table class="table table-striped table-hover table-condensed"> <thead> <tr> - <th><?=gettext("Roll")?> #</th> + <th><?=gettext("Roll #")?></th> <th><?=gettext("Minutes/Ticket")?></th> - <th># <?=gettext("of Tickets")?></th> + <th><?=gettext("# of Tickets")?></th> <th><?=gettext("Comment")?></th> <th><?=gettext("Action")?></th> </tr> diff --git a/src/usr/local/www/services_captiveportal_zones_edit.php b/src/usr/local/www/services_captiveportal_zones_edit.php index fb278bb..2b57d16 100644 --- a/src/usr/local/www/services_captiveportal_zones_edit.php +++ b/src/usr/local/www/services_captiveportal_zones_edit.php @@ -90,7 +90,7 @@ if ($_POST) { foreach ($a_cp as $cpkey => $cpent) { if ($cpent['zone'] == $_POST['zone']) { - $input_errors[] = sprintf("[%s] %s.", $_POST['zone'], gettext("already exists")); + $input_errors[] = sprintf(gettext("Zone [%s] already exists."), $_POST['zone']); break; } } |
