Merge branch 'gettext' of rcs.pfsense.org:pfsense/bluepex-clone into gettext

6 files changed, 24 insertions, 15 deletions

diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php
index 6d89950..683bdeb 100644
--- a/usr/local/www/system_certmanager.php
+++ b/usr/local/www/system_certmanager.php
@@ -251,7 +251,9 @@ if ($_POST) {
 
 		/* input validation */
 		$reqdfields = explode(" ", "name cert");
-		$reqdfieldsn = explode(",", gettext("Descriptive name") . "," . gettext("Final Certificate data"));
+		$reqdfieldsn = array(
+			gettext("Descriptive name"),
+			gettext("Final Certificate data"));
 
 		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
diff --git a/usr/local/www/system_gateway_groups.php b/usr/local/www/system_gateway_groups.php
index dadfa1d..a9bb475 100755
--- a/usr/local/www/system_gateway_groups.php
+++ b/usr/local/www/system_gateway_groups.php
@@ -90,8 +90,8 @@ include("head.inc");
 <input type="hidden" name="y1" value="1">
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('staticroutes')): ?><p>
-<?php print_info_box_np(gettext("The gateway configuration has been changed.<br>You must apply the changes in order for them to take 
-effect."));?><br>
+<?php print_info_box_np(sprintf(gettext("The gateway configuration has been changed.%sYou must apply the changes in order for them to take 
+effect."), "<br>"));?><br>
 <?php endif; ?>
 	<table width="100%" border="0" cellpadding="0" cellspacing="0">
 		<tr>
diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php
index dba70ca..af69938 100644
--- a/usr/local/www/system_groupmanager.php
+++ b/usr/local/www/system_groupmanager.php
@@ -112,7 +112,7 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "groupname");
-	$reqdfieldsn = explode(",", gettext("Group Name"));
+	$reqdfieldsn = array(gettext("Group Name"));
 	
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 	
diff --git a/usr/local/www/system_groupmanager_addprivs.php b/usr/local/www/system_groupmanager_addprivs.php
index f66bb69..63642b6 100644
--- a/usr/local/www/system_groupmanager_addprivs.php
+++ b/usr/local/www/system_groupmanager_addprivs.php
@@ -76,7 +76,7 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "sysprivs");
-	$reqdfieldsn = explode(",", gettext("Selected priveleges"));
+	$reqdfieldsn = array(gettext("Selected priveleges"));
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php
index e31438d..9defed7 100755
--- a/usr/local/www/system_routes.php
+++ b/usr/local/www/system_routes.php
@@ -74,14 +74,14 @@ if ($_POST) {
 		if ($_POST['enablefastrouting'] == "") {
 			/* Only update config if something changed */
 			if (isset($config['staticroutes']['enablefastrouting'])) {
-				$changedesc .= " disable fast routing";
+				$changedesc .= " " . gettext("disable fast routing");
 				unset($config['staticroutes']['enablefastrouting']);
 				write_config($changedesc);
 			}
 		} else {
 			/* Only update config if something changed */
 			if (!isset($config['staticroutes']['enablefastrouting'])) {
-				$changedesc .= " enable fast routing";
+				$changedesc .= " " . gettext("enable fast routing");
 				$config['staticroutes']['enablefastrouting'] = "enabled";
 				write_config($changedesc);
 			}
@@ -91,7 +91,7 @@ if ($_POST) {
 
 if ($_GET['act'] == "del") {
 	if ($a_routes[$_GET['id']]) {
-		$changedesc .= "removed route to " . $a_routes[$_GET['id']['route']];
+		$changedesc .= gettext("removed route to") . " " . $a_routes[$_GET['id']['route']];
 		unset($a_routes[$_GET['id']]);
 		write_config($changedesc);
 		mark_subsystem_dirty('staticroutes');
@@ -111,7 +111,7 @@ include("head.inc");
 <input type="hidden" name="y1" value="1">
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('staticroutes')): ?><p>
-<?php print_info_box_np(gettext("The static route configuration has been changed.<br>You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(sprintf(gettext("The static route configuration has been changed.%sYou must apply the changes in order for them to take effect."), "<br>"));?><br>
 <?php endif; ?>
 
 	     <?php if($config['system']['disablefilter'] <> "") :?>
@@ -119,7 +119,7 @@ include("head.inc");
 
 		<tr><td width="2%"><input type="checkbox" name="enablefastrouting" id="enablefastrouting" <?php if($config['staticroutes']['enablefastrouting'] == "enabled") echo " checked"; ?>></td><td><b><?=gettext("Enable fast routing");?></td></tr>
 
-		<tr><td colspan=2><hr><input type="submit" value="Save"></td></tr>
+		<tr><td colspan=2><hr><input type="submit" value="<?=gettext("Save"); ?>"></td></tr>
 	       </table><br>
 	     <?php endif; ?>
 
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index 3dd1880..6f0d293 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -180,15 +180,22 @@ if (isAllowedPage("system_usermanager")) {
 		/* input validation */
 		if (isset($id) && ($a_user[$id])) {
 			$reqdfields = explode(" ", "usernamefld");
-			$reqdfieldsn = explode(",", gettext("Username"));
+			$reqdfieldsn = array(gettext("Username"));
 		} else {
 			if (empty($_POST['name'])) {
 				$reqdfields = explode(" ", "usernamefld passwordfld1");
-				$reqdfieldsn = explode(",", gettext("Username,Password"));
+				$reqdfieldsn = array(
+					gettext("Username"),
+					gettext("Password"));
 			} else {
 				$reqdfields = explode(" ", "usernamefld passwordfld1 name caref keylen lifetime");
-				$reqdfieldsn = explode(",", gettext("Username,Password,Descriptive name,Certificate authority,Key length,Lifetime"));
-
+				$reqdfieldsn = array(
+					gettext("Username"),
+					gettext("Password"),
+					gettext("Descriptive name"),
+					gettext("Certificate authority"),
+					gettext("Key length"),
+					gettext("Lifetime"));
 			}
 		}
 
@@ -832,7 +839,7 @@ function sshkeyClicked(obj) {
 
 		/* input validation */
 		$reqdfields = explode(" ", "passwordfld1");
-		$reqdfieldsn = explode(",", gettext("Password"));
+		$reqdfieldsn = array(gettext("Password"));
 
 		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);