From 540bfacb0d384a2d26725a8a2c85599decee617f Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Tue, 14 Feb 2023 01:57:53 +0000 Subject: [PATCH] luci-app-https-dns-proxy: update to 2022-10-15-11 * Makefile: change dependency from luci-mod-admin-full to luci-base * Providers: add AdGuard and AdGuard Family * Bugfix: update field value in CBI, fixes https://github.com/openwrt/luci/issues/6244 Signed-off-by: Stan Grishin (cherry picked from commit 6ee377fd4b388e7878ab9bcb7e9c47e994578be2) --- applications/luci-app-https-dns-proxy/Makefile | 4 ++-- .../luasrc/model/cbi/https-dns-proxy.lua | 2 +- .../luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile index ddaee4f49d..e2e0a49c9d 100644 --- a/applications/luci-app-https-dns-proxy/Makefile +++ b/applications/luci-app-https-dns-proxy/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin -PKG_VERSION:=2021-11-22-7 +PKG_VERSION:=2022-10-15-11 LUCI_TITLE:=DNS Over HTTPS Proxy Web UI LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy -LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +https-dns-proxy +LUCI_DEPENDS:=+luci-compat +luci-base +https-dns-proxy LUCI_PKGARCH:=all include ../../luci.mk diff --git a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua index 1d7bcb0e8d..8396f46698 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua +++ b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua @@ -120,7 +120,7 @@ if packageStatusCode ~= -1 then end c = m:section(NamedSection, "config", "https-dns-proxy", translate("Configuration")) -d1 = c:option(ListValue, "update_dnsmasq_config", translate("Update DNSMASQ Config on Start/Stop"), translatef("If update option is selected, the 'DNS forwardings' section of %sDHCP and DNS%s will be automatically updated to use selected DoH providers (%smore information%s).", "", "", "", "")) +d1 = c:option(ListValue, "dnsmasq_config_update", translate("Update DNSMASQ Config on Start/Stop"), translatef("If update option is selected, the 'DNS forwardings' section of %sDHCP and DNS%s will be automatically updated to use selected DoH providers (%smore information%s).", "", "", "", "")) d1:value('*', translate("Update all configs")) local dnsmasq_num = 0 uci:foreach("dhcp", "dnsmasq", function(s) diff --git a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot index 862df2ba12..e77ce1a710 100644 --- a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot +++ b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot @@ -165,17 +165,14 @@ msgstr "" msgid "Configuration" msgstr "" -#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads-social.lua:3 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p3.lua:3 msgid "ControlD (Block Malware + Ads + Social)" msgstr "" -#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads.lua:3 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p2.lua:3 msgid "ControlD (Block Malware + Ads)" msgstr "" -#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware.lua:3 #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p1.lua:3 msgid "ControlD (Block Malware)" msgstr "" @@ -185,7 +182,6 @@ msgid "ControlD (Family)" msgstr "" #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.p0.lua:3 -#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.unfiltered.lua:3 msgid "ControlD (Unfiltered)" msgstr "" -- 2.30.2