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-pbr: update to sync with principal package #7368

Merged
merged 1 commit into from
Oct 31, 2024
+28 −21
Merged

luci-app-pbr: update to sync with principal package #7368

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-pbr/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-pbr
PKG_LICENSE:=AGPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <[email protected]>
PKG_VERSION:=1.1.7
PKG_RELEASE:=29
PKG_RELEASE:=47

LUCI_TITLE:=Policy Based Routing Service Web UI
LUCI_URL:=https://github.com/stangri/luci-app-pbr/
Expand Down
7 changes: 5 additions & 2 deletions applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var pkg = {
return "pbr";
},
get ReadmeCompat() {
return "1.1.7-29";
return "1.1.7-39";
},
get URL() {
return (
Expand Down Expand Up @@ -267,7 +267,7 @@ var status = baseclass.extend({
),
warningDhcpLanForce: _(
_(
"Please set 'dhcp.lan.force=1' to speed up service start-up %s(more info)%s"
"Please set 'dhcp.%%s.force=1' to speed up service start-up %s(more info)%s"
).format(
"<a href='" +
pkg.URL +
Expand Down Expand Up @@ -409,6 +409,9 @@ var status = baseclass.extend({
errorDefaultFw4TableMissing: _("Default fw4 table '%s' is missing"),
errorDefaultFw4ChainMissing: _("Default fw4 chain '%s' is missing"),
errorRequiredBinaryMissing: _("Required binary '%s' is missing"),
errorInterfaceRoutingUnknownDevType: _(
"Unknown IPv6 Link type for device '%s'"
),
};
var errorsTitle = E(
"label",
Expand Down
38 changes: 21 additions & 17 deletions applications/luci-app-pbr/po/templates/pbr.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ msgstr ""
msgid "Default fw4 table '%s' is missing"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:542
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:545
msgid "Disable"
msgstr ""

Expand All @@ -123,7 +123,7 @@ msgstr ""
msgid "Disabled"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:536
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:539
msgid "Disabling %s service"
msgstr ""

Expand All @@ -149,11 +149,11 @@ msgstr ""
msgid "Do not enforce policies when their gateway is down"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:589
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:592
msgid "Donate to the Project"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:523
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:526
msgid "Enable"
msgstr ""

Expand All @@ -165,15 +165,15 @@ msgstr ""
msgid "Enabled"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:517
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:520
msgid "Enabling %s service"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:363
msgid "Error running custom user file '%s'"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:431
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:434
msgid "Errors encountered, please check the %sREADME%s"
msgstr ""

Expand Down Expand Up @@ -332,7 +332,7 @@ msgid "Path"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:215
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:597
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:600
msgid "Please %sdonate%s to support development of this project."
msgstr ""

Expand All @@ -342,7 +342,7 @@ msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:270
msgid ""
"Please set 'dhcp.lan.force=1' to speed up service start-up %s(more info)%s"
"Please set 'dhcp.%%s.force=1' to speed up service start-up %s(more info)%s"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:248
Expand Down Expand Up @@ -452,11 +452,11 @@ msgid ""
"Resolver set support (%s) requires nftables, but nft binary cannot be found"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:485
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:488
msgid "Restart"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:479
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:482
msgid "Restarting %s service"
msgstr ""

Expand All @@ -482,11 +482,11 @@ msgstr ""
msgid "Select Add for -A/add and Insert for -I/Insert."
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:568
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:571
msgid "Service Control"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:416
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:419
msgid "Service Errors"
msgstr ""

Expand Down Expand Up @@ -517,11 +517,11 @@ msgstr ""
msgid "Skipping IPv6 policy '%s' as IPv6 support is disabled"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:466
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:469
msgid "Start"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:460
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:463
msgid "Starting %s service"
msgstr ""

Expand All @@ -535,7 +535,7 @@ msgstr ""
msgid "Status"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:504
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:507
msgid "Stop"
msgstr ""

Expand All @@ -547,7 +547,7 @@ msgstr ""
msgid "Stopped."
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:498
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:501
msgid "Stopping %s service"
msgstr ""

Expand Down Expand Up @@ -625,7 +625,11 @@ msgstr ""
msgid "Unexpected exit or service termination: '%s'"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:428
#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:413
msgid "Unknown IPv6 Link type for device '%s'"
msgstr ""

#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:431
msgid "Unknown error!"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion applications/luci-app-pbr/root/usr/libexec/rpcd/luci.pbr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# ubus -S call luci.pbr getGateways '{"name": "pbr" }'
# ubus -S call luci.pbr getInterfaces '{"name": "pbr" }'

readonly luciCompat='9'
readonly luciCompat='11'
readonly pbrFunctionsFile='/etc/init.d/pbr'
if [ -s "$pbrFunctionsFile" ]; then
# shellcheck source=../../../../../pbr/files/etc/init.d/pbr
Expand Down