Internationalize vpn*.php

5 files changed, 11 insertions, 11 deletions

diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php
index d991896..c4345cb 100644
--- a/src/usr/local/www/vpn_ipsec.php
+++ b/src/usr/local/www/vpn_ipsec.php
@@ -560,9 +560,9 @@ display_top_tabs($tab_array);
 
 <div class="infoblock">
 	<?=print_info_box('<strong>' . gettext("Note:") . '</strong><br />' .
-	gettext("You can check your IPsec status at ") . '<a href="status_ipsec.php">' . gettext("Status:IPsec") . '</a>.<br />' .
-	gettext("IPsec Debug Mode can be enabled at ") . '<a href="vpn_ipsec_settings.php">' .gettext("VPN:IPsec:Advanced Settings") . '</a>.<br />' .
-	gettext("IPsec can be set to prefer older SAs at ") . '<a href="vpn_ipsec_settings.php">' . gettext("VPN:IPsec:Advanced Settings") . '</a>', 'info', false)?>
+	sprintf(gettext("You can check your IPsec status at %s%s%s."), '<a href="status_ipsec.php">', gettext("Status:IPsec"), '</a>') . '<br />' .
+	sprintf(gettext("IPsec Debug Mode can be enabled at %s%s%s."), '<a href="vpn_ipsec_settings.php">', gettext("VPN:IPsec:Advanced Settings"), '</a>') . '<br />' .
+	sprintf(gettext("IPsec can be set to prefer older SAs at %s%s%s."), '<a href="vpn_ipsec_settings.php">', gettext("VPN:IPsec:Advanced Settings"), '</a>'), 'info', false)?>
 </div>
 
 <script type="text/javascript">
diff --git a/src/usr/local/www/vpn_ipsec_keys_edit.php b/src/usr/local/www/vpn_ipsec_keys_edit.php
index dbdc033..b07a0a8 100644
--- a/src/usr/local/www/vpn_ipsec_keys_edit.php
+++ b/src/usr/local/www/vpn_ipsec_keys_edit.php
@@ -138,13 +138,13 @@ if ($_POST) {
 
 		if (isset($id) && $a_secret[$id]) {
 			$a_secret[$id] = $secretent;
-			$text = gettext("Edited");
+			$text = gettext("Edited IPsec Pre-Shared Keys");
 		} else {
 			$a_secret[] = $secretent;
-			$text = gettext("Added");
+			$text = gettext("Added IPsec Pre-Shared Keys");
 		}
 
-		write_config("{$text} " . gettext("IPsec Pre-Shared Keys"));
+		write_config($text);
 		mark_subsystem_dirty('ipsec');
 
 		header("Location: vpn_ipsec_keys.php");
diff --git a/src/usr/local/www/vpn_ipsec_phase2.php b/src/usr/local/www/vpn_ipsec_phase2.php
index cbcf8c2..269d5dd 100644
--- a/src/usr/local/www/vpn_ipsec_phase2.php
+++ b/src/usr/local/www/vpn_ipsec_phase2.php
@@ -200,7 +200,7 @@ if ($_POST) {
 			$netbits = get_interface_subnet($pconfig['localid_type']);
 
 			if (empty($address) || empty($netbits)) {
-				$input_errors[] = gettext("Invalid Local Network.") . " " . convert_friendly_interface_to_friendly_descr($pconfig['localid_type']) . " " . gettext("has no subnet.");
+				$input_errors[] = gettext("Invalid Local Network.") . " " . sprintf(gettext("%s has no subnet."), convert_friendly_interface_to_friendly_descr($pconfig['localid_type']));
 			}
 		}
 
@@ -230,7 +230,7 @@ if ($_POST) {
 				$netbits = get_interface_subnet($pconfig['natlocalid_type']);
 
 				if (empty($address) || empty($netbits)) {
-					$input_errors[] = gettext("Invalid Local Network.") . " " . convert_friendly_interface_to_friendly_descr($pconfig['natlocalid_type']) . " " . gettext("has no subnet.");
+					$input_errors[] = gettext("Invalid Local Network.") . " " . sprintf(gettext("%s has no subnet."), convert_friendly_interface_to_friendly_descr($pconfig['natlocalid_type']));
 				}
 			}
 		}
diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php
index 43549c4..abd52fb 100644
--- a/src/usr/local/www/vpn_openvpn_client.php
+++ b/src/usr/local/www/vpn_openvpn_client.php
@@ -123,7 +123,7 @@ if ($_GET['act'] == "del") {
 	}
 	unset($a_client[$id]);
 	write_config();
-	$savemsg = gettext("Client successfully deleted")."<br />";
+	$savemsg = gettext("Client successfully deleted");
 }
 
 if ($_GET['act'] == "new") {
@@ -712,7 +712,7 @@ if ($act=="new" || $act=="edit"):
 				'changing the routing tables. Expressed as a comma-separated list of one or more IP/PREFIX. ' .
 				'If this is a site-to-site VPN, enter the remote LAN/s here. You may leave this blank if you don\'t want a site-to-site VPN.');
 
-$section->addInput(new Form_Input(
+	$section->addInput(new Form_Input(
 		'use_shaper',
 		'Limit outgoing bandwidth',
 		'number',
diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php
index 71c1862..46639c0 100644
--- a/src/usr/local/www/vpn_openvpn_csc.php
+++ b/src/usr/local/www/vpn_openvpn_csc.php
@@ -97,7 +97,7 @@ if ($_GET['act'] == "del") {
 	openvpn_delete_csc($a_csc[$id]);
 	unset($a_csc[$id]);
 	write_config();
-	$savemsg = gettext("Client Specific Override successfully deleted")."<br />";
+	$savemsg = gettext("Client Specific Override successfully deleted");
 }
 
 if ($_GET['act'] == "edit") {