From b1e4005f9fd3c3e4e7ef86cdf756cfc84c3f6efc Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Mon, 18 Jul 2011 15:33:28 -0300
Subject: removes variables concatenation on gettext strings

---
 usr/local/www/interfaces.php        | 4 ++--
 usr/local/www/system_crlmanager.php | 4 ++--
 usr/local/www/vpn_pppoe_edit.php    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'usr')

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}"]);
 			}
 		}
 	}
-- 
cgit v1.1