summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/inc/filter.inc2
-rwxr-xr-xusr/local/www/diag_logs_ppp.php2
-rw-r--r--usr/local/www/firewall_shaper_vinterface.php2
-rwxr-xr-xusr/local/www/interfaces.php4
-rw-r--r--usr/local/www/services_captiveportal_vouchers.php2
-rwxr-xr-xusr/local/www/system.php2
-rw-r--r--usr/local/www/system_advanced_admin.php2
-rw-r--r--usr/local/www/system_advanced_misc.php8
-rwxr-xr-xusr/local/www/system_gateways_edit.php4
-rw-r--r--usr/local/www/wizards/openvpn_wizard.inc4
10 files changed, 16 insertions, 16 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index ff93db5..1b1afa2 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2508,7 +2508,7 @@ EOD;
/* this shouldnt ever happen but instead of breaking the clients ruleset
* log an error.
*/
- log_error(gettext("ERROR! PPTP enabled but could not resolve the \$pptpdtarget"));
+ log_error("ERROR! PPTP enabled but could not resolve the \$pptpdtarget");
}
}
diff --git a/usr/local/www/diag_logs_ppp.php b/usr/local/www/diag_logs_ppp.php
index 9609132..c58b589 100755
--- a/usr/local/www/diag_logs_ppp.php
+++ b/usr/local/www/diag_logs_ppp.php
@@ -87,7 +87,7 @@ include("head.inc");
<div id="mainarea">
<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
- <td colspan="2" class="listtopic"><?php printf (gettext("Last $nentries PPP log entries"),$nentries);?></td>
+ <td colspan="2" class="listtopic"><?php printf(gettext("Last %s PPP log entries"),$nentries);?></td>
</tr>
<?php
foreach($ppp_logarr as $logent){
diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index fae5429..b325a30 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -111,7 +111,7 @@ if ($_GET) {
}
$output_form .= $queue->build_form();
} else {
- $input_errors[] = gettext("No queue with name {$qname} was found!");
+ $input_errors[] = sprintf(gettext("No queue with name %s was found!"),$qname);
$output_form .= "<p class=\"pgtitle\">" . $dn_default_shaper_msg."</p>";
$dontshow = true;
}
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 66aed5b..95a8313 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -451,9 +451,9 @@ if ($_POST['apply']) {
}
case "dhcp":
if (in_array($wancfg['ipaddr'], array("ppp", "pppoe", "pptp", "l2tp")))
- $input_errors[] = gettext("You have to reassign the interface to be able to configure as {$_POST['type']}.");
+ $input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."),$_POST['type']);
if (in_array($wancfg['ipaddrv6'], array("ppp", "pppoe", "pptp", "l2tp")))
- $input_errors[] = gettext("You have to reassign the interface to be able to configure as {$_POST['type']}.");
+ $input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."),$_POST['type']);
break;
case "ppp":
$reqdfields = explode(" ", "port phone");
diff --git a/usr/local/www/services_captiveportal_vouchers.php b/usr/local/www/services_captiveportal_vouchers.php
index f4f4b89..05bce04 100644
--- a/usr/local/www/services_captiveportal_vouchers.php
+++ b/usr/local/www/services_captiveportal_vouchers.php
@@ -295,7 +295,7 @@ EOF;
$config['voucher']['msgexpired'] = $toreturn['voucher']['msgexpired'];
if($toreturn['voucher']['msgnoaccess'])
$config['voucher']['msgnoaccess'] = $toreturn['voucher']['msgnoaccess'];
- $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);
write_config();
voucher_configure(true);
diff --git a/usr/local/www/system.php b/usr/local/www/system.php
index caf8e78..6be9f99 100755
--- a/usr/local/www/system.php
+++ b/usr/local/www/system.php
@@ -135,7 +135,7 @@ if ($_POST) {
if(interface_has_gateway($_POST[$dnsgwitem])) {
foreach($direct_networks_list as $direct_network) {
if(ip_in_subnet($_POST[$dnsitem], $direct_network)) {
- $input_errors[] = gettext("You can not assign a gateway to DNS '{$_POST[$dnsitem]}' server which is on a directly connected network.");
+ $input_errors[] = sprintf(gettext("You can not assign a gateway to DNS '%s' server which is on a directly connected network."),$_POST[$dnsitem]);
}
}
}
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index d1150a2..02614e2 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -93,7 +93,7 @@ if ($_POST) {
$althosts = explode(" ", $_POST['althostnames']);
foreach ($althosts as $ah)
if (!is_hostname($ah))
- $input_errors[] = gettext("Alternate hostname " . htmlspecialchars($ah) . " is not a valid hostname.");
+ $input_errors[] = sprintf(gettext("Alternate hostname %s is not a valid hostname."),htmlspecialchars($ah));
}
if ($_POST['sshport'])
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index c31bc92..c418505 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -232,7 +232,7 @@ function maxmss_checked(obj) {
<td width="78%" class="vtable">
<input name="proxyurl" id="proxyurl" value="<?php if ($pconfig['proxyurl'] <> "") echo $pconfig['proxyurl']; ?>" class="formfld unknown">
<br />
- <?=gettext("Proxy url for allowing {$g['product']} to use this proxy to connect outside."); ?>
+ <?php printf(gettext("Proxy url for allowing %s to use this proxy to connect outside."),$g['product']); ?>
</td>
</tr>
<tr>
@@ -240,7 +240,7 @@ function maxmss_checked(obj) {
<td width="78%" class="vtable">
<input name="proxyport" id="proxyport" value="<?php if ($pconfig['proxyport'] <> "") echo $pconfig['proxyport']; ?>" class="formfld unknown">
<br />
- <?=gettext("Proxy url for allowing {$g['product']} to use this proxy port to connect outside. Default is 8080 for http protocol or ssl for 443."); ?>
+ <?php printf(gettext("Proxy url for allowing %s to use this proxy port to connect outside. Default is 8080 for http protocol or ssl for 443."),$g['product']); ?>
</td>
</tr>
<tr>
@@ -248,7 +248,7 @@ function maxmss_checked(obj) {
<td width="78%" class="vtable">
<input name="proxyuser" id="proxyuser" value="<?php if ($pconfig['proxyuser'] <> "") echo $pconfig['proxyuser']; ?>" class="formfld unknown">
<br />
- <?=gettext("Proxy username for allowing {$g['product']} to use this proxy to connect outside"); ?>
+ <?php printf(gettext("Proxy username for allowing %s to use this proxy to connect outside"),$g['product']); ?>
</td>
</tr>
<tr>
@@ -256,7 +256,7 @@ function maxmss_checked(obj) {
<td width="78%" class="vtable">
<input type="password" name="proxypass" id="proxypass" value="<?php if ($pconfig['proxypass'] <> "") echo $pconfig['proxypass']; ?>" class="formfld unknown">
<br />
- <?=gettext("Proxy password for allowing {$g['product']} to use this proxy to connect outside"); ?>
+ <?php printf(gettext("Proxy password for allowing %s to use this proxy to connect outside"),$g['product']); ?>
</td>
</tr>
<tr>
diff --git a/usr/local/www/system_gateways_edit.php b/usr/local/www/system_gateways_edit.php
index 02fac7c..f34df9f 100755
--- a/usr/local/www/system_gateways_edit.php
+++ b/usr/local/www/system_gateways_edit.php
@@ -122,14 +122,14 @@ if ($_POST) {
$parent_sn = get_interface_subnet($_POST['interface']);
$subnet = gen_subnet($parent_ip, $parent_sn) . "/" . $parent_sn;
if(!ip_in_subnet($_POST['gateway'], $subnet) && !ip_in_interface_alias_subnet($_POST['interface'], $_POST['gateway'])) {
- $input_errors[] = sprintf(gettext("The gateway address %s does not lie within the chosen interface's subnet '{$subnet}'."), $_POST['gateway']);
+ $input_errors[] = sprintf(gettext("The gateway address %1\$s does not lie within the chosen interface's subnet '%2\$s'."), $_POST['gateway'],$subnet);
}
}
if (is_ipaddrv6($parent_ip)) {
$parent_sn = get_interface_subnetv6($_POST['interface']);
$subnet = gen_subnetv6($parent_ip, $parent_sn) . "/" . $parent_sn;
if(!ip_in_subnet($_POST['gateway'], $subnet)) {
- $input_errors[] = sprintf(gettext("The gateway address %s does not lie within the chosen interface's subnet '{$subnet}'."), $_POST['gateway']);
+ $input_errors[] = sprintf(gettext("The gateway address %1\$s does not lie within the chosen interface's subnet '%2\$s'."), $_POST['gateway'],$subnet);
}
}
}
diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc
index 51c7a63..348abbd 100644
--- a/usr/local/www/wizards/openvpn_wizard.inc
+++ b/usr/local/www/wizards/openvpn_wizard.inc
@@ -599,7 +599,7 @@ function step12_submitphpaction() {
if (isset($pconfig['step11']['ovpnrule'])) {
$rule = array();
- $rule['descr'] = gettext("OpenVPN {$server['description']} wizard");
+ $rule['descr'] = sprintf(gettext("OpenVPN %s wizard"),$server['description']);
/* Ensure the rule descr is not too long for pf to handle */
if (strlen($rule['descr']) > 52)
$rule['descr'] = substr($rule['descr'], 0, 52);
@@ -615,7 +615,7 @@ function step12_submitphpaction() {
}
if (isset($pconfig['step11']['ovpnallow'])) {
$rule = array();
- $rule['descr'] = gettext("OpenVPN {$server['description']} wizard");
+ $rule['descr'] = sprintf(gettext("OpenVPN %s wizard"),$server['description']);
/* Ensure the rule descr is not too long for pf to handle */
if (strlen($rule['descr']) > 52)
$rule['descr'] = substr($rule['descr'], 0, 52);
OpenPOWER on IntegriCloud