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

luci-app-adblock-fast: update to sync with principal package #7369

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+62 −44
Open

luci-app-adblock-fast: update to sync with principal package #7369

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-adblock-fast/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PKG_NAME:=luci-app-adblock-fast
PKG_LICENSE:=AGPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <[email protected]>
PKG_VERSION:=1.1.2
PKG_RELEASE:=3
PKG_RELEASE:=10

LUCI_TITLE:=AdBlock-Fast Web UI
LUCI_URL:=https://github.com/stangri/luci-app-adblock-fast/
Expand Down
8 changes: 5 additions & 3 deletions applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,7 @@ var status = baseclass.extend({
"The %s failed to discover WAN gateway"
).format(pkg.Name),
errorOutputDirCreate: _("Failed to create directory for %s file"),
errorOutputFileCreate: _("Failed to create '%s' file").format(
outputFile
),
errorOutputFileCreate: _("Failed to create '%s' file"),
errorFailDNSReload: _("Failed to restart/reload DNS resolver"),
errorSharedMemory: _("Failed to access shared memory"),
errorSorting: _("Failed to sort data file"),
Expand Down Expand Up @@ -304,6 +302,10 @@ var status = baseclass.extend({
errorTooLittleRam: _(
"Free ram (%s) is not enough to process all enabled block-lists"
),
errorCreatingBackupFile: _("failed to create backup file %s"),
errorDeletingDataFile: _("failed to delete data file %s"),
errorRestoringBackupFile: _("failed to restore backup file %s"),
errorNoOutputFile: _("failed to create final block-list %s"),
};
var errorsTitle = E(
"label",
Expand Down
94 changes: 55 additions & 39 deletions applications/luci-app-adblock-fast/po/templates/adblock-fast.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ msgid ""
"Directory for compressed cache file of block-list in the persistent memory."
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:446
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:448
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:347
msgid "Disable"
msgstr ""
Expand All @@ -184,7 +184,7 @@ msgstr ""
msgid "Disabled"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:440
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:442
msgid "Disabling %s service"
msgstr ""

Expand Down Expand Up @@ -213,7 +213,7 @@ msgstr ""
msgid "Downloading lists"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:427
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:429
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:348
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:502
msgid "Enable"
Expand All @@ -228,111 +228,111 @@ msgstr ""
msgid "Enables debug output to /tmp/adblock-fast.log."
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:421
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:423
msgid "Enabling %s service"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:46
msgid "Error"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:320
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:322
msgid "Errors encountered, please check the %sREADME%s"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:48
msgid "Fail"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:268
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:266
msgid "Failed to access shared memory"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:264
msgid "Failed to create '%s' file"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:286
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:284
msgid "Failed to create block-list or restart DNS resolver"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:277
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:275
msgid "Failed to create compressed cache"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:263
msgid "Failed to create directory for %s file"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:298
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:296
msgid "Failed to create output/cache/gzip file directory"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:300
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:298
msgid "Failed to detect format %s"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:293
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:291
msgid "Failed to download %s"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:291
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:289
msgid "Failed to download Config Update file"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:272
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:270
msgid "Failed to format data file"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:281
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:279
msgid "Failed to move '%s' to '%s'"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:274
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:272
msgid "Failed to move temporary data file to '%s'"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:270
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:268
msgid "Failed to optimize data file"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:295
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:293
msgid "Failed to parse %s"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:294
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:292
msgid "Failed to parse Config Update file"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:271
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:269
msgid "Failed to process allow-list"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:289
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:287
msgid "Failed to reload/restart DNS resolver"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:279
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:277
msgid "Failed to remove temporary files"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:267
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:265
msgid "Failed to restart/reload DNS resolver"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:269
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:267
msgid "Failed to sort data file"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:126
msgid "Failed to start"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:288
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:286
msgid "Failed to stop %s"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:280
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:278
msgid "Failed to unpack compressed cache"
msgstr ""

Expand All @@ -357,15 +357,15 @@ msgstr ""
msgid "Force Router DNS server to all local devices"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:368
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:370
msgid "Force redownloading %s block lists"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:306
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:305
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:303
msgid "Free ram (%s) is not enough to process all enabled block-lists"
msgstr ""

Expand Down Expand Up @@ -431,11 +431,11 @@ msgstr ""
msgid "No AdBlock on dnsmasq"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:296
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:294
msgid "No HTTPS/SSL support on device"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:302
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:300
msgid "No blocked list URLs nor blocked-domains enabled"
msgstr ""

Expand All @@ -447,11 +447,11 @@ msgstr ""
msgid "Output Verbosity Setting"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:389
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:391
msgid "Pause"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:384
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:386
msgid "Pausing %s"
msgstr ""

Expand Down Expand Up @@ -489,7 +489,7 @@ msgstr ""
msgid "Processing lists"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:374
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:376
msgid "Redownload"
msgstr ""

Expand All @@ -498,11 +498,11 @@ msgstr ""
msgid "Restarting"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:487
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:489
msgid "Service Control"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:311
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:313
msgid "Service Errors"
msgstr ""

Expand Down Expand Up @@ -534,7 +534,7 @@ msgstr ""
msgid "Some recommended packages are missing"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:355
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:357
msgid "Start"
msgstr ""

Expand All @@ -543,15 +543,15 @@ msgstr ""
msgid "Starting"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:349
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:351
msgid "Starting %s service"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:72
msgid "Status"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:408
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:410
msgid "Stop"
msgstr ""

Expand All @@ -564,7 +564,7 @@ msgstr ""
msgid "Stopped"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:402
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:404
msgid "Stopping %s service"
msgstr ""

Expand Down Expand Up @@ -634,7 +634,7 @@ msgstr ""
msgid "Unknown"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:318
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:320
msgid "Unknown error"
msgstr ""

Expand Down Expand Up @@ -707,6 +707,22 @@ msgstr ""
msgid "dnsmasq servers file"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:305
msgid "failed to create backup file %s"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:308
msgid "failed to create final block-list %s"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:306
msgid "failed to delete data file %s"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:307
msgid "failed to restore backup file %s"
msgstr ""

#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:334
msgid "none"
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='2'
readonly luciCompat='3'
readonly adbFunctionsFile='/etc/init.d/adblock-fast'
if [ -s "$adbFunctionsFile" ]; then
# shellcheck source=../../../../../adblock-fast/files/etc/init.d/adblock-fast
Expand Down