From 04b42040a63a552af02148e26d3a50d0eb7bffaa Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Fri, 22 Jan 2016 14:53:29 +0545 Subject: Internationalize dashboard widgets --- .../local/www/widgets/include/captiveportal.inc | 2 +- src/usr/local/www/widgets/include/carp_status.inc | 2 +- .../local/www/widgets/include/dyn_dns_status.inc | 2 +- src/usr/local/www/widgets/include/gateways.inc | 2 +- .../local/www/widgets/include/gmirror_status.inc | 2 +- .../www/widgets/include/installed_packages.inc | 2 +- .../www/widgets/include/interface_statistics.inc | 2 +- src/usr/local/www/widgets/include/interfaces.inc | 2 +- src/usr/local/www/widgets/include/ipsec.inc | 2 +- .../local/www/widgets/include/load_balancer.inc | 2 +- src/usr/local/www/widgets/include/log.inc | 2 +- src/usr/local/www/widgets/include/ntp_status.inc | 2 +- src/usr/local/www/widgets/include/openvpn.inc | 2 +- .../local/www/widgets/include/services_status.inc | 2 +- src/usr/local/www/widgets/include/smart_status.inc | 2 +- .../local/www/widgets/include/thermal_sensors.inc | 2 +- .../local/www/widgets/include/traffic_graph.inc | 2 +- src/usr/local/www/widgets/include/wake_on_lan.inc | 2 +- .../widgets/captive_portal_status.widget.php | 6 ++-- .../www/widgets/widgets/carp_status.widget.php | 2 +- .../local/www/widgets/widgets/gateways.widget.php | 22 +++++++------- .../widgets/widgets/installed_packages.widget.php | 18 ++++++------ .../widgets/interface_statistics.widget.php | 14 ++++----- src/usr/local/www/widgets/widgets/ipsec.widget.php | 30 +++++++++---------- .../widgets/load_balancer_status.widget.php | 12 ++++---- src/usr/local/www/widgets/widgets/log.widget.php | 34 +++++++++++++--------- .../www/widgets/widgets/ntp_status.widget.php | 23 ++++++++------- .../local/www/widgets/widgets/openvpn.widget.php | 18 ++++++------ .../local/www/widgets/widgets/picture.widget.php | 4 +-- src/usr/local/www/widgets/widgets/rss.widget.php | 12 ++++---- .../www/widgets/widgets/services_status.widget.php | 16 +++++----- .../www/widgets/widgets/smart_status.widget.php | 2 +- .../widgets/widgets/system_information.widget.php | 12 ++++---- .../www/widgets/widgets/thermal_sensors.widget.php | 24 +++++++-------- .../www/widgets/widgets/traffic_graphs.widget.php | 14 ++++----- .../www/widgets/widgets/wake_on_lan.widget.php | 2 +- 36 files changed, 154 insertions(+), 147 deletions(-) diff --git a/src/usr/local/www/widgets/include/captiveportal.inc b/src/usr/local/www/widgets/include/captiveportal.inc index 3714209..8a2ea3e 100644 --- a/src/usr/local/www/widgets/include/captiveportal.inc +++ b/src/usr/local/www/widgets/include/captiveportal.inc @@ -1,4 +1,4 @@ diff --git a/src/usr/local/www/widgets/include/carp_status.inc b/src/usr/local/www/widgets/include/carp_status.inc index 63a49fe..29a05ac 100644 --- a/src/usr/local/www/widgets/include/carp_status.inc +++ b/src/usr/local/www/widgets/include/carp_status.inc @@ -1,7 +1,7 @@ diff --git a/src/usr/local/www/widgets/include/dyn_dns_status.inc b/src/usr/local/www/widgets/include/dyn_dns_status.inc index b2588db..314bb13 100644 --- a/src/usr/local/www/widgets/include/dyn_dns_status.inc +++ b/src/usr/local/www/widgets/include/dyn_dns_status.inc @@ -1,7 +1,7 @@ diff --git a/src/usr/local/www/widgets/include/gateways.inc b/src/usr/local/www/widgets/include/gateways.inc index 4666689..971c842 100644 --- a/src/usr/local/www/widgets/include/gateways.inc +++ b/src/usr/local/www/widgets/include/gateways.inc @@ -1,5 +1,5 @@ diff --git a/src/usr/local/www/widgets/include/gmirror_status.inc b/src/usr/local/www/widgets/include/gmirror_status.inc index 6547d4d..c9b2224 100644 --- a/src/usr/local/www/widgets/include/gmirror_status.inc +++ b/src/usr/local/www/widgets/include/gmirror_status.inc @@ -1,4 +1,4 @@ \ No newline at end of file diff --git a/src/usr/local/www/widgets/include/installed_packages.inc b/src/usr/local/www/widgets/include/installed_packages.inc index a978191..aa75e85 100644 --- a/src/usr/local/www/widgets/include/installed_packages.inc +++ b/src/usr/local/www/widgets/include/installed_packages.inc @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/src/usr/local/www/widgets/include/interface_statistics.inc b/src/usr/local/www/widgets/include/interface_statistics.inc index c789418..bda7aba 100644 --- a/src/usr/local/www/widgets/include/interface_statistics.inc +++ b/src/usr/local/www/widgets/include/interface_statistics.inc @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/src/usr/local/www/widgets/include/interfaces.inc b/src/usr/local/www/widgets/include/interfaces.inc index 6c19a6b..d619d23 100644 --- a/src/usr/local/www/widgets/include/interfaces.inc +++ b/src/usr/local/www/widgets/include/interfaces.inc @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/src/usr/local/www/widgets/include/ipsec.inc b/src/usr/local/www/widgets/include/ipsec.inc index 59fe454..0c8ba80 100644 --- a/src/usr/local/www/widgets/include/ipsec.inc +++ b/src/usr/local/www/widgets/include/ipsec.inc @@ -1,4 +1,4 @@ diff --git a/src/usr/local/www/widgets/include/load_balancer.inc b/src/usr/local/www/widgets/include/load_balancer.inc index 367ea46..5f89933 100644 --- a/src/usr/local/www/widgets/include/load_balancer.inc +++ b/src/usr/local/www/widgets/include/load_balancer.inc @@ -1,4 +1,4 @@ diff --git a/src/usr/local/www/widgets/include/log.inc b/src/usr/local/www/widgets/include/log.inc index d2bafb0..fa48047 100644 --- a/src/usr/local/www/widgets/include/log.inc +++ b/src/usr/local/www/widgets/include/log.inc @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/src/usr/local/www/widgets/include/ntp_status.inc b/src/usr/local/www/widgets/include/ntp_status.inc index 1115095..cb5be1a 100644 --- a/src/usr/local/www/widgets/include/ntp_status.inc +++ b/src/usr/local/www/widgets/include/ntp_status.inc @@ -1,5 +1,5 @@ diff --git a/src/usr/local/www/widgets/include/openvpn.inc b/src/usr/local/www/widgets/include/openvpn.inc index 075d0e5..8eb11c1 100644 --- a/src/usr/local/www/widgets/include/openvpn.inc +++ b/src/usr/local/www/widgets/include/openvpn.inc @@ -1,4 +1,4 @@ \ No newline at end of file diff --git a/src/usr/local/www/widgets/include/services_status.inc b/src/usr/local/www/widgets/include/services_status.inc index 685aee4..6691d42 100644 --- a/src/usr/local/www/widgets/include/services_status.inc +++ b/src/usr/local/www/widgets/include/services_status.inc @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/src/usr/local/www/widgets/include/smart_status.inc b/src/usr/local/www/widgets/include/smart_status.inc index bbfa274..cfcb9a9 100644 --- a/src/usr/local/www/widgets/include/smart_status.inc +++ b/src/usr/local/www/widgets/include/smart_status.inc @@ -1,5 +1,5 @@ diff --git a/src/usr/local/www/widgets/include/thermal_sensors.inc b/src/usr/local/www/widgets/include/thermal_sensors.inc index e6ddb58..6ec2141 100644 --- a/src/usr/local/www/widgets/include/thermal_sensors.inc +++ b/src/usr/local/www/widgets/include/thermal_sensors.inc @@ -11,7 +11,7 @@ */ //set variable for custom title -$thermal_sensors_widget_title = "Thermal Sensors"; +$thermal_sensors_widget_title = gettext("Thermal Sensors"); //$thermal_sensors_widget_link = "thermal_sensors.php"; diff --git a/src/usr/local/www/widgets/include/traffic_graph.inc b/src/usr/local/www/widgets/include/traffic_graph.inc index 3901db6..76da208 100644 --- a/src/usr/local/www/widgets/include/traffic_graph.inc +++ b/src/usr/local/www/widgets/include/traffic_graph.inc @@ -1,4 +1,4 @@ diff --git a/src/usr/local/www/widgets/include/wake_on_lan.inc b/src/usr/local/www/widgets/include/wake_on_lan.inc index af3229c..accab90 100644 --- a/src/usr/local/www/widgets/include/wake_on_lan.inc +++ b/src/usr/local/www/widgets/include/wake_on_lan.inc @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php b/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php index c325b54..c91d1c0 100644 --- a/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php +++ b/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php @@ -130,8 +130,8 @@ if ($_GET['order']) { - - + + @@ -151,7 +151,7 @@ if ($_GET['order']) { diff --git a/src/usr/local/www/widgets/widgets/carp_status.widget.php b/src/usr/local/www/widgets/widgets/carp_status.widget.php index 8884e2b..2349ede 100644 --- a/src/usr/local/www/widgets/widgets/carp_status.widget.php +++ b/src/usr/local/www/widgets/widgets/carp_status.widget.php @@ -114,7 +114,7 @@ $carp_enabled = get_carp_status(); } } else { ?> - + diff --git a/src/usr/local/www/widgets/widgets/gateways.widget.php b/src/usr/local/www/widgets/widgets/gateways.widget.php index 16cd219..ccb47ea 100644 --- a/src/usr/local/www/widgets/widgets/gateways.widget.php +++ b/src/usr/local/www/widgets/widgets/gateways.widget.php @@ -77,7 +77,7 @@ if ($_POST) { if (isset($_POST["display_type"])) { $config["widgets"]["gateways_widget"]["display_type"] = $_POST["display_type"]; } - write_config("Updated gateways widget settings via dashboard."); + write_config(gettext("Updated gateways widget settings via dashboard.")); header("Location: /"); exit(0); } @@ -130,11 +130,11 @@ if ($_POST) { } } ?> - onchange="updateGatewayDisplays();" /> Gateway IP - onchange="updateGatewayDisplays();" /> Monitor IP - onchange="updateGatewayDisplays();" /> Both + onchange="updateGatewayDisplays();" /> + onchange="updateGatewayDisplays();" /> + onchange="updateGatewayDisplays();" />

- + @@ -232,22 +232,22 @@ function compose_table_body_contents() { if ($gateways_status[$gname]) { if (stristr($gateways_status[$gname]['status'], "force_down")) { - $online = "Offline (forced)"; + $online = gettext("Offline (forced)"); $bgcolor = "danger"; // lightcoral } elseif (stristr($gateways_status[$gname]['status'], "down")) { - $online = "Offline"; + $online = gettext("Offline"); $bgcolor = "danger"; // lightcoral } elseif (stristr($gateways_status[$gname]['status'], "loss")) { - $online = "Packetloss"; + $online = gettext("Packetloss"); $bgcolor = "warning"; // khaki } elseif (stristr($gateways_status[$gname]['status'], "delay")) { - $online = "Latency"; + $online = gettext("Latency"); $bgcolor = "warning"; // khaki } elseif ($gateways_status[$gname]['status'] == "none") { - $online = "Online"; + $online = gettext("Online"); $bgcolor = "success"; // lightgreen } elseif ($gateways_status[$gname]['status'] == "") { - $online = "Pending"; + $online = gettext("Pending"); $bgcolor = "info"; // lightgray } } else { diff --git a/src/usr/local/www/widgets/widgets/installed_packages.widget.php b/src/usr/local/www/widgets/widgets/installed_packages.widget.php index 255212a..dca7c0d 100644 --- a/src/usr/local/www/widgets/widgets/installed_packages.widget.php +++ b/src/usr/local/www/widgets/widgets/installed_packages.widget.php @@ -74,8 +74,8 @@ if ($_REQUEST && $_REQUEST['ajax']) { if (empty($installed_packages)) { print("
\n"); - print(" No packages installed.\n"); - print(" You can install packages here.\n"); + print(" ". gettext("No packages installed.") . "\n"); + print(" " . gettext('You can install packages here.') . "\n"); print("
\n"); exit; } @@ -103,17 +103,17 @@ if ($_REQUEST && $_REQUEST['ajax']) { if (isset($pkg['broken'])) { $txtcolor = "text-danger"; $missing = true; - $status = 'Package is configured, but not installed!'; + $status = gettext('Package is configured, but not installed!'); } else if (isset($pkg['installed_version']) && isset($pkg['version'])) { $version_compare = pkg_version_compare( $pkg['installed_version'], $pkg['version']); if ($version_compare == '>') { // we're running a newer version of the package - $status = 'Newer than available ('. $pkg['version'] .')'; + $status = sprintf(gettext('Newer than available (%s)'), $pkg['version']); $statusicon = 'exclamation'; } else if ($version_compare == '<') { // we're running an older version of the package - $status = 'Upgrade available to '.$pkg['version']; + $status = sprintf(gettext('Upgrade available to %s'), $pkg['version']); $statusicon = 'plus-circle'; $txtcolor = "text-warning"; $upgradeavail = true; @@ -121,15 +121,15 @@ if ($_REQUEST && $_REQUEST['ajax']) { '&to=' . $pkg['version']; } else if ($version_compare == '=') { // we're running the current version - $status = 'ok'; + $status = gettext('ok'); $statusicon = 'check'; } else { - $status = 'Error comparing version'; + $status = gettext('Error comparing version'); $statusicon = 'exclamation'; } } else { // unknown available package version - $status = 'Unknown'; + $status = gettext('Unknown'); $statusicon = 'question'; } @@ -180,7 +180,7 @@ if ($_REQUEST && $_REQUEST['ajax']) {

- System -> Packages + ->

- (Updating...)

+

@@ -196,15 +196,15 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) {
IP addressMAC address - delete +
No CARP Interfaces Defined. Click here to configure CARP.
', '')?>
- Thresholds in °C (1 to 100): + °C - Display settings: +
- Zone Warning: + - +
- Zone Critical: + - +
- Core Warning: +
- Core Critical: +
- * You can configure a proper Thermal Sensor / Module under
-    System > Advanced > Miscellaneous : Thermal Sensors section. +
+     > > : .
diff --git a/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php b/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php index ffed30f..39cb3f3 100644 --- a/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php +++ b/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php @@ -102,7 +102,7 @@ if ($_POST) { } } - write_config("Updated traffic graph settings via dashboard."); + write_config(gettext("Updated traffic graph settings via dashboard.")); header("Location: /"); exit(0); } @@ -162,7 +162,7 @@ foreach ($ifdescrs as $ifname => $ifdescr):
- +
$ifdescr): ?>
- +
- +
@@ -195,7 +195,7 @@ foreach ($ifdescrs as $ifname => $ifdescr):
- +
diff --git a/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php b/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php index 90f2895..56d1250 100644 --- a/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php +++ b/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php @@ -107,5 +107,5 @@ if (count($wolcomputers) > 0) { ?> -

DHCP Leases Status

+

-- cgit v1.1