diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index f277a2c24..6f31a5eec 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,5 +1,5 @@
PLUGIN_NAME= haproxy
-PLUGIN_VERSION= 1.14
+PLUGIN_VERSION= 1.15
PLUGIN_COMMENT= Reliable, high performance TCP/HTTP load balancer
PLUGIN_DEPENDS= haproxy
PLUGIN_MAINTAINER= opnsense@moov.de
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/IndexController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/IndexController.php
index 8e0252778..b6a91b3f4 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/IndexController.php
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/IndexController.php
@@ -42,7 +42,7 @@ class IndexController extends \OPNsense\Base\IndexController
public function indexAction()
{
// set page title
- $this->view->title = "HAProxy Load Balancer";
+ $this->view->title = gettext("HAProxy Load Balancer");
// include form definitions
$this->view->mainForm = $this->getForm("main");
$this->view->formDialogFrontend = $this->getForm("dialogFrontend");
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/StatisticsController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/StatisticsController.php
index b0814052f..160f918ef 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/StatisticsController.php
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/StatisticsController.php
@@ -37,7 +37,7 @@ class StatisticsController extends \OPNsense\Base\IndexController
{
public function indexAction()
{
- $this->view->title = "HAProxy Load Balancer / Statistics";
+ $this->view->title = gettext("HAProxy Load Balancer / Statistics");
// choose template
$this->view->pick('OPNsense/HAProxy/statistics');
}
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
index cd504b932..0b0466a04 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
@@ -249,8 +249,7 @@
Y
Y
-
- /^((([0-9a-zA-Z._\-\*]+:[0-9]+(-[0-9]+)?)([,]){0,1}))*/u
+ /^((([0-9a-zA-Z._\-\*:]+:[0-9]+(-[0-9]+)?)([,]){0,1}))*/u
lower
Please provide a valid listen address, i.e. 127.0.0.1:8080 or www.example.com:443. Port range as start-end, i.e. 127.0.0.1:1220-1240.
diff --git a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/statistics.volt b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/statistics.volt
index aa4473c04..7aa2d9306 100644
--- a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/statistics.volt
+++ b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/statistics.volt
@@ -50,7 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
"| "+value+" | ");
});
} else {
- $("#infolist").html("
Error: Unable to fetch statistics. Is HAProxy running? |
");
+ $("#infolist").html("
{{ lang._('The statistics could not be fetched. Is HAProxy running?') }} |
");
}
$('#processing-dialog').modal('hide');
}
@@ -64,6 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
callback = function (data, status) {
if (status == "success") {
// status
+ $("#status_nav").show();
$("#grid-status").bootgrid('destroy');
var html = [];
$.each(data, function (key, value) {
@@ -94,6 +95,7 @@ POSSIBILITY OF SUCH DAMAGE.
callback = function (data, status) {
if (status == "success") {
// counters
+ $("#counters_nav").show();
$("#grid-counters").bootgrid('destroy');
var html = [];
$.each(data, function (key, value) {
@@ -124,6 +126,7 @@ POSSIBILITY OF SUCH DAMAGE.
callback = function (data, status) {
if (status == "success") {
// tables
+ $("#tables_nav").show();
$("#grid-tables").bootgrid('destroy');
var html = [];
$.each(data, function (key, value) {
@@ -157,9 +160,9 @@ POSSIBILITY OF SUCH DAMAGE.