diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-07-18 15:33:28 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-07-18 15:33:28 -0300 |
| commit | b1e4005f9fd3c3e4e7ef86cdf756cfc84c3f6efc (patch) | |
| tree | cb1cb173d468581e832a78849e7084457a2a9533 /usr | |
| parent | 3f48162fdea51aa7a9ff64e4ebf4cc777dc9f029 (diff) | |
| download | pfsense-b1e4005f9fd3c3e4e7ef86cdf756cfc84c3f6efc.zip pfsense-b1e4005f9fd3c3e4e7ef86cdf756cfc84c3f6efc.tar.gz | |
removes variables concatenation on gettext strings
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/interfaces.php | 4 | ||||
| -rw-r--r-- | usr/local/www/system_crlmanager.php | 4 | ||||
| -rwxr-xr-x | usr/local/www/vpn_pppoe_edit.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 95a8313..a62fee5 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -657,7 +657,7 @@ if ($_POST['apply']) { } if($skip == false) { $gateway_item['gateway'] = "dynamic"; - $gateway_item['descr'] = gettext("Interface") . $if . gettext("dynamic gateway"); + $gateway_item['descr'] = sprintf(gettext("Interface %s dynamic gateway"),$if); $gateway_item['name'] = "GW_" . strtoupper($if); $gateway_item['interface'] = "{$if}"; } else { @@ -1617,7 +1617,7 @@ $types = array("none" => gettext("None"), "staticv4" => gettext("Static IPv4"), <?php if(is_readable("/var/db/dhcp6c_duid")) { // $current_duid = file_get_contents("/var/db/dhcp6c_duid"); } - echo gettext("The current DUID is: '") . $current_duid ."'"; + printf(gettext("The current DUID is: '%s'"),$current_duid); ?> </td> diff --git a/usr/local/www/system_crlmanager.php b/usr/local/www/system_crlmanager.php index 2ecc866..201d8ab 100644 --- a/usr/local/www/system_crlmanager.php +++ b/usr/local/www/system_crlmanager.php @@ -525,11 +525,11 @@ function method_change() { <td class="list"> <?php if ($cainternal == "YES"): ?> <a href="system_crlmanager.php?act=new&caref=<?php echo $ca['refid']; ?>"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("Add or Import CRL for ") . $ca['descr'];?>" alt="<?=gettext("add crl");?>" width="17" height="17" border="0" /> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?php printf(gettext("Add or Import CRL for %s"),$ca['descr']);?>" alt="<?=gettext("add crl");?>" width="17" height="17" border="0" /> </a> <?php else: ?> <a href="system_crlmanager.php?act=new&caref=<?php echo $ca['refid']; ?>&importonly=yes"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("Import CRL for ") . $ca['descr'];?>" alt="<?=gettext("add crl");?>" width="17" height="17" border="0" /> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?php printf(gettext("Import CRL for %s"),$ca['descr']);?>" alt="<?=gettext("add crl");?>" width="17" height="17" border="0" /> </a> <?php endif; ?> </td> diff --git a/usr/local/www/vpn_pppoe_edit.php b/usr/local/www/vpn_pppoe_edit.php index 6c94797..ea6f5f0 100755 --- a/usr/local/www/vpn_pppoe_edit.php +++ b/usr/local/www/vpn_pppoe_edit.php @@ -139,9 +139,9 @@ if ($_POST) { for($x=0; $x<4999; $x++) { if ($_POST["username{$x}"]) { if (empty($_POST["password{$x}"])) - $input_errors[] = gettext("No password specified for username ") . $_POST["username{$x}"]; + $input_errors[] = sprintf(gettext("No password specified for username %s"),$_POST["username{$x}"]); if ($_POST["ip{$x}"] <> "" && !is_ipaddr($_POST["ip{$x}"])) - $input_errors[] = gettext("Incorrect ip address specified for username ") . $_POST["username{$x}"]; + $input_errors[] = sprintf(gettext("Incorrect ip address specified for username %s"),$_POST["username{$x}"]); } } } |
