Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[23.05] luci-app-simple-adblock: bugfix: unsupported DNS options display #6489

Merged
merged 1 commit into from
Jul 29, 2023
Merged

[23.05] luci-app-simple-adblock: bugfix: unsupported DNS options display #6489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion applications/luci-app-simple-adblock/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk

PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <[email protected]>
PKG_VERSION:=1.9.5-1
PKG_VERSION:=1.9.5-3

LUCI_TITLE:=Simple Adblock Web UI
LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
Expand Down
4 changes: 2 additions & 2 deletions applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ var RPC = {
var status = baseclass.extend({
render: function () {
return Promise.all([
L.resolveDefault(getInitStatus(), {}),
L.resolveDefault(getInitStatus(pkg.Name), {}),
]).then(function (data) {
var replyStatus = data[0];
var text ="";
Expand All @@ -103,7 +103,7 @@ var status = baseclass.extend({
var header = E('h2', {}, _("Simple AdBlock - Status"))
var statusTitle = E('label', { class: 'cbi-value-title' }, _("Service Status"));
if (reply.version) {
text += _("Version: %s").format(reply.version) + " - ";
text += _("Version %s").format(reply.version) + " - ";
switch (reply.status) {
case 'statusSuccess':
text += statusTable[reply.status] + ".";
Expand Down
6 changes: 3 additions & 3 deletions ...ions/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ return view.extend({

render: function () {
return Promise.all([
L.resolveDefault(adb.getPlatformSupport(), {}),
L.resolveDefault(adb.getPlatformSupport(pkg.Name), {}),
]).then(function (data) {
var replyPlatform = data[0];
var status, m, s, o;
Expand Down Expand Up @@ -71,10 +71,10 @@ return view.extend({
}
else {
if (!(replyPlatform[pkg.Name].dnsmasq_ipset_support)) {
text += _("Please note that %s is not supported on this system.").format("<i>dnsmasq.ipset</i>") + "<br />";
text += "<br />" + _("Please note that %s is not supported on this system.").format("<i>dnsmasq.ipset</i>");
}
if (!(replyPlatform[pkg.Name].dnsmasq_nftset_support)) {
text += _("Please note that %s is not supported on this system.").format("<i>dnsmasq.nftset</i>") + "<br />";
text += "<br />" + _("Please note that %s is not supported on this system.").format("<i>dnsmasq.nftset</i>");
}
}
if (!(replyPlatform[pkg.Name].unbound_installed)) {
Expand Down
2 changes: 1 addition & 1 deletion applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ msgid "Verbose output"
msgstr ""

#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js:106
msgid "Version: %s"
msgid "Version %s"
msgstr ""

#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js:98
Expand Down