luci-app-pbr: update to sync with principal package 7368/head
authorStan Grishin <stangri@melmac.ca>
Thu, 31 Oct 2024 01:59:47 +0000 (01:59 +0000)
committerStan Grishin <stangri@melmac.ca>
Thu, 31 Oct 2024 01:59:47 +0000 (01:59 +0000)
Signed-off-by: Stan Grishin <stangri@melmac.ca>
applications/luci-app-pbr/Makefile
applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js
applications/luci-app-pbr/po/templates/pbr.pot
applications/luci-app-pbr/root/usr/libexec/rpcd/luci.pbr

index 340533714964f4bc8dc837db27d62c009dae415b..fb166677e65a2804689dc28c1d875999ada20f42 100644 (file)
@@ -7,7 +7,7 @@ PKG_NAME:=luci-app-pbr
 PKG_LICENSE:=AGPL-3.0-or-later
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 PKG_VERSION:=1.1.7
-PKG_RELEASE:=29
+PKG_RELEASE:=47
 
 LUCI_TITLE:=Policy Based Routing Service Web UI
 LUCI_URL:=https://github.com/stangri/luci-app-pbr/
index c8675423dbcb8eb4e93ef59970911eb8949d81a8..09f746eaa94366bdf7202a1349495027b3e469de 100644 (file)
@@ -11,7 +11,7 @@ var pkg = {
                return "pbr";
        },
        get ReadmeCompat() {
-               return "1.1.7-29";
+               return "1.1.7-39";
        },
        get URL() {
                return (
@@ -267,7 +267,7 @@ var status = baseclass.extend({
                                        ),
                                        warningDhcpLanForce: _(
                                                _(
-                                                       "Please set 'dhcp.lan.force=1' to speed up service start-up %s(more info)%s"
+                                                       "Please set 'dhcp.%%s.force=1' to speed up service start-up %s(more info)%s"
                                                ).format(
                                                        "<a href='" +
                                                                pkg.URL +
@@ -409,6 +409,9 @@ var status = baseclass.extend({
                                        errorDefaultFw4TableMissing: _("Default fw4 table '%s' is missing"),
                                        errorDefaultFw4ChainMissing: _("Default fw4 chain '%s' is missing"),
                                        errorRequiredBinaryMissing: _("Required binary '%s' is missing"),
+                                       errorInterfaceRoutingUnknownDevType: _(
+                                               "Unknown IPv6 Link type for device '%s'"
+                                       ),
                                };
                                var errorsTitle = E(
                                        "label",
index 281d5b7921a864edfab0ae91a5c22f00bb034382..cd347bff334bc20505e5d454e226f23faf029f9b 100644 (file)
@@ -113,7 +113,7 @@ msgstr ""
 msgid "Default fw4 table '%s' is missing"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:542
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:545
 msgid "Disable"
 msgstr ""
 
@@ -123,7 +123,7 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:536
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:539
 msgid "Disabling %s service"
 msgstr ""
 
@@ -149,11 +149,11 @@ msgstr ""
 msgid "Do not enforce policies when their gateway is down"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:589
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:592
 msgid "Donate to the Project"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:523
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:526
 msgid "Enable"
 msgstr ""
 
@@ -165,7 +165,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:517
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:520
 msgid "Enabling %s service"
 msgstr ""
 
@@ -173,7 +173,7 @@ msgstr ""
 msgid "Error running custom user file '%s'"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:431
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:434
 msgid "Errors encountered, please check the %sREADME%s"
 msgstr ""
 
@@ -332,7 +332,7 @@ msgid "Path"
 msgstr ""
 
 #: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:215
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:597
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:600
 msgid "Please %sdonate%s to support development of this project."
 msgstr ""
 
@@ -342,7 +342,7 @@ msgstr ""
 
 #: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:270
 msgid ""
-"Please set 'dhcp.lan.force=1' to speed up service start-up %s(more info)%s"
+"Please set 'dhcp.%%s.force=1' to speed up service start-up %s(more info)%s"
 msgstr ""
 
 #: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:248
@@ -452,11 +452,11 @@ msgid ""
 "Resolver set support (%s) requires nftables, but nft binary cannot be found"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:485
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:488
 msgid "Restart"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:479
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:482
 msgid "Restarting %s service"
 msgstr ""
 
@@ -482,11 +482,11 @@ msgstr ""
 msgid "Select Add for -A/add and Insert for -I/Insert."
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:568
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:571
 msgid "Service Control"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:416
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:419
 msgid "Service Errors"
 msgstr ""
 
@@ -517,11 +517,11 @@ msgstr ""
 msgid "Skipping IPv6 policy '%s' as IPv6 support is disabled"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:466
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:469
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:460
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:463
 msgid "Starting %s service"
 msgstr ""
 
@@ -535,7 +535,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:504
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:507
 msgid "Stop"
 msgstr ""
 
@@ -547,7 +547,7 @@ msgstr ""
 msgid "Stopped."
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:498
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:501
 msgid "Stopping %s service"
 msgstr ""
 
@@ -625,7 +625,11 @@ msgstr ""
 msgid "Unexpected exit or service termination: '%s'"
 msgstr ""
 
-#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:428
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:413
+msgid "Unknown IPv6 Link type for device '%s'"
+msgstr ""
+
+#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:431
 msgid "Unknown error!"
 msgstr ""
 
index 25bb277c726419ad7899a876e325b5ef2bbcf1f4..477137f9047a7c7173a73c54fa03b63058cd664c 100755 (executable)
@@ -11,7 +11,7 @@
 # ubus -S call luci.pbr getGateways '{"name": "pbr" }'
 # ubus -S call luci.pbr getInterfaces '{"name": "pbr" }'
 
-readonly luciCompat='9'
+readonly luciCompat='11'
 readonly pbrFunctionsFile='/etc/init.d/pbr'
 if [ -s "$pbrFunctionsFile" ]; then
 # shellcheck source=../../../../../pbr/files/etc/init.d/pbr