From 98128ad6b472da8a156d7b4f88d226e764cc62f4 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 27 Jan 2016 22:03:25 +0545 Subject: Internationalization of various status*.php --- src/usr/local/www/status_captiveportal.php | 2 +- src/usr/local/www/status_carp.php | 16 ++++++++-------- src/usr/local/www/status_filter_reload.php | 6 +++--- src/usr/local/www/status_gateways.php | 6 +++--- src/usr/local/www/status_graph.php | 6 +++--- src/usr/local/www/status_openvpn.php | 2 +- src/usr/local/www/status_wireless.php | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/usr') 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:


' . gettext('Services->Captive portal') . ''); + print_info_box(sprintf(gettext('No captive portal zones have been configured. You may add new zones here: %1$sServices->Captive portal%2$s'), '', '')); ?>
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.") . "
" . - gettext("Check the link status on all interfaces with configured CARP VIPs.") . "
" . - gettext("Search the") . - " " . - gettext("system log") . - " " . - gettext("for CARP demotion-related events.") . "

" . + gettext("CARP has detected a problem and this unit has been demoted to BACKUP status.") . + "
" . + gettext("Check the link status on all interfaces with configured CARP VIPs.") . + "
" . + sprintf(gettext('Search the %1$sSystem Log%2$s for CARP demotion-related events.'), "", "") . + "

" . '', '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");

- + " name="reloadfilter" id="reloadfilter" /> - + " name="syncfilter" id="syncfilter" /> @@ -114,7 +114,7 @@ endif;
-
.
+
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); -
Last checked +
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"); ?> " - title=""> + title=""> 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);
Flags: A = authorized, E = Extended Rate (802.11g), P = Power saving mode
' . +print_info_box(gettext('Flags: A = authorized, E = Extended Rate (802.11g), P = Power saving mode
' . 'Capabilities: 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); ?>