luci-app-adblock-fast: sync with principal

Signed-off-by: Stan Grishin <stangri@melmac.ca>

diff --git a/applications/luci-app-adblock-fast/Makefile b/applications/luci-app-adblock-fast/Makefile
index aecc7767343e79877b6346276295d89706838644..42e4af9de5d9473a06adc0bad3e7faa5a4659c27 100644 (file)
--- a/applications/luci-app-adblock-fast/Makefile
+++ b/applications/luci-app-adblock-fast/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=luci-app-adblock-fast
 PKG_LICENSE:=AGPL-3.0-or-later
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 PKG_VERSION:=1.1.2
-PKG_RELEASE:=10
+PKG_RELEASE:=16
 
 LUCI_TITLE:=AdBlock-Fast Web UI
 LUCI_URL:=https://github.com/stangri/luci-app-adblock-fast/

diff --git a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js
index 3da046c8ce2a125345b9f4ce4d1c31b64a230370..d89e22895395e0fba2bf21a61862e2984e316b46 100644 (file)
--- a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js
+++ b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js
@@ -198,7 +198,7 @@ var status = baseclass.extend({
                                                        "Use of external dnsmasq config file detected, please set '%s' option to '%s'"
                                                ).format("dns", "dnsmasq.conf"),
                                                warningMissingRecommendedPackages: _(
-                                                       "Some recommended packages are missing"
+                                                       "Missing recommended package: '%s'"
                                                ),
                                                warningOutdatedLuciPackage: _(
                                                        "The WebUI application (luci-app-adblock-fast) is outdated, please update it"

diff --git a/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot b/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot
index cbcf83ac97ff5a0cbe6928a729b776ca66a97b28..2b20743ebe1cd643c7baef3179e898686f8056bd 100644 (file)
--- a/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot
+++ b/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot
@@ -415,6 +415,10 @@ msgstr ""
 msgid "Let local devices use their own DNS servers if set"
 msgstr ""
 
+#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:201
+msgid "Missing recommended package: '%s'"
+msgstr ""
+
 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:524
 msgid "Name"
 msgstr ""
@@ -530,10 +534,6 @@ msgstr ""
 msgid "Some output"
 msgstr ""
 
-#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:201
-msgid "Some recommended packages are missing"
-msgstr ""
-
 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:357
 msgid "Start"
 msgstr ""

diff --git a/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast b/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast
index 67c6427fe6df954f4b320ee17bd4a3553691f2e9..546df1d81d4996e38a02aeb1e75d4a9a11443a94 100755 (executable)
--- a/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast
+++ b/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast
@@ -14,7 +14,7 @@
 # ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "pause" }'
 # ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "stop" }'
 
-readonly luciCompat='3'
+readonly luciCompat='4'
 readonly adbFunctionsFile='/etc/init.d/adblock-fast'
 if [ -s "$adbFunctionsFile" ]; then
 # shellcheck source=../../../../../adblock-fast/files/etc/init.d/adblock-fast