From 1521e8cc07b78d4fca5cb88f02595c86b9858892 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
Date: Wed, 20 Jan 2016 00:07:18 +0545
Subject: Internationalization of remaining firewall_*.php

---
 src/usr/local/www/firewall_schedule_edit.php   |  2 +-
 src/usr/local/www/firewall_virtual_ip.php      | 18 +++++++++---------
 src/usr/local/www/firewall_virtual_ip_edit.php |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/usr')

diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php
index 5a867b2..93c7f91 100644
--- a/src/usr/local/www/firewall_schedule_edit.php
+++ b/src/usr/local/www/firewall_schedule_edit.php
@@ -130,7 +130,7 @@ if ($_POST) {
 		$input_errors[] = gettext("Reserved word used for schedule name.");
 	} else {
 		if (is_validaliasname($_POST['name']) == false) {
-			$input_errors[] = gettext("The schedule name must be less than 32 characters long, may not consist of only numbers, may not consist of only underscores, and may only contain the following characters:") . ' a-z, A-Z, 0-9, _';
+			$input_errors[] = sprintf(gettext("The schedule name must be less than 32 characters long, may not consist of only numbers, may not consist of only underscores, and may only contain the following characters: %s"), 'a-z, A-Z, 0-9, _');
 		}
 	}
 
diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php
index ccfaf92..8db4818 100644
--- a/src/usr/local/www/firewall_virtual_ip.php
+++ b/src/usr/local/www/firewall_virtual_ip.php
@@ -217,13 +217,13 @@ if ($_GET['act'] == "del") {
 			}
 
 			if ($found_carp === true && $found_other_alias === false && $found_if === false) {
-				$input_errors[] = gettext("This entry cannot be deleted because it is still referenced by a CARP IP with the description") . " {$vip['descr']}.";
+				$input_errors[] = sprintf(gettext("This entry cannot be deleted because it is still referenced by a CARP IP with the description %s."), $vip['descr']);
 			}
 		} else if ($a_vip[$_GET['id']]['mode'] == "carp") {
 			$vipiface = "{$a_vip[$_GET['id']]['interface']}_vip{$a_vip[$_GET['id']]['vhid']}";
 			foreach ($a_vip as $vip) {
 				if ($vipiface == $vip['interface'] && $vip['mode'] == "ipalias") {
-					$input_errors[] = gettext("This entry cannot be deleted because it is still referenced by an IP alias entry with the description") . " {$vip['descr']}.";
+					$input_errors[] = sprintf(gettext("This entry cannot be deleted because it is still referenced by an IP alias entry with the description %s."), $vip['descr']);
 				}
 			}
 		}
@@ -262,10 +262,10 @@ if ($_GET['act'] == "del") {
 	$id = $_GET['id'];
 }
 
-$types = array('proxyarp' => 'Proxy ARP',
-			   'carp' => 'CARP',
-			   'other' => 'Other',
-			   'ipalias' => 'IP Alias'
+$types = array('proxyarp' => gettext('Proxy ARP'),
+			   'carp' => gettext('CARP'),
+			   'other' => gettext('Other'),
+			   'ipalias' => gettext('IP Alias')
 			   );
 
 $pgtitle = array(gettext("Firewall"), gettext("Virtual IP Addresses"));
@@ -276,7 +276,7 @@ if ($input_errors) {
 } else if ($savemsg) {
 	print_info_box($savemsg, 'success');
 } else if (is_subsystem_dirty('vip')) {
-	print_info_box_np(gettext("The VIP configuration has been changed.")."<br />".gettext("You must apply the changes in order for them to take effect."));
+	print_info_box_np(gettext("The VIP configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
 }
 
 /* active tabs
@@ -365,8 +365,8 @@ endforeach;
 </nav>
 
 <div class="infoblock">
-	<?=print_info_box(gettext('The virtual IP addresses defined on this page may be used in ') . '<a href="firewall_nat.php">' . gettext('NAT') . '</a>' . gettext(' mappings.') . '<br />' .
-			   gettext('You can check the status of your CARP Virtual IPs and interfaces ') . '<a href="status_carp.php">' . gettext('here') . '</a>', 'info', false)?>
+	<?=print_info_box(sprintf(gettext('The virtual IP addresses defined on this page may be used in %1$sNAT%2$s mappings'), '<a href="firewall_nat.php">', '</a>') . '<br />' .
+		sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %1$shere%2$s'), '<a href="status_carp.php">', '</a>'), 'info', false)?>
 </div>
 
 <?php
diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php
index 9df1f98..f459813 100644
--- a/src/usr/local/www/firewall_virtual_ip_edit.php
+++ b/src/usr/local/www/firewall_virtual_ip_edit.php
@@ -200,7 +200,7 @@ if ($_POST) {
 			$idtracker = 0;
 			foreach ($config['virtualip']['vip'] as $vip) {
 				if ($vip['vhid'] == $_POST['vhid'] && $vip['interface'] == $_POST['interface'] && $idtracker != $id) {
-					$input_errors[] = sprintf(gettext("VHID %s is already in use on interface %s. Pick a unique number on this interface."), $_POST['vhid'], convert_friendly_interface_to_friendly_descr($_POST['interface']));
+					$input_errors[] = sprintf(gettext("VHID %1$s is already in use on interface %2$s. Pick a unique number on this interface."), $_POST['vhid'], convert_friendly_interface_to_friendly_descr($_POST['interface']));
 				}
 				$idtracker++;
 			}
@@ -410,8 +410,8 @@ $section->addInput(new Form_Select(
 	'Address type',
 	((!$pconfig['range'] && $pconfig['subnet_bits'] == 32) || (!isset($pconfig['subnet']))) ? 'single':'network',
 	array(
-		'single' => 'Single address',
-		'network' => 'Network'
+		'single' => gettext('Single address'),
+		'network' => gettext('Network')
 	)
 ))->addClass('typesel');
 
-- 
cgit v1.1