From 381af6598090277c49cfb0b5cb90102e317577f7 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Wed, 11 Aug 2010 14:11:26 -0300
Subject: Small gettext() fixes

---
 usr/local/www/carp_status.php     | 2 +-
 usr/local/www/diag_routes.php     | 2 +-
 usr/local/www/pkg_mgr_install.php | 2 +-
 usr/local/www/wizard.php          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php
index 69d1401..543d3d7 100755
--- a/usr/local/www/carp_status.php
+++ b/usr/local/www/carp_status.php
@@ -136,7 +136,7 @@ include("head.inc");
 				</tr>
 <?php
 				if ($carpcount == 0) {
-					echo "</td></tr></table></table></div><center><br>" . gettext("Could not locate any defined CARP interfaces") . ".";
+					echo "</td></tr></table></table></div><center><br>" . gettext("Could not locate any defined CARP interfaces.");
 					echo "</center>";
 
 					include("fend.inc");
diff --git a/usr/local/www/diag_routes.php b/usr/local/www/diag_routes.php
index 5adc7b3..d9f819d 100644
--- a/usr/local/www/diag_routes.php
+++ b/usr/local/www/diag_routes.php
@@ -69,7 +69,7 @@ include('head.inc');
 <input type="submit" class="formbtn" name="submit" value="<?=gettext("Show"); ?>" />
 <br />
 <br />
-<span class="vexpl"><span class="red"><strong><?=gettext("Note")?>:</strong></span><?=gettext("By enabling name resolution, the query should take a bit longer. You can stop it at"."any time by clicking the Stop button in your browser");?>.</span>
+<span class="vexpl"><span class="red"><strong><?=gettext("Note")?>:</strong></span><?=gettext("By enabling name resolution, the query should take a bit longer. You can stop it at any time by clicking the Stop button in your browser");?>.</span>
 </td>
 </tr>
 
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index e82440c..9117837 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -167,7 +167,7 @@ switch($_GET['mode']) {
 			update_status($_GET['pkg']  . " " . gettext("installation completed."));
 			update_output_window($status);
 		} else {
-			update_output_window(gettext("Could not find") . " " . $_GET['pkg'] . ".");
+			update_output_window(sprintf(gettext("Could not find %s."), $_GET['pkg']);
 		}
 		break;
 	case "reinstallall":
diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php
index 0f2c319..4bf3735 100755
--- a/usr/local/www/wizard.php
+++ b/usr/local/www/wizard.php
@@ -62,13 +62,13 @@ if($_POST['xml'])
 
 if(empty($xml)) {
 	$xml = "not_defined";
-	print_info_box_np(gettext("ERROR:  Could not open") . " " . $xml . ".");
+	print_info_box_np(sprintf(gettext("ERROR:  Could not open %s."), $xml);
 	die;
 } else {
 	if (file_exists("{$g['www_path']}/wizards/{$xml}"))
 		$pkg = parse_xml_config_pkg("{$g['www_path']}/wizards/" . $xml, "pfsensewizard");
 	else {
-		print_info_box_np(gettext("ERROR:  Could not open") . " " . $xml . ".");
+		print_info_box_np(sprintf(gettext("ERROR:  Could not open %s."), $xml);
 		die;
 	}
 }
-- 
cgit v1.1