Internationalization of various status*.php

7 files changed, 21 insertions, 21 deletions

diff --git a/src/usr/local/www/status_captiveportal.php b/src/usr/local/www/status_captiveportal.php
index d3adb88..1e4c091 100644
--- a/src/usr/local/www/status_captiveportal.php
+++ b/src/usr/local/www/status_captiveportal.php
@@ -259,7 +259,7 @@ else:
 	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Captive Portal Status")?></h2></div>
 	<div class="panel-body"><br />
 <?php
-	print_info_box(gettext("No captive portal zones have been configured. You may add new zones here: ") . '<a href="services_captiveportal_zones.php">' . gettext('Services->Captive portal') . '</a>');
+	print_info_box(sprintf(gettext('No captive portal zones have been configured. You may add new zones here: %1$sServices->Captive portal%2$s'), '<a href="services_captiveportal_zones.php">', '</a>'));
 ?>
 	</div>
 </div>
diff --git a/src/usr/local/www/status_carp.php b/src/usr/local/www/status_carp.php
index 07dde06..39d2a64 100644
--- a/src/usr/local/www/status_carp.php
+++ b/src/usr/local/www/status_carp.php
@@ -182,16 +182,16 @@ if ($carpcount == 0) {
 	// Sadly this needs to be here so that it is inside the form
 	if ($carp_detected_problems > 0) {
 		print_info_box(
-			gettext("CARP has detected a problem and this unit has been demoted to BACKUP status.") . "<br/>" .
-			gettext("Check the link status on all interfaces with configured CARP VIPs.") . "<br/>" .
-			gettext("Search the") .
-			" <a href=\"/status_logs.php?filtertext=carp%3A+demoted+by\">" .
-			gettext("system log") .
-			"</a> " .
-			gettext("for CARP demotion-related events.") . "<br/><br/>" .
+			gettext("CARP has detected a problem and this unit has been demoted to BACKUP status.") .
+			"<br/>" .
+			gettext("Check the link status on all interfaces with configured CARP VIPs.") .
+			"<br/>" .
+			sprintf(gettext('Search the %1$sSystem Log%2$s for CARP demotion-related events.'), "<a href=\"/status_logs.php?filtertext=carp%3A+demoted+by\">", "</a>") .
+			"<br/><br/>" .
 			'<input type="submit" class="btn btn-warning" name="resetdemotion" id="resetdemotion" value="' .
 			gettext("Reset CARP Demotion Status") .
-			'" />', 'danger'
+			'" />',
+			'danger'
 		);
 	}
 
diff --git a/src/usr/local/www/status_filter_reload.php b/src/usr/local/www/status_filter_reload.php
index 443c358..f46e1b0 100644
--- a/src/usr/local/www/status_filter_reload.php
+++ b/src/usr/local/www/status_filter_reload.php
@@ -94,10 +94,10 @@ include("head.inc");
 	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Filter Reload");?></h2></div>
 	<div class="panel-body">
 		<form action="status_filter_reload.php" method="post" name="filter">
-			<input type="submit" class="btn btn-success" value="Reload Filter" name="reloadfilter" id="reloadfilter" />
+			<input type="submit" class="btn btn-success" value="<?=gettext("Reload Filter")?>" name="reloadfilter" id="reloadfilter" />
 <?php
 if ($config['hasync'] && $config['hasync']["synchronizetoip"] != ""): ?>
-		<input type="submit" class="btn btn-default" value="Force Config Sync" name="syncfilter" id="syncfilter" />
+		<input type="submit" class="btn btn-default" value="<?=gettext("Force Config Sync")?>" name="syncfilter" id="syncfilter" />
 <?php
 endif;
 ?>
@@ -114,7 +114,7 @@ endif;
 
 		<br/>
 
-		<div id="reloadinfo"><?=gettext("This page will automatically refresh every 3 seconds until the filter is done reloading"); ?>.</div>
+		<div id="reloadinfo"><?=gettext("This page will automatically refresh every 3 seconds until the filter is done reloading."); ?></div>
 
 	</div>
 </div>
diff --git a/src/usr/local/www/status_gateways.php b/src/usr/local/www/status_gateways.php
index c5036b3..cf7c652 100644
--- a/src/usr/local/www/status_gateways.php
+++ b/src/usr/local/www/status_gateways.php
@@ -167,10 +167,10 @@ display_top_tabs($tab_array);
 						$online = gettext("Offline");
 						$bgcolor = LIGHTCORAL;
 					} elseif (stristr($status['status'], "loss")) {
-						$online = gettext("Warning, Packetloss").': '.$status['loss'];
+						$online = gettext("Warning, Packetloss") . ': ' . $status['loss'];
 						$bgcolor = KHAKI;
 					} elseif (stristr($status['status'], "delay")) {
-						$online = gettext("Warning, Latency").': '.$status['delay'];
+						$online = gettext("Warning, Latency") . ': ' . $status['delay'];
 						$bgcolor = KHAKI;
 					} elseif ($status['status'] == "none") {
 						$online = gettext("Online");
@@ -194,7 +194,7 @@ display_top_tabs($tab_array);
 				<td bgcolor="<?=$bgcolor?>">
 					<strong><?=$online?></strong> <?php
 					if (!empty($lastchange)) { ?>
-						<br /><i>Last checked <?=$lastchange?></i>
+						<br /><i><?=gettext("Last checked")?> <?=$lastchange?></i>
 <?php				} ?>
 				</td>
 
diff --git a/src/usr/local/www/status_graph.php b/src/usr/local/www/status_graph.php
index 9f7b862..8a366f3 100644
--- a/src/usr/local/www/status_graph.php
+++ b/src/usr/local/www/status_graph.php
@@ -84,14 +84,14 @@ if ($_POST['height']) {
 // Get configured interface list
 $ifdescrs = get_configured_interface_with_descr();
 if (ipsec_enabled()) {
-	$ifdescrs['enc0'] = "IPsec";
+	$ifdescrs['enc0'] = gettext("IPsec");
 }
 
 foreach (array('server', 'client') as $mode) {
 	if (is_array($config['openvpn']["openvpn-{$mode}"])) {
 		foreach ($config['openvpn']["openvpn-{$mode}"] as $id => $setting) {
 			if (!isset($setting['disable'])) {
-				$ifdescrs['ovpn' . substr($mode, 0, 1) . $setting['vpnid']] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']);
+				$ifdescrs['ovpn' . substr($mode, 0, 1) . $setting['vpnid']] = gettext("OpenVPN") . " " . $mode . ": ".htmlspecialchars($setting['description']);
 			}
 		}
 	}
@@ -249,7 +249,7 @@ events.push(function() {
 
 /* link the ipsec interface magically */
 if (ipsec_enabled()) {
-	$ifdescrs['enc0'] = "IPsec";
+	$ifdescrs['enc0'] = gettext("IPsec");
 }
 
 ?>
diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php
index d958a67..ca516b6 100644
--- a/src/usr/local/www/status_openvpn.php
+++ b/src/usr/local/www/status_openvpn.php
@@ -160,7 +160,7 @@ include("head.inc"); ?>
 							<a
 							   onclick="killClient('<?=$server['mgmt'];?>', '<?=$conn['remote_host'];?>');" style="cursor:pointer;"
 							   id="<?php echo "i:{$server['mgmt']}:{$conn['remote_host']}"; ?>"
-							   title="<?php echo gettext("Kill client connection from") . " " . $conn['remote_host']; ?>">
+							   title="<?php echo sprintf(gettext("Kill client connection from %s"), $conn['remote_host']); ?>">
 							<i class="fa fa-times"></i>
 							</a>
 						</td>
diff --git a/src/usr/local/www/status_wireless.php b/src/usr/local/www/status_wireless.php
index bdd805d..4211a4e 100644
--- a/src/usr/local/www/status_wireless.php
+++ b/src/usr/local/www/status_wireless.php
@@ -244,9 +244,9 @@ display_top_tabs($tab_array);
 </form>
 <div class="infoblock">
 <?php
-print_info_box('<b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power saving mode<br />' .
+print_info_box(gettext('<b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power saving mode<br />' .
 			   '<b>Capabilities:</b> E = ESS (infrastructure mode), I = IBSS (ad-hoc mode), P = privacy (WEP/TKIP/AES), ' .
-			   'S = Short preamble, s = Short slot time', 'info');
+			   'S = Short preamble, s = Short slot time'), 'info', false);
 ?>
 </div>
 <?php