From: Dirk Brenken <dev@brenken.org>
Date: Mon, 27 Jan 2025 22:49:18 +0000 (+0100)
Subject: luci-app-adblock: sync with adblock-4.2.4-1
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=48a351432c3cc59d35f02731c9f32674f07faaf1;p=project%2Fluci.git

luci-app-adblock: sync with adblock-4.2.4-1

Signed-off-by: Dirk Brenken <dev@brenken.org>
---

diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile
index 296ce160fc..34873c0714 100644
--- a/applications/luci-app-adblock/Makefile
+++ b/applications/luci-app-adblock/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2017-2024 Dirk Brenken (dev@brenken.org)
+# Copyright 2017-2025 Dirk Brenken (dev@brenken.org)
 # This is free software, licensed under the Apache License, Version 2.0
 
 include $(TOPDIR)/rules.mk
diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js
index 1f657651ba..9f5c6c4b06 100644
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js
@@ -12,7 +12,7 @@ return view.extend({
 		return fs.write('/etc/adblock/adblock.blacklist', value)
 			.then(function(rc) {
 				document.querySelector('textarea').value = value;
-				ui.addNotification(null, E('p', _('Blacklist changes have been saved. Refresh your adblock lists that changes take effect.')), 'info');
+				ui.addNotification(null, E('p', _('The changes to the blacklist have been saved. Reload your adblock lists for the changes to take effect.')), 'info');
 			}).catch(function(e) {
 				ui.addNotification(null, E('p', _('Unable to save changes: %s').format(e.message)));
 			});
diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
index e0df36f225..dd715ac4ae 100644
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
@@ -421,6 +421,7 @@ return view.extend({
 		o.value('dnsmasq', _('dnsmasq (/tmp/dnsmasq.d)'));
 		o.value('unbound', _('unbound (/var/lib/unbound)'));
 		o.value('named', _('bind (/var/lib/bind)'));
+		o.value('smartdns', _('smartdns (/tmp/smartdns)'));
 		o.value('kresd', _('kresd (/etc/kresd)'));
 		o.value('raw', _('raw (/tmp)'));
 		o.optional = true;
diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js
index 31e58d3c74..9ffdbbd763 100644
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js
@@ -12,7 +12,7 @@ return view.extend({
 		return fs.write('/etc/adblock/adblock.whitelist', value)
 			.then(function(rc) {
 				document.querySelector('textarea').value = value;
-				ui.addNotification(null, E('p', _('Whitelist changes have been saved. Refresh your adblock lists that changes take effect.')), 'info');
+				ui.addNotification(null, E('p', _('The changes to the whitelist have been saved. Reload your adblock lists for the changes to take effect.')), 'info');
 			}).catch(function(e) {
 				ui.addNotification(null, E('p', _('Unable to save changes: %s').format(e.message)));
 			});