diff options
Diffstat (limited to 'src')
24 files changed, 119 insertions, 111 deletions
diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php index a8301b0..9707292 100644 --- a/src/usr/local/www/services_dhcp.php +++ b/src/usr/local/www/services_dhcp.php @@ -1058,8 +1058,8 @@ $section->addInput(new Form_Input( 'DDNS Domain', 'text', $pconfig['ddnsdomain'] -))->setHelp('Leave blank to disable dynamic DNS registration.' . '<br />' . - 'Enter the dynamic DNS domain which will be used to register client names in the DNS server.'); +))->setHelp('Leave blank to disable dynamic DNS registration.%1$s' . + 'Enter the dynamic DNS domain which will be used to register client names in the DNS server.', '<br />'); $section->addInput(new Form_Checkbox( 'ddnsforcehostname', @@ -1272,7 +1272,7 @@ $section->addClass('adnlopts'); $section->addInput(new Form_StaticText( null, '<div class="alert alert-info"> ' . gettext('Enter the DHCP option number and the value for each item to include in the DHCP lease information.') . ' ' . - sprintf(gettext('For a list of available options please visit this %1$s URL%2$s'), '<a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank">', '</a>.</div>') + sprintf(gettext('For a list of available options please visit this %1$s URL%2$s.%3$s'), '<a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank">', '</a>', '</div>') )); if (!$pconfig['numberoptions']) { diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php index c347630..269acf4 100644 --- a/src/usr/local/www/services_dhcp_edit.php +++ b/src/usr/local/www/services_dhcp_edit.php @@ -443,8 +443,8 @@ $section->addInput(new Form_IpAddress( 'IP Address', $pconfig['ipaddr'], 'V4' -))->setHelp('If an IPv4 address is entered, the address must be outside of the pool.' . '<br />' . - 'If no IPv4 address is given, one will be dynamically allocated from the pool.'); +))->setHelp('If an IPv4 address is entered, the address must be outside of the pool.%1$s' . + 'If no IPv4 address is given, one will be dynamically allocated from the pool.', '<br />'); $section->addInput(new Form_Input( 'hostname', diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php index a433698..a044a20 100644 --- a/src/usr/local/www/services_dhcpv6.php +++ b/src/usr/local/www/services_dhcpv6.php @@ -718,16 +718,16 @@ $section->addInput(new Form_Input( 'Default lease time', 'text', $pconfig['deftime'] -))->setHelp('Lease time in seconds. Used for clients that do not ask for a specific expiration time. ' . ' <br />' . - 'The default is 7200 seconds.'); +))->setHelp('Lease time in seconds. Used for clients that do not ask for a specific expiration time. %1$s' . + 'The default is 7200 seconds.', '<br />'); $section->addInput(new Form_Input( 'maxtime', 'Max lease time', 'text', $pconfig['maxtime'] -))->setHelp('Maximum lease time for clients that ask for a specific expiration time.' . ' <br />' . - 'The default is 86400 seconds.'); +))->setHelp('Maximum lease time for clients that ask for a specific expiration time. %1$s' . + 'The default is 86400 seconds.', '<br />'); $section->addInput(new Form_Checkbox( 'dhcpv6leaseinlocaltime', diff --git a/src/usr/local/www/services_dhcpv6_edit.php b/src/usr/local/www/services_dhcpv6_edit.php index ee354ff..09b3051 100644 --- a/src/usr/local/www/services_dhcpv6_edit.php +++ b/src/usr/local/www/services_dhcpv6_edit.php @@ -227,8 +227,8 @@ $section->addInput(new Form_Input( 'IPv6 address', 'text', $pconfig['ipaddrv6'] -))->setHelp('If an IPv6 address is entered, the address must be outside of the pool.' . '<br />' . - 'If no IPv6 address is given, one will be dynamically allocated from the pool.'); +))->setHelp('If an IPv6 address is entered, the address must be outside of the pool.%1$s' . + 'If no IPv6 address is given, one will be dynamically allocated from the pool.', '<br />'); $section->addInput(new Form_Input( 'hostname', diff --git a/src/usr/local/www/services_dnsmasq.php b/src/usr/local/www/services_dnsmasq.php index e964e07..090f54a 100644 --- a/src/usr/local/www/services_dnsmasq.php +++ b/src/usr/local/www/services_dnsmasq.php @@ -259,7 +259,7 @@ $section->addInput(new Form_Checkbox( ' their hostname when requesting a DHCP lease will be registered'. ' in the DNS forwarder, so that their name can be resolved.'. ' The domain in %1$sSystem: General Setup%2$s should also'. - ' be set to the proper value.','<a href="system.php">','</a>') + ' be set to the proper value.', '<a href="system.php">', '</a>') ->addClass('toggle-dhcp'); $section->addInput(new Form_Checkbox( @@ -270,7 +270,7 @@ $section->addInput(new Form_Checkbox( ))->setHelp('If this option is set, DHCP static mappings will '. 'be registered in the DNS forwarder, so that their name can be '. 'resolved. The domain in %1$sSystem: General Setup%2$s should also '. - 'be set to the proper value.','<a href="system.php">','</a>') + 'be set to the proper value.', '<a href="system.php">', '</a>') ->addClass('toggle-dhcp'); $section->addInput(new Form_Checkbox( @@ -290,9 +290,9 @@ $group->add(new Form_Checkbox( 'DNS Query Forwarding', 'Query DNS servers sequentially', $pconfig['strict_order'] -))->setHelp("If this option is set %s DNS Forwarder (dnsmasq) will ". - "query the DNS servers sequentially in the order specified (<i>System - General Setup - DNS Servers</i>), ". - "rather than all at once in parallel. ", $g['product_name']); +))->setHelp('If this option is set %1$s DNS Forwarder (dnsmasq) will '. + 'query the DNS servers sequentially in the order specified (%2$sSystem - General Setup - DNS Servers%3$s), '. + 'rather than all at once in parallel. ', $g['product_name'], '<i>', '</i>'); $group->add(new Form_Checkbox( 'domain_needed', @@ -340,8 +340,8 @@ $section->addInput(new Form_Checkbox( 'Strict interface binding', $pconfig['strictbind'] ))->setHelp('If this option is set, the DNS forwarder will only bind to the interfaces containing the IP addresses selected above, ' . - 'rather than binding to all interfaces and discarding queries to other addresses.' . '<br /><br />' . - 'This option does NOT work with IPv6. If set, dnsmasq will not bind to IPv6 addresses.'); + 'rather than binding to all interfaces and discarding queries to other addresses.%1$s' . + 'This option does NOT work with IPv6. If set, dnsmasq will not bind to IPv6 addresses.', '<br /><br />'); $section->addInput(new Form_Textarea( 'custom_options', diff --git a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php index 6df731c..4f6df88 100644 --- a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -135,18 +135,18 @@ $section->addInput(new Form_Input( '*Domain', 'text', $pconfig['domain'] -))->setHelp('Domain to override (NOTE: this does not have to be a valid TLD!)' . '<br />' . - 'e.g.: test or mycompany.localdomain or 1.168.192.in-addr.arpa'); +))->setHelp('Domain to override (NOTE: this does not have to be a valid TLD!)%1$s' . + 'e.g.: test or mycompany.localdomain or 1.168.192.in-addr.arpa', '<br />'); $section->addInput(new Form_IpAddress( 'ip', '*IP Address', $pconfig['ip'] ))->setPattern('[a-f0-9:.#!]*') - ->setHelp('IP address of the authoritative DNS server for this domain' . '<br />' . - 'e.g.: 192.168.100.100' . '<br />' . - 'Or enter # for an exclusion to pass through this host/subdomain to standard nameservers instead of a previous override.' . '<br />' . - 'Or enter ! for lookups for this host/subdomain to NOT be forwarded anywhere.'); + ->setHelp('IP address of the authoritative DNS server for this domain%1$s' . + 'e.g.: 192.168.100.100%1$s' . + 'Or enter # for an exclusion to pass through this host/subdomain to standard nameservers instead of a previous override.%1$s' . + 'Or enter ! for lookups for this host/subdomain to NOT be forwarded anywhere.', '<br />'); $section->addInput(new Form_IpAddress( 'dnssrcip', diff --git a/src/usr/local/www/services_dnsmasq_edit.php b/src/usr/local/www/services_dnsmasq_edit.php index ec27418..d6b58b2 100644 --- a/src/usr/local/www/services_dnsmasq_edit.php +++ b/src/usr/local/www/services_dnsmasq_edit.php @@ -200,23 +200,23 @@ $section->addInput(new Form_Input( 'Host', 'text', $pconfig['host'] -))->setHelp('Name of the host, without the domain part' . '<br />' . - 'e.g.: "myhost"'); +))->setHelp('Name of the host, without the domain part%1$s' . + 'e.g.: "myhost"', '<br />'); $section->addInput(new Form_Input( 'domain', '*Domain', 'text', $pconfig['domain'] -))->setHelp('Domain of the host' . '<br />' . - 'e.g.: "example.com"'); +))->setHelp('Domain of the host%1$s' . + 'e.g.: "example.com"', '<br />'); $section->addInput(new Form_IpAddress( 'ip', '*IP Address', $pconfig['ip'] -))->setHelp('IP address of the host' . '<br />' . - 'e.g.: 192.168.100.100 or fd00:abcd::1'); +))->setHelp('IP address of the host%1$s' . + 'e.g.: 192.168.100.100 or fd00:abcd::1', '<br />'); $section->addInput(new Form_Input( 'descr', diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php index 49009c7..1178bc9 100644 --- a/src/usr/local/www/services_dyndns.php +++ b/src/usr/local/www/services_dyndns.php @@ -216,7 +216,7 @@ foreach ($a_dyndns as $dyndns): </nav> <div> - <?=gettext('IP addresses appearing in <span class="text-success">green</span> are up to date with Dynamic DNS provider. ')?> + <?=sprintf(gettext('IP addresses appearing in %1$sgreen%2$s are up to date with Dynamic DNS provider. '), '<span class="text-success">', '</span>')?> <?=gettext('An update for an IP address can be forced on the edit page for that service.')?> </div> diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php index 7700f64..c14869e 100644 --- a/src/usr/local/www/services_dyndns_edit.php +++ b/src/usr/local/www/services_dyndns_edit.php @@ -298,11 +298,11 @@ $group->add(new Form_Input( $pconfig['domainname'] )); -$group->setHelp('Enter the complete fully qualified domain name. Example: myhost.dyndns.org'. '<br />' . - 'he.net tunnelbroker: Enter the tunnel ID.' . '<br />' . - 'GleSYS: Enter the record ID.' . '<br />' . - 'DNSimple: Enter only the domain name.' . '<br />' . - 'Namecheap, Cloudflare, GratisDNS: Enter the hostname and the domain separately, with the domain being the domain or subdomain zone being handled by the provider.'); +$group->setHelp('Enter the complete fully qualified domain name. Example: myhost.dyndns.org%1$s' . + 'he.net tunnelbroker: Enter the tunnel ID.%1$s' . + 'GleSYS: Enter the record ID.%1$s' . + 'DNSimple: Enter only the domain name.%1$s' . + 'Namecheap, Cloudflare, GratisDNS: Enter the hostname and the domain separately, with the domain being the domain or subdomain zone being handled by the provider.', '<br />'); $section->add($group); @@ -356,28 +356,28 @@ $section->addInput(new Form_Input( 'Username', 'text', $pconfig['username'] -))->setHelp('Username is required for all types except Namecheap, FreeDNS and Custom Entries.' . '<br />' . - 'Route 53: Enter the Access Key ID.' . '<br />' . - 'GleSYS: Enter the API user.' . '<br />' . - 'For Custom Entries, Username and Password represent HTTP Authentication username and passwords.'); +))->setHelp('Username is required for all types except Namecheap, FreeDNS and Custom Entries.%1$s' . + 'Route 53: Enter the Access Key ID.%1$s' . + 'GleSYS: Enter the API user.%1$s' . + 'For Custom Entries, Username and Password represent HTTP Authentication username and passwords.', '<br />'); $section->addPassword(new Form_Input( 'passwordfld', 'Password', 'password', $pconfig['password'] -))->setHelp('FreeDNS (freedns.afraid.org): Enter the "Authentication Token" provided by FreeDNS.' . '<br />' . - 'Route 53: Enter the Secret Access Key.' . '<br />' . - 'GleSYS: Enter the API key.' . '<br />' . - 'DNSimple: Enter the API token.'); +))->setHelp('FreeDNS (freedns.afraid.org): Enter the "Authentication Token" provided by FreeDNS.%1$s' . + 'Route 53: Enter the Secret Access Key.%1$s' . + 'GleSYS: Enter the API key.%1$s' . + 'DNSimple: Enter the API token.', '<br />'); $section->addInput(new Form_Input( 'zoneid', 'Zone ID', 'text', $pconfig['zoneid'] -))->setHelp('Route53: Enter AWS Region and Zone ID in the form REGION/ZONEID (example: "us-east-1/A1B2C3D4E5F6Z").' . '<br />' . - 'DNSimple: Enter the Record ID of record to update.'); +))->setHelp('Route53: Enter AWS Region and Zone ID in the form REGION/ZONEID (example: "us-east-1/A1B2C3D4E5F6Z").%1$s' . + 'DNSimple: Enter the Record ID of record to update.', '<br />'); $section->addInput(new Form_Input( 'updateurl', @@ -390,10 +390,10 @@ $section->addInput(new Form_Textarea( 'resultmatch', 'Result Match', $pconfig['resultmatch'] -))->sethelp('This field should be identical to what the DDNS Provider will return if the update succeeds, leave it blank to disable checking of returned results.' . '<br />' . - 'To include the new IP in the request, put %IP% in its place.' . '<br />' . - 'To include multiple possible values, separate them with a |. If the provider includes a |, escape it with \\|)' . '<br />' . - 'Tabs (\\t), newlines (\\n) and carriage returns (\\r) at the beginning or end of the returned results are removed before comparison.'); +))->sethelp('This field should be identical to what the DDNS Provider will return if the update succeeds, leave it blank to disable checking of returned results.%1$s' . + 'To include the new IP in the request, put %%IP%% in its place.%1$s' . + 'To include multiple possible values, separate them with a |. If the provider includes a |, escape it with \\|)%1$s' . + 'Tabs (\\t), newlines (\\n) and carriage returns (\\r) at the beginning or end of the returned results are removed before comparison.', '<br />'); $section->addInput(new Form_Input( 'ttl', diff --git a/src/usr/local/www/services_igmpproxy_edit.php b/src/usr/local/www/services_igmpproxy_edit.php index c28c5f5..e0abca1 100644 --- a/src/usr/local/www/services_igmpproxy_edit.php +++ b/src/usr/local/www/services_igmpproxy_edit.php @@ -171,9 +171,9 @@ $section->addInput(new Form_Select( $pconfig['type'], ['upstream' => gettext('Upstream Interface'), 'downstream' => gettext('Downstream Interface')] ))->setHelp('The upstream network interface is the outgoing interface which is responsible for communicating to available multicast data sources. ' . - 'There can only be one upstream interface.' . '<br />' . + 'There can only be one upstream interface.%1$s' . 'Downstream network interfaces are the distribution interfaces to the destination networks, where multicast clients can join groups and '. - 'receive multicast data. One or more downstream interfaces must be configured.'); + 'receive multicast data. One or more downstream interfaces must be configured.', '<br />'); $section->addInput(new Form_Input( 'threshold', diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php index 9c40909..a5fc9f4 100644 --- a/src/usr/local/www/services_ntpd.php +++ b/src/usr/local/www/services_ntpd.php @@ -218,9 +218,9 @@ $section->addInput(new Form_Select( $iflist['selected'], $iflist['options'], true -))->setHelp('Interfaces without an IP address will not be shown.' . '<br />' . - 'Selecting no interfaces will listen on all interfaces with a wildcard.' . '<br />' . - 'Selecting all interfaces will explicitly listen on only the interfaces/IPs specified.'); +))->setHelp('Interfaces without an IP address will not be shown.%1$s' . + 'Selecting no interfaces will listen on all interfaces with a wildcard.%1$s' . + 'Selecting all interfaces will explicitly listen on only the interfaces/IPs specified.', '<br />'); $timeservers = explode(' ', $config['system']['timeservers']); $maxrows = max(count($timeservers), 1); @@ -281,10 +281,11 @@ $section->addInput(new Form_Button( $section->addInput(new Form_StaticText( null, $btnaddrow -))->setHelp('For best results three to five servers should be configured here, or at least one pool.' . '<br />' . - 'The <b>Prefer</b> option indicates that NTP should favor the use of this server more than all others.' . '<br />' . - 'The <b>No Select</b> option indicates that NTP should not use this server for time, but stats for this server will be collected and displayed.' . '<br />' . - 'The <b>Is a Pool</b> option indicates this entry is a pool of NTP servers and not a single address. This is assumed for *.pool.ntp.org.'); +))->setHelp('For best results three to five servers should be configured here, or at least one pool.%1$s' . + 'The %2$sPrefer%3$s option indicates that NTP should favor the use of this server more than all others.%1$s' . + 'The %2$sNo Select%3$s option indicates that NTP should not use this server for time, but stats for this server will be collected and displayed.%1$s' . + 'The %2$sIs a Pool%3$s option indicates this entry is a pool of NTP servers and not a single address. This is assumed for *.pool.ntp.org.', + '<br />', '<b>', '</b>'); $section->addInput(new Form_Input( 'ntporphan', @@ -315,8 +316,8 @@ $section->addInput(new Form_Checkbox( null, 'Log system messages (default: disabled).', $pconfig['logsys'] -))->setHelp('These options enable additional messages from NTP to be written to the System Log ' . - '<a href="status_logs.php?logfile=ntpd">' . 'Status > System Logs > NTP' . '</a>.'); +))->setHelp('These options enable additional messages from NTP to be written to the System Log %1$sStatus > System Logs > NTP%2$s', + '<a href="status_logs.php?logfile=ntpd">', '</a>.'); // Statistics logging section $btnadv = new Form_Button( diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php index 1b4970d..4305c47 100644 --- a/src/usr/local/www/services_ntpd_gps.php +++ b/src/usr/local/www/services_ntpd_gps.php @@ -344,8 +344,8 @@ $section->addInput(new Form_Select( $pconfig['type'], array_combine($gpstypes, $gpstypes) ))->setHelp('This option allows a predefined configuration to be selected. ' . - 'Default is the configuration of pfSense 2.1 and earlier (not recommended). Select Generic if the GPS is not listed.' . '<br /><br />' . - 'The predefined configurations assume the GPS has already been set to NMEA mode.'); + 'Default is the configuration of pfSense 2.1 and earlier (not recommended). Select Generic if the GPS is not listed.%1$s' . + 'The predefined configurations assume the GPS has already been set to NMEA mode.', '<br /><br />'); $serialports = glob("/dev/cua?[0-9]{,.[0-9]}", GLOB_BRACE); diff --git a/src/usr/local/www/services_pppoe_edit.php b/src/usr/local/www/services_pppoe_edit.php index c58b9e5..0f1ee42 100644 --- a/src/usr/local/www/services_pppoe_edit.php +++ b/src/usr/local/www/services_pppoe_edit.php @@ -324,9 +324,9 @@ $section->addInput(new Form_IpAddress( 'localip', '*Server Address', $pconfig['localip'] -))->setHelp('Enter the IP address the PPPoE server should give to clients for use as their "gateway".' . '<br />' . - 'Typically this is set to an unused IP just outside of the client range.'. '<br />' . - 'NOTE: This should NOT be set to any IP address currently in use on this firewall.'); +))->setHelp('Enter the IP address the PPPoE server should give to clients for use as their "gateway".%1$s' . + 'Typically this is set to an unused IP just outside of the client range.%1$s' . + 'NOTE: This should NOT be set to any IP address currently in use on this firewall.', '<br />'); $section->addInput(new Form_IpAddress( 'remoteip', diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php index 8af551f..57b3d17 100644 --- a/src/usr/local/www/services_router_advertisements.php +++ b/src/usr/local/www/services_router_advertisements.php @@ -358,16 +358,16 @@ $section->addInput(new Form_Input( 'number', $pconfig['ravalidlifetime'], ['min' => 1, 'max' => 655350] -))->setHelp('The length of time in seconds (relative to the time the packet is sent) that the prefix is valid for the purpose of on-link determination.' . ' <br />' . -'The default is 86400 seconds.'); +))->setHelp('The length of time in seconds (relative to the time the packet is sent) that the prefix is valid for the purpose of on-link determination.%1$s' . +'The default is 86400 seconds.', '<br />'); $section->addInput(new Form_Input( 'rapreferredlifetime', 'Default preferred lifetime', 'text', $pconfig['rapreferredlifetime'] -))->setHelp('Seconds. The length of time in seconds (relative to the time the packet is sent) that addresses generated from the prefix via stateless address autoconfiguration remain preferred.' . ' <br />' . - 'The default is 14400 seconds.'); +))->setHelp('Seconds. The length of time in seconds (relative to the time the packet is sent) that addresses generated from the prefix via stateless address autoconfiguration remain preferred.%1$s' . + 'The default is 14400 seconds.', '<br />'); $section->addInput(new Form_Input( 'raminrtradvinterval', diff --git a/src/usr/local/www/services_unbound_advanced.php b/src/usr/local/www/services_unbound_advanced.php index 89be83c..c50d043 100644 --- a/src/usr/local/www/services_unbound_advanced.php +++ b/src/usr/local/www/services_unbound_advanced.php @@ -237,7 +237,7 @@ $section->addInput(new Form_Checkbox( 'Prefetch DNS Key Support', 'DNSKEYs are fetched earlier in the validation process when a Delegation signer is encountered', $pconfig['prefetchkey'] -))->setHelp('This helps lower the latency of requests but does utilize a little more CPU. See: <a href="http://en.wikipedia.org/wiki/List_of_DNS_record_types">Wikipedia</a>'); +))->setHelp('This helps lower the latency of requests but does utilize a little more CPU. See: %1$sWikipedia%2$s', '<a href="http://en.wikipedia.org/wiki/List_of_DNS_record_types">', '</a>'); $section->addInput(new Form_Checkbox( 'dnssecstripped', @@ -354,7 +354,7 @@ $section->addInput(new Form_Checkbox( 'Experimental Bit 0x20 Support', 'Use 0x-20 encoded random bits in the DNS query to foil spoofing attempts.', $pconfig['use_caps'] -))->setHelp('See the implementation <a href="https://tools.ietf.org/html/draft-vixie-dnsext-dns0x20-00">draft dns-0x20</a> for more information.'); +))->setHelp('See the implementation %1$sdraft dns-0x20%2$s for more information.', '<a href="https://tools.ietf.org/html/draft-vixie-dnsext-dns0x20-00">', '</a>'); $form->add($section); print($form); diff --git a/src/usr/local/www/services_unbound_domainoverride_edit.php b/src/usr/local/www/services_unbound_domainoverride_edit.php index 4268186..4d46435 100644 --- a/src/usr/local/www/services_unbound_domainoverride_edit.php +++ b/src/usr/local/www/services_unbound_domainoverride_edit.php @@ -133,8 +133,8 @@ $section->addInput(new Form_IpAddress( 'ip', '*IP Address', $pconfig['ip'] -))->setHelp('IP address of the authoritative DNS server for this domain. e.g.: 192.168.100.100' . '<br />' . - 'To use a non-default port for communication, append an \'@\' with the port number.')->setPattern('[a-zA-Z0-9@.:]+'); +))->setHelp('IP address of the authoritative DNS server for this domain. e.g.: 192.168.100.100%1$s' . + 'To use a non-default port for communication, append an \'@\' with the port number.', '<br />')->setPattern('[a-zA-Z0-9@.:]+'); $section->addInput(new Form_Input( 'descr', diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php index 173c563..9b54292 100644 --- a/src/usr/local/www/services_unbound_host_edit.php +++ b/src/usr/local/www/services_unbound_host_edit.php @@ -215,23 +215,23 @@ $section->addInput(new Form_Input( 'Host', 'text', $pconfig['host'] -))->setHelp('Name of the host, without the domain part' . '<br />' . - 'e.g.: "myhost"'); +))->setHelp('Name of the host, without the domain part%1$s' . + 'e.g.: "myhost"', '<br />'); $section->addInput(new Form_Input( 'domain', '*Domain', 'text', $pconfig['domain'] -))->setHelp('Domain of the host' . '<br />' . - 'e.g.: "example.com"'); +))->setHelp('Domain of the host%1$s' . + 'e.g.: "example.com"', '<br />'); $section->addInput(new Form_IpAddress( 'ip', '*IP Address', $pconfig['ip'] -))->setHelp('IP address of the host' . '<br />' . - 'e.g.: 192.168.100.100 or fd00:abcd::1'); +))->setHelp('IP address of the host%1$s' . + 'e.g.: 192.168.100.100 or fd00:abcd::1', '<br />'); $section->addInput(new Form_Input( 'descr', diff --git a/src/usr/local/www/status.php b/src/usr/local/www/status.php index 0c9e33f..b655276 100644 --- a/src/usr/local/www/status.php +++ b/src/usr/local/www/status.php @@ -138,7 +138,7 @@ function listCmds() { $rubbish = array('|', '-', '/', '.', ' '); /* fixes the <a> tag to be W3C compliant */ print('<div class="panel panel-default">'); - print('<div class="panel-heading"><h2 class="panel-title">' . gettext("Firewall Status on ") . $currentDate . '</h2></div>'); + print('<div class="panel-heading"><h2 class="panel-title">' . sprintf(gettext("Firewall Status on %s"), $currentDate) . '</h2></div>'); print('<div class="panel-body">'); print(' <div class="content">'); print("\n<p>" . gettext("This status page includes the following information") . ":\n"); @@ -325,11 +325,13 @@ $currentDate = $dateOutput[0]; $pgtitle = array($g['product_name'], "Status"); include("head.inc"); -print_info_box(gettext("Make sure all sensitive information is removed! (Passwords, etc.) before posting " . - "information from this page in public places (like mailing lists).") . '<br />' . - gettext("Common password fields in config.xml have been automatically redacted.") . '<br />' . - gettext("When the page has finished loading, the output will be stored in {$output_file}. It may be downloaded via scp or ") . - "<a href=\"/diag_command.php?dlPath={$output_file}\">" . gettext("Diagnostics > Command Prompt.") . '</a>'); +print_info_box( + gettext("Make sure all sensitive information is removed! (Passwords, etc.) before posting information from this page in public places (like mailing lists).") . + '<br />' . + gettext("Common password fields in config.xml have been automatically redacted.") . + '<br />' . + sprintf(gettext('Whenz the page has finished loading, the output will be stored in %1$s. It may be downloaded via scp or %2$sDiagnostics > Command Prompt%3$s.'), + $output_file, '<a href="/diag_command.php?dlPath=' . $output_file . '">', '</a>')); print_info_box(get_firewall_info(), 'info', false); diff --git a/src/usr/local/www/status_interfaces.php b/src/usr/local/www/status_interfaces.php index fe15d06..0c53fc4 100644 --- a/src/usr/local/www/status_interfaces.php +++ b/src/usr/local/www/status_interfaces.php @@ -119,7 +119,7 @@ foreach ($ifdescrs as $ifdescr => $ifname): showDefBtn($ifinfo['pptplink'], 'PPTP', $ifinfo['pptplink'], $ifdescr, $ifinfo['pptplink'] == "up" ? gettext("Disconnect") : gettext("Connect"), ''); showDefBtn($ifinfo['l2tplink'], 'L2TP', $ifinfo['l2tplink'], $ifdescr, $ifinfo['l2tplink'] == "up" ? gettext("Disconnect") : gettext("Connect"), ''); showDefBtn($ifinfo['ppplink'], 'PPP', $ifinfo['ppplink'], $ifdescr, ($ifinfo['ppplink'] == "up" && !$ifinfo['nodevice']) ? gettext("Disconnect") : gettext("Connect"), ''); - showDef($ifinfo['ppp_uptime'] || $ifinfo['ppp_uptime_accumulated'], gettext("Uptime") . ' ' . ($ifinfo['ppp_uptime_accumulated'] ? '(historical)':''), $ifinfo['ppp_uptime'] . $ifinfo['ppp_uptime_accumulated']); + showDef($ifinfo['ppp_uptime'] || $ifinfo['ppp_uptime_accumulated'], gettext("Uptime") . ' ' . ($ifinfo['ppp_uptime_accumulated'] ? gettext('(historical)'):''), $ifinfo['ppp_uptime'] . $ifinfo['ppp_uptime_accumulated']); showDef($ifinfo['cell_rssi'], gettext("Cell Signal (RSSI)"), $ifinfo['cell_rssi']); showDef($ifinfo['cell_mode'], gettext("Cell Mode"), $ifinfo['cell_mode']); showDef($ifinfo['cell_simstate'], gettext("Cell SIM State"), $ifinfo['cell_simstate']); @@ -174,7 +174,7 @@ foreach ($ifdescrs as $ifdescr => $ifname): showDef(isset($ifinfo['collisions']), gettext("Collisions"), $ifinfo['collisions']); } // e-o-if ($ifinfo['status'] != "down") - showDef($ifinfo['bridge'], gettext('Bridge (') . $ifinfo['bridgeint'] . ')', $ifinfo['bridge']); + showDef($ifinfo['bridge'], sprintf(gettext('Bridge (%1$s)'), $ifinfo['bridgeint']), $ifinfo['bridge']); if (file_exists("/usr/bin/vmstat")) { $real_interface = ""; @@ -202,10 +202,10 @@ foreach ($ifdescrs as $ifdescr => $ifname): <?php endforeach; -print_info_box(gettext("Using dial-on-demand will bring the connection up again if any packet ". - "triggers it. To substantiate this point: disconnecting manually ". - "will <strong>not</strong> prevent dial-on-demand from making connections ". - "to the outside! Don't use dial-on-demand if the line ". - "is to be kept disconnected."), 'warning', false); +print_info_box(sprintf(gettext('Using dial-on-demand will bring the connection up again if any packet ' . + 'triggers it. To substantiate this point: disconnecting manually ' . + 'will %1$snot%2$s prevent dial-on-demand from making connections ' . + 'to the outside! Don\'t use dial-on-demand if the line ' . + 'is to be kept disconnected.'), '<strong>', '</strong>'), 'warning', false); include("foot.inc"); ?> diff --git a/src/usr/local/www/status_ipsec.php b/src/usr/local/www/status_ipsec.php index e7727a7..5d56213 100644 --- a/src/usr/local/www/status_ipsec.php +++ b/src/usr/local/www/status_ipsec.php @@ -211,7 +211,8 @@ function print_ipsec_body() { print(ucfirst(htmlspecialchars($ikesa['state']))); if ($ikesa['state'] == 'ESTABLISHED') { - print("<br/>" . htmlspecialchars($ikesa['established']) . gettext(" seconds (") . convert_seconds_to_dhms($ikesa['established']) . gettext(") ago")); + print("<br/>"); + printf(gettext('%1$s seconds (%2$s) ago'), htmlspecialchars($ikesa['established']), convert_seconds_to_dhms($ikesa['established'])); } print("</span>"); @@ -299,9 +300,11 @@ function print_ipsec_body() { print("</td>\n"); print("<td>\n"); - print(gettext("Rekey: ") . htmlspecialchars($childsa['rekey-time']) . gettext(" seconds (") . convert_seconds_to_dhms($childsa['rekey-time']) . ")"); - print('<br/>' . gettext('Life: ') . htmlspecialchars($childsa['life-time']) . gettext(" seconds (") . convert_seconds_to_dhms($childsa['life-time']) . ")"); - print('<br/>' . gettext('Install: ') .htmlspecialchars($childsa['install-time']) . gettext(" seconds (") . convert_seconds_to_dhms($childsa['install-time']) . ")"); + printf(gettext('Rekey: %1$s seconds (%2$s)'), htmlspecialchars($childsa['rekey-time']), convert_seconds_to_dhms($childsa['rekey-time'])); + print('<br/>'); + printf(gettext('Life: %1$s seconds (%2$s)'), htmlspecialchars($childsa['life-time']), convert_seconds_to_dhms($childsa['life-time'])); + print('<br/>'); + printf(gettext('Install: %1$s seconds (%2$s)'), htmlspecialchars($childsa['install-time']), convert_seconds_to_dhms($childsa['install-time'])); print("</td>\n"); diff --git a/src/usr/local/www/status_logs_common.inc b/src/usr/local/www/status_logs_common.inc index 88b9a3e..808bec4 100644 --- a/src/usr/local/www/status_logs_common.inc +++ b/src/usr/local/www/status_logs_common.inc @@ -779,7 +779,7 @@ function manage_log_section() { $form = new Form(false); $form->setAttribute('id', 'manage-log-form')->addClass('collapse ' . $panel_state); - $section = new Form_Section(gettext('Manage') . ' ' . gettext($allowed_logs[$logfile]["name"]) . ' ' . gettext('Log'), 'manage-log-panel', COLLAPSIBLE|$panel_body_state); + $section = new Form_Section(sprintf(gettext('Manage %1$s Log'), gettext($allowed_logs[$logfile]["name"])), 'manage-log-panel', COLLAPSIBLE|$panel_body_state); $section->addInput(new Form_StaticText( '', @@ -841,9 +841,9 @@ function manage_log_section() { $pconfig['logfilesize'], ['min' => 100000, 'placeholder' => $config['syslog']['logfilesize'] ? $config['syslog']['logfilesize'] : "511488"] ))->setWidth(2); - $group->setHelp("The log is held in a constant-size circular log file. This field controls how large the log file is, and thus how many entries may exist inside the log. The default is approximately 500KB." . - '<br /><br />' . - "NOTE: The log size is changed the next time it is cleared. To immediately change the log size, first save the options to set the size, then clear the log using the \"Clear Log\" action below. "); + $group->setHelp('The log is held in a constant-size circular log file. This field controls how large the log file is, and thus how many entries may exist inside the log. The default is approximately 500KB.%1$s' . + 'NOTE: The log size is changed the next time it is cleared. To immediately change the log size, first save the options to set the size, then clear the log using the "Clear Log" action below. ', + '<br /><br />'); $section->add($group); $group = new Form_Group('Formatted/Raw Display'); @@ -926,8 +926,9 @@ function manage_log_section() { '1' => gettext('Display as column'), '2' => gettext('Display as second row') ) - ))->setHelp('Show the applied rule description below or in the firewall log rows.' . '<br />' . - 'Displaying rule descriptions for all lines in the log might affect performance with large rule sets.'); + ))->setHelp('Show the applied rule description below or in the firewall log rows.%1$s' . + 'Displaying rule descriptions for all lines in the log might affect performance with large rule sets.', + '<br />'); } diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php index 80236b4..6b83565 100644 --- a/src/usr/local/www/status_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -329,7 +329,7 @@ events.push(function() { <?php print_info_box('<a href="https://doc.pfsense.org/index.php/What_are_TCP_Flags%3F">' . gettext("TCP Flags") . '</a>: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR.' . '<br />' . - '<i class="fa fa-minus-square-o icon-primary"></i> = Add to block list., <i class="fa fa-plus-square-o icon-primary"></i> = Pass traffic, <i class="fa fa-info icon-primary"></i> = Resolve', 'info', false); + '<i class="fa fa-minus-square-o icon-primary"></i> = ' . gettext('Add to block list') . ', <i class="fa fa-plus-square-o icon-primary"></i> = ' . gettext('Pass traffic') . ', <i class="fa fa-info icon-primary"></i> = ' . gettext('Resolve'), 'info', false); ?> </div> diff --git a/src/usr/local/www/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php index f59c9c6..d431353 100644 --- a/src/usr/local/www/status_logs_settings.php +++ b/src/usr/local/www/status_logs_settings.php @@ -258,14 +258,14 @@ $section->addInput(new Form_Checkbox( 'Log firewall default blocks', 'Log packets matched from the default block rules in the ruleset', $pconfig['logdefaultblock'] -))->setHelp('Log packets that are <strong>blocked</strong> by the implicit default block rule. - Per-rule logging options are still respected.'); +))->setHelp('Log packets that are %1$sblocked%2$s by the implicit default block rule. - Per-rule logging options are still respected.', '<strong>', '</strong>'); $section->addInput(new Form_Checkbox( 'logdefaultpass', null, 'Log packets matched from the default pass rules put in the ruleset', $pconfig['logdefaultpass'] -))->setHelp('Log packets that are <strong>allowed</strong> by the implicit default pass rule. - Per-rule logging options are still respected. '); +))->setHelp('Log packets that are %1$sallowed%2$s by the implicit default pass rule. - Per-rule logging options are still respected. ', '<strong>', '</strong>'); $section->addInput(new Form_Checkbox( 'logbogons', @@ -311,8 +311,9 @@ $section->addInput(new Form_Select( '1' => gettext('Display as column'), '2' => gettext('Display as second row') ) -))->setHelp('Show the applied rule description below or in the firewall log rows.' . '<br />' . - 'Displaying rule descriptions for all lines in the log might affect performance with large rule sets.'); +))->setHelp('Show the applied rule description below or in the firewall log rows.%1$s' . + 'Displaying rule descriptions for all lines in the log might affect performance with large rule sets.', + '<br />'); $section->addInput(new Form_Checkbox( 'disablelocallogging', diff --git a/src/usr/local/www/status_wireless.php b/src/usr/local/www/status_wireless.php index 8516ff0..4f9a73f 100644 --- a/src/usr/local/www/status_wireless.php +++ b/src/usr/local/www/status_wireless.php @@ -210,9 +210,9 @@ display_top_tabs($tab_array); </form> <div class="infoblock"> <?php -print_info_box(gettext('<b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power saving mode.<br />' . - '<b>Capabilities:</b> E = ESS (infrastructure mode), I = IBSS (ad-hoc mode), P = privacy (WEP/TKIP/AES), ' . - 'S = Short preamble, s = Short slot time.'), 'info', false); +print_info_box(sprintf(gettext('%1$sFlags:%2$s A = authorized, E = Extended Rate (802.11g), P = Power saving mode.%3$s' . + '%1$sCapabilities:%2$s E = ESS (infrastructure mode), I = IBSS (ad-hoc mode), P = privacy (WEP/TKIP/AES), ' . + 'S = Short preamble, s = Short slot time.'), '<b>', '</b>', '<br />'), 'info', false); ?> </div> <?php |
