From: Stan Grishin Date: Thu, 11 Apr 2024 16:31:29 +0000 (+0000) Subject: luci-app-pbr: sync with principal package X-Git-Url: http://git.openwrt.org/openwrt/docs.git?p=project%2Fluci.git;a=commitdiff_plain;h=fa71bb482534f0243d43fa3407480d82d1bd0a39 luci-app-pbr: sync with principal package Signed-off-by: Stan Grishin --- diff --git a/applications/luci-app-pbr/Makefile b/applications/luci-app-pbr/Makefile index 7a1c510883..97fa675e2d 100644 --- a/applications/luci-app-pbr/Makefile +++ b/applications/luci-app-pbr/Makefile @@ -3,17 +3,26 @@ include $(TOPDIR)/rules.mk +PKG_NAME:=luci-app-pbr PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin -PKG_VERSION:=1.1.4-r7 +PKG_VERSION:=1.1.4 +PKG_RELEASE:=r15 LUCI_TITLE:=Policy Based Routing Service Web UI LUCI_DESCRIPTION:=Provides Web UI for Policy Based Routing Service. -LUCI_DEPENDS:=+luci-base +jsonfilter +pbr-service -LUCI_PKGARCH:=all +LUCI_DEPENDS:=+luci-base +jsonfilter +pbr PKG_PROVIDES:=luci-app-vpnbypass luci-app-vpn-policy-routing +define Package/$(PKG_NAME)/config +# shown in make menuconfig +help + $(LUCI_TITLE) + . + Version: $(PKG_VERSION)-$(PKG_RELEASE) +endef + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js b/applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js index 99a6e73844..0367512836 100644 --- a/applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js +++ b/applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js @@ -291,6 +291,12 @@ var status = baseclass.extend({ errorNoWanGateway: _( "The %s service failed to discover WAN gateway" ).format(pkg.Name), + errorNoWanInterface: _( + "The %s inteface not found, you need to set the 'pbr.config.procd_wan_interface' option" + ), + errorNoWanInterfaceHint: _( + "Refer to https://docs.openwrt.melmac.net/pbr/#procd_wan_interface" + ), errorIpsetNameTooLong: _( "The ipset name '%s' is longer than allowed 31 characters" ), @@ -354,6 +360,7 @@ var status = baseclass.extend({ errorFileSchemaRequiresCurl: _( "The file:// schema requires curl, but it's not detected on this system!" ), + errorTryFailed: _("Command failed: %s"), }; var errorsTitle = E( "label", diff --git a/applications/luci-app-pbr/po/templates/pbr.pot b/applications/luci-app-pbr/po/templates/pbr.pot index a516be3d8e..945ef55d5c 100644 --- a/applications/luci-app-pbr/po/templates/pbr.pot +++ b/applications/luci-app-pbr/po/templates/pbr.pot @@ -2,7 +2,7 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" #: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:215 -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:310 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:316 msgid "%s" msgstr "" @@ -66,6 +66,10 @@ msgstr "" msgid "Chain" msgstr "" +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:363 +msgid "Command failed: %s" +msgstr "" + #: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:79 msgid "Condensed output" msgstr "" @@ -82,7 +86,7 @@ msgstr "" msgid "Custom User File Includes" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:313 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:319 msgid "Custom user file '%s' not found or empty" msgstr "" @@ -98,7 +102,7 @@ msgstr "" msgid "Default ICMP Interface" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:487 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:494 msgid "Disable" msgstr "" @@ -108,7 +112,7 @@ msgstr "" msgid "Disabled" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:481 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:488 msgid "Disabling %s service" msgstr "" @@ -134,7 +138,7 @@ msgstr "" msgid "Do not enforce policies when their gateway is down" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:468 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:475 msgid "Enable" msgstr "" @@ -145,15 +149,15 @@ msgstr "" msgid "Enabled" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:462 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:469 msgid "Enabling %s service" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:315 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:321 msgid "Error running custom user file '%s'" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:376 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:383 msgid "Errors encountered, please check the %sREADME%s!" msgstr "" @@ -163,31 +167,31 @@ msgid "" "QoS. Change with caution together with" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:353 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:359 msgid "Failed to download '%s'!" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:351 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:357 msgid "Failed to download '%s', HTTPS is not supported!" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:346 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:352 msgid "Failed to install fw4 nft file '%s'" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:312 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:318 msgid "Failed to reload '%s'" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:342 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:348 msgid "Failed to resolve '%s'" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:311 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:317 msgid "Failed to set up '%s'" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:319 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:325 msgid "Failed to set up any gateway" msgstr "" @@ -225,11 +229,11 @@ msgstr "" msgid "Insert" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:337 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:343 msgid "Insertion failed for IPv4 for policy '%s'" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:334 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:340 msgid "Insertion failed for both IPv4 and IPv6 for policy '%s'" msgstr "" @@ -245,7 +249,7 @@ msgstr "" msgid "Invalid OpenVPN config for %s interface" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:344 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:350 msgid "Invalid OpenVPN config for '%s' interface" msgstr "" @@ -257,7 +261,7 @@ msgstr "" msgid "Local ports" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:328 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:334 msgid "Mismatched IP family between in policy '%s'" msgstr "" @@ -318,19 +322,19 @@ msgstr "" msgid "Policies" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:308 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:314 msgid "Policy '%s' has an unknown interface" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:306 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:312 msgid "Policy '%s' has no assigned interface" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:304 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:310 msgid "Policy '%s' has no source/destination parameters" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:348 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:354 msgid "" "Policy '%s' refers to URL which can't be downloaded in 'secure_reload' mode!" msgstr "" @@ -355,10 +359,14 @@ msgstr "" msgid "Protocol" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:340 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:346 msgid "Received empty tid/mark or interface name when setting up routing" msgstr "" +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:298 +msgid "Refer to https://docs.openwrt.melmac.net/pbr/#procd_wan_interface" +msgstr "" + #: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:308 msgid "Remote addresses / domains" msgstr "" @@ -367,7 +375,7 @@ msgstr "" msgid "Remote ports" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:320 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:326 msgid "Resolver '%s'" msgstr "" @@ -389,11 +397,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:430 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:437 msgid "Restart" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:424 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:431 msgid "Restarting %s service" msgstr "" @@ -419,11 +427,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:513 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:520 msgid "Service Control" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:361 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:368 msgid "Service Errors" msgstr "" @@ -450,15 +458,15 @@ msgid "" "%sREADME%s for details." msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:322 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:328 msgid "Skipping IPv6 policy '%s' as IPv6 support is disabled" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:411 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:418 msgid "Start" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:405 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:412 msgid "Starting %s service" msgstr "" @@ -472,7 +480,7 @@ msgstr "" msgid "Status" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:449 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:456 msgid "Stop" msgstr "" @@ -484,7 +492,7 @@ msgstr "" msgid "Stopped." msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:443 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:450 msgid "Stopping %s service" msgstr "" @@ -508,7 +516,7 @@ msgstr "" msgid "Suppress/No output" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:314 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:320 msgid "Syntax error in custom user file '%s'" msgstr "" @@ -516,6 +524,12 @@ msgstr "" msgid "The %s indicates default gateway. See the %sREADME%s for details." msgstr "" +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:295 +msgid "" +"The %s inteface not found, you need to set the 'pbr.config." +"procd_wan_interface' option" +msgstr "" + #: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:104 #: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:114 #: applications/luci-app-pbr/htdocs/luci-static/resources/view/pbr/overview.js:124 @@ -540,31 +554,31 @@ msgstr "" msgid "The WebUI application is outdated (version %s), please update it" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:355 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:361 msgid "The file:// schema requires curl, but it's not detected on this system!" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:295 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:301 msgid "The ipset name '%s' is longer than allowed 31 characters" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:298 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:304 msgid "The nft set name '%s' is longer than allowed 255 characters" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:301 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:307 msgid "Unexpected exit or service termination: '%s'" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:373 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:380 msgid "Unknown error!" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:325 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:331 msgid "Unknown packet mark for interface '%s'" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:331 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:337 msgid "Unknown protocol in policy '%s'" msgstr "" @@ -572,7 +586,7 @@ msgstr "" msgid "Unknown warning" msgstr "" -#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:317 +#: applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js:323 msgid "" "Use of 'curl' is detected in custom user file '%s', but 'curl' isn't " "installed"