Merge pull request #2510 from brunostein/add_call_gettext_function_menu_vpn

5 files changed, 9 insertions, 9 deletions

diff --git a/src/usr/local/www/vpn_ipsec_keys_edit.php b/src/usr/local/www/vpn_ipsec_keys_edit.php
index 69478da..dbdc033 100644
--- a/src/usr/local/www/vpn_ipsec_keys_edit.php
+++ b/src/usr/local/www/vpn_ipsec_keys_edit.php
@@ -144,7 +144,7 @@ if ($_POST) {
 			$text = gettext("Added");
 		}
 
-		write_config("{$text} IPsec Pre-Shared Keys");
+		write_config("{$text} " . gettext("IPsec Pre-Shared Keys"));
 		mark_subsystem_dirty('ipsec');
 
 		header("Location: vpn_ipsec_keys.php");
diff --git a/src/usr/local/www/vpn_ipsec_phase1.php b/src/usr/local/www/vpn_ipsec_phase1.php
index 445bd41..5cd751e 100644
--- a/src/usr/local/www/vpn_ipsec_phase1.php
+++ b/src/usr/local/www/vpn_ipsec_phase1.php
@@ -545,7 +545,7 @@ function build_interface_list() {
 			$vipif = $group[0]['int'];
 		}
 
-		$interfaces[$name] = "GW Group {$name}";
+		$interfaces[$name] = sprintf(gettext("GW Group %s"), $name);
 	}
 
 	return($interfaces);
diff --git a/src/usr/local/www/vpn_ipsec_settings.php b/src/usr/local/www/vpn_ipsec_settings.php
index a6e858a..aabc5b5 100644
--- a/src/usr/local/www/vpn_ipsec_settings.php
+++ b/src/usr/local/www/vpn_ipsec_settings.php
@@ -94,16 +94,16 @@ if ($_POST) {
 
 	foreach ($ipsec_log_cats as $cat => $desc) {
 		if (!in_array(intval($pconfig[$cat]), array_keys($ipsec_log_sevs), true)) {
-			$input_errors[] = "A valid value must be specified for {$desc} debug.";
+			$input_errors[] = sprintf(gettext("A valid value must be specified for %s debug."), $desc);
 		}
 	}
 
 	if (isset($pconfig['maxmss'])) {
 		if (!is_numericint($pconfig['maxmss']) && $pconfig['maxmss'] != '') {
-			$input_errors[] = "An integer must be specified for Maximum MSS.";
+			$input_errors[] = gettext("An integer must be specified for Maximum MSS.");
 		}
 		if ($pconfig['maxmss'] <> '' && $pconfig['maxmss'] < 576 || $pconfig['maxmss'] > 65535) {
-			$input_errors[] = "An integer between 576 and 65535 must be specified for Maximum MSS";
+			$input_errors[] = gettext("An integer between 576 and 65535 must be specified for Maximum MSS");
 		}
 	}
 
@@ -244,9 +244,9 @@ include("head.inc");
 
 function maxmss_checked(obj) {
 	if (obj.checked) {
-		jQuery('#maxmss').attr('disabled', false);
+		$('#maxmss').attr('disabled', false);
 	} else {
-		jQuery('#maxmss').attr('disabled', 'true');
+		$('#maxmss').attr('disabled', 'true');
 	}
 }
 
diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php
index 870c5a5..71c1862 100644
--- a/src/usr/local/www/vpn_openvpn_csc.php
+++ b/src/usr/local/www/vpn_openvpn_csc.php
@@ -335,7 +335,7 @@ if ($act == "new" || $act == "edit"):
 	if (is_array($config['openvpn']['openvpn-server'])) {
 		foreach ($config['openvpn']['openvpn-server'] as $serversettings) {
 			if (in_array($serversettings['mode'], $openvpn_tls_server_modes)) {
-				$serveroptionlist[$serversettings['vpnid']] = "OpenVPN Server {$serversettings['vpnid']}: {$serversettings['description']}";
+				$serveroptionlist[$serversettings['vpnid']] = sprintf(gettext("OpenVPN Server %d: %s"), $serversettings['vpnid'], $serversettings['description']);
 			}
 		}
 	}
diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php
index 4baa206..0eff299 100644
--- a/src/usr/local/www/vpn_openvpn_server.php
+++ b/src/usr/local/www/vpn_openvpn_server.php
@@ -762,7 +762,7 @@ if ($act=="new" || $act=="edit"):
 			}
 		}
 	} else {
-		$certhelp = sprintf('%s%s%s$s', '<span id="certtype">', gettext('No Certificates defined. You may create one here: '), '<a href="system_camanager.php">System &gt; Cert Manager</a>', '</span>');
+		$certhelp = sprintf('%s%s%s$s', '<span id="certtype">', gettext('No Certificates defined. You may create one here: '), '<a href="system_camanager.php">' . gettext("System &gt; Cert Manager") . '</a>', '</span>');
 	}
 
 	$cl = openvpn_build_cert_list(false, true);