lang: move dynamic gettext() foo into subdir

Create and commit the files generated by the dynamic gettext extraction,
so that we can review changes more gracefully.  Two files in the Traffic
Shaper forms don't parse right now, but I have no clue why.

Makefile

@@ -29,7 +29,8 @@ install: force
 	    xargs -n1 printf "/usr/local/%s\n"
 
 lint: force
-	find ${.CURDIR}/src ! -name "*.xml" ! -name "*.eot" \
+	find ${.CURDIR}/src ${.CURDIR}/lang/dynamic/helpers \
+	    ! -name "*.xml" ! -name "*.eot" \
 	    ! -name "*.svg" ! -name "*.woff" ! -name "*.woff2" \
 	    ! -name "*.otf" ! -name "*.png" ! -name "*.js" \
 	    ! -name "*.scss" ! -name "*.py" ! -name "*.ttf" \

lang/Makefile

@@ -18,12 +18,13 @@ ${LANG}:
 
 ${TEMPLATE}:
 	@: > ${TEMPLATE}.pot
-	# XXX bring this back
-	#${.CURDIR}/../scripts/translate/collect.py
-	cd ${.CURDIR}/.. && find src | \
+	cd ${.CURDIR}/.. && find src lang/dynamic/helpers | \
 	    xargs ${XGETTEXT} -j -o ${.CURDIR}/${TEMPLATE}.pot
 
 install: ${LANGUAGES}
 template: ${TEMPLATE}
 
-.PHONY: ${LANGUAGES} ${TEMPLATE}
+dynamic:
+	@${.CURDIR}/dynamic/collect.py ${.CURDIR}/..
+
+.PHONY: ${LANGUAGES} ${TEMPLATE} dynamic

scripts/translate/collect.py → lang/dynamic/collect.py

@@ -35,11 +35,16 @@ import glob
 import importlib
 import sys
 
+if len(sys.argv) < 2:
+    print 'Usage: collect.py rootdir'
+    sys.exit(1)
+
 # get source location (root of core package)
-OPNsenseRoot='%s/../../src/'%'/'.join(os.path.realpath(__file__).split('/')[:-1])
+OPNsenseRoot=sys.argv[1] + '/src'
 
 # create target location
-targetPath='%s/../../src/opnsense/lang_helpers/'%'/'.join(os.path.realpath(__file__).split('/')[:-1])
+targetPath=sys.argv[1] + '/lang/dynamic/helpers'
+
 if len(glob.glob(targetPath)) == 0:
     os.mkdir(targetPath)
 

lang/dynamic/helpers/controllers.php

+<?php
+/**
+ *    Copyright (C) 2015 Deciso B.V.
+ *
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/**
+ *
+ * Language support, autogenerated file
+ *
+ */
+echo gettext('Enable or disable the proxy service.');
+echo gettext('The port number where Squid sends and receives ICP queries to
+                    and from neighbor caches. Leave blank to disable (default). The standard UDP port for ICP is 3130.
+                ');
+echo gettext('Enable access logging.');
+echo gettext('Enable store logging.');
+echo gettext('
+                    Type IPs of alternative DNS servers you like to use. <div class="text-info"><b>TIP: </b>You can also paste a comma seperated list into this field.</div>');
+echo gettext('This option reverses the order of preference to make Squid contact dual-stack websites over IPv4 first.
+            Squid will still perform both IPv6 and IPv4 DNS lookups before connecting.
+            <div class="alert alert-warning"><b class="text-danger">Warning:</b> This option will restrict the situations under which IPv6
+                connectivity is used (and tested). Hiding network problems
+                which would otherwise be detected and warned about.</div>');
+echo gettext('If set (default), Squid will include a Via header in requests and
+            replies as required by RFC2616.');
+echo gettext('Select what to do with X-Forwarded for header.');
+echo gettext('Suppress Squid version string info in HTTP headers and HTML error pages.');
+echo gettext('Select what to do with URI that contain whitespaces.<br/>
+            <div class="text-info"><b>NOTE:</b> the current Squid implementation of encode and chop violates
+                RFC2616 by not using a 301 redirect after altering the URL.</div>');
+echo gettext('Enable or disable the local cache.<br/>
+        Curently only ufs directory cache type is supported.<br/>
+        <b class="text-danger">Do not enable on embedded systems with SD or CF cards as this may break your drive.</b>');
+echo gettext('Enter the storage size for the local cache (default is 100).');
+echo gettext('
+                    Enter the number of first-level subdirectories for the local cache (default is 16).');
+echo gettext('
+                    Enter the number of first-level subdirectories for the local cache (default is 256).');
+echo gettext('Enable or disable traffic management.');
+echo gettext('Enter the maxium size for downloads in kilobytes (leave empty to disable).');
+echo gettext('Enter the maxium size for uploads in kilobytes (leave empty to disable).');
+echo gettext('
+                    Enter the allowed overall bandtwith in kilobits per second (leave empty to disable).');
+echo gettext('
+                    Enter the allowed per host bandwidth in kilobits per second (leave empty to disable).');
+echo gettext('Select interface(s) the proxy will bind to.');
+echo gettext('The port the proxy service will listen to.');
+echo gettext('
+                    When enabled the subnets of the selected interfaces will be added to the allow access list.');
+echo gettext('Select interface(s) the ftp proxy will bind to.');
+echo gettext('The port the proxy service will listen to.');
+echo gettext('
+                    Type subnets you want to allow acces to the proxy server, use a comma or press Enter for new item. <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>');
+echo gettext('
+                    Type IP adresses you want to allow acces to the proxy server, use a comma or press Enter for new item. <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>');
+echo gettext('
+                    Type IP adresses you want to deny acces to the proxy server, use a comma or press Enter for new item. <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>');
+echo gettext('Whitelist destination domains.<br/>
+        You may use a regular expression, use a comma or press Enter for new item.<br/>
+        <div class="alert alert-info">
+            <b>Examples:</b><br/>
+            <b class="text-primary">.mydomain.com</b> -> matches on <b>*.mydomain.com</b><br/>
+            <b class="text-primary">^http(s|)://([a-zA-Z]+)\.mydomain\.*</b> -> matches on <b>http(s)://*.mydomain.*</b><br/>
+            <b class="text-primary">\\.+\.gif$</b> -> matches on <b>\*.gif</b> but not on <b class="text-danger">\*.gif\test</b><br/>
+            <b class="text-primary">\\.+[0-9]+\.gif$</b> -> matches on <b>\123.gif</b> but not on <b class="text-danger">\test.gif</b><br/>
+        </div>
+        <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>');
+echo gettext('Blacklist destination domains.<br/>
+        You may use a regular expression, use a comma or press Enter for new item.<br/>
+        <div class="alert alert-info">
+            <b>Examples:</b><br/>
+            <b class="text-primary">.mydomain.com</b> -> matches on <b>*.mydomain.com</b><br/>
+            <b class="text-primary">^http(s|)://([a-zA-Z]+)\.mydomain\.*</b> -> matches on <b>http(s)://*.mydomain.*</b><br/>
+            <b class="text-primary">\\.+\.gif$</b> -> matches on <b>\*.gif</b> but not on <b class="text-danger">\*.gif\test</b><br/>
+            <b class="text-primary">\\.+[0-9]+\.gif$</b> -> matches on <b>\123.gif</b> but not on <b class="text-danger">\test.gif</b><br/>
+        </div>
+        <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>');
+echo gettext('Block user-agents.<br/>
+        You may use a regular expression, use a comma or press Enter for new item.<br/>
+        <div class="alert alert-info">
+            <b>Examples:</b><br/>
+            <b class="text-primary">^(.)+Macintosh(.)+Firefox/37\.0</b> -> matches on <b>Macintosh version of Firefox revision 37.0</b><br/>
+            <b class="text-primary">^Mozilla</b> -> matches on <b>all Mozilla based browsers</b><br/>
+        </div>
+        <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>');
+echo gettext('Block specific MIME type reply.<br/>
+        You may use a regular expression, use a comma or press Enter for new item.<br/>
+        <div class="alert alert-info">
+            <b>Examples:</b><br/>
+            <b class="text-primary">video/flv</b> -> matches on <b>Flash Video</b><br/>
+            <b class="text-primary">application/x-javascript</b> -> matches on <b>javascripts</b><br/>
+        </div>
+        <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>');
+echo gettext('Allowed destination TCP ports, you may use ranges (ex. 222-226) and add comments with collon (ex. 22:ssh).<br/>
+        <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>');
+echo gettext('Allowed destination SSL ports, you may use ranges (ex. 222-226) and add comments with collon (ex. 22:ssh).<br/>
+        <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>');
+echo gettext('Select Authentication method');
+echo gettext('The prompt will be displayed in the autherntication request window.');
+echo gettext('This specifies for how long (in hours) the proxy server assumes an externally validated username and password combination is valid (Time To Live).<br/>
+            When the TTL expires, the user will be prompted for credentials again.');
+echo gettext('The total number of authenticator processes to spawn.');
+echo gettext('Total bandwidth for this pipe');
+echo gettext('number of dynamic queues, leave empty for default');
+echo gettext('Dynamic queue creation by source or destination address.
+        <li> choose destination here to share the total bandwidth of this pipe among all connected clients. </li>
+        <li> choose source to provide all connected clients up to a maximum of this pipe configured bandwidth  </li>
+        ');
+echo gettext('Description to identify this pipe.');

lang/dynamic/helpers/models.php

+<?php
+/**
+ *    Copyright (C) 2015 Deciso B.V.
+ *
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/**
+ *
+ * Language support, autogenerated file
+ *
+ */
+echo gettext('Change password');
+echo gettext('User');
+echo gettext('Certificates');
+echo gettext('Certificate Authority');
+echo gettext('Certification Revocation');
+echo gettext('Certificates');
+echo gettext('Firmware');
+echo gettext('High Availability');
+echo gettext('Routing');
+echo gettext('General');
+echo gettext('Admin Access');
+echo gettext('Firewall/NAT');
+echo gettext('Networking');
+echo gettext('Miscellaneos');
+echo gettext('System Tunables');
+echo gettext('Notifications');
+echo gettext('Settings');
+echo gettext('Setup Wizard');
+echo gettext('Users');
+echo gettext('Groups');
+echo gettext('Settings');
+echo gettext('Servers');
+echo gettext('User Manager');
+echo gettext('System');
+echo gettext('Interface Addignments');
+echo gettext('Interface Groups');
+echo gettext('Wireless');
+echo gettext('VLANs');
+echo gettext('QinQs');
+echo gettext('PPPs');
+echo gettext('GRE');
+echo gettext('GIF');
+echo gettext('Bridges');
+echo gettext('LAGG');
+echo gettext('(Assign)');
+echo gettext('Interfaces');
+echo gettext('IP');
+echo gettext('Ports');
+echo gettext('URLs');
+echo gettext('All');
+echo gettext('Aliases');
+echo gettext('Port Forward');
+echo gettext('1:1');
+echo gettext('Outbound');
+echo gettext('NPt');
+echo gettext('NAT');
+echo gettext('Floating');
+echo gettext('Interface');
+echo gettext('Rules');
+echo gettext('Schedules');
+echo gettext('By Queue');
+echo gettext('Wizards');
+echo gettext('Queues');
+echo gettext('Virtual IPs');
+echo gettext('Firewall');
+echo gettext('IP');
+echo gettext('MAC');
+echo gettext('Voucher');
+echo gettext('FileManager');
+echo gettext('Captive Portal');
+echo gettext('DHCP Relay');
+echo gettext('DHCP Server');
+echo gettext('DHCPv6 Relay');
+echo gettext('RouterAdvertisement');
+echo gettext('DHCPv6 Server/RA');
+echo gettext('DNS Filter');
+echo gettext('DNS Forwarder');
+echo gettext('Advanced');
+echo gettext('ACLs');
+echo gettext('DNS Resolver');
+echo gettext('DynamicDNSRFC2136Clients');
+echo gettext('Dynamic DNS');
+echo gettext('IGMP Proxy');
+echo gettext('VirtualServer');
+echo gettext('Monitors');
+echo gettext('Settings');
+echo gettext('Load Balancer');
+echo gettext('Network Time Protocol');
+echo gettext('PPPoE Server');
+echo gettext('Proxy Server');
+echo gettext('SNMP');
+echo gettext('Universal P&P / NAT-PMP');
+echo gettext('Wake on LAN');
+echo gettext('Services');
+echo gettext('MobileClients');
+echo gettext('Keys');
+echo gettext('AdvancedSettings');
+echo gettext('IPsec');
+echo gettext('L2TPUsers');
+echo gettext('L2TP');
+echo gettext('Client');
+echo gettext('CSC');
+echo gettext('Wizards');
+echo gettext('ClientExport');
+echo gettext('SharedKeyExport');
+echo gettext('OpenVPN');
+echo gettext('PPTPUsers');
+echo gettext('PPTP');
+echo gettext('VPN');
+echo gettext('Captive Portal');
+echo gettext('CARP');
+echo gettext('DHCP IPv4 Leases');
+echo gettext('DHCP IPv6 Leases');
+echo gettext('Filter Reload');
+echo gettext('GatewayGroups');
+echo gettext('Gateways');
+echo gettext('Interfaces');
+echo gettext('Leases');
+echo gettext('SAD');
+echo gettext('SPD');
+echo gettext('IPsec');
+echo gettext('VirtualServers');
+echo gettext('Load Balancer');
+echo gettext('NTP');
+echo gettext('OpenVPN');
+echo gettext('Queues');
+echo gettext('Settings');
+echo gettext('RRD Graphs');
+echo gettext('Services');
+echo gettext('Gateways');
+echo gettext('Routing');
+echo gettext('Resolver');
+echo gettext('Wireless');
+echo gettext('System');
+echo gettext('DynamicView');
+echo gettext('SummaryView');
+echo gettext('Firewall');
+echo gettext('DHCP');
+echo gettext('PortalAuth');
+echo gettext('IPsec');
+echo gettext('PPP');
+echo gettext('VPN');
+echo gettext('LoadBalancer');
+echo gettext('OpenVPN');
+echo gettext('NTP');
+echo gettext('Proxy');
+echo gettext('Settings');
+echo gettext('System Logs');
+echo gettext('Traffic Graphs');
+echo gettext('UPnP & NAT-PMP');
+echo gettext('Status');
+echo gettext('ARP Table');
+echo gettext('Authentication');
+echo gettext('History');
+echo gettext('Backup & Restore');
+echo gettext('Crash Reporter');
+echo gettext('DNS Lookup');
+echo gettext('Factory Defaults');
+echo gettext('Halt System');
+echo gettext('Limiter Info');
+echo gettext('NDP Table');
+echo gettext('Packet Capture');
+echo gettext('pfInfo');
+echo gettext('pfTop');
+echo gettext('Ping');
+echo gettext('Reboot');
+echo gettext('Routes');
+echo gettext('SMART Status');
+echo gettext('Sockets');
+echo gettext('States');
+echo gettext('States Summary');
+echo gettext('System Activity');
+echo gettext('Tables');
+echo gettext('Test Port');
+echo gettext('Traceroute');
+echo gettext('Diagnostics');
+echo gettext('About this Page');
+echo gettext('Developers Wiki');
+echo gettext('Documentation');
+echo gettext('FreeBSD Handbook');
+echo gettext('Paid Support');
+echo gettext('UserForum');
+echo gettext('Help');
+echo gettext('menu');
+echo gettext('test');
+echo gettext('you should input a valid email address');
+echo gettext('ICP port needs to be an integer value between 1 and 65535');
+echo gettext('Specify a positive cache size. (number of MB\'s)');
+echo gettext('Specify a positive number of first-level subdirectories.');
+echo gettext('Specify a positive number of second-level subdirectories.');
+echo gettext('Specify the maximum download size. (number of KB\'s)');
+echo gettext('Specify the maximum upload size. (number of KB\'s)');
+echo gettext('Specify the overall bandwidth for downloads in kilobits per second.');
+echo gettext('Specify the per host bandwidth for downloads in kilobits per second.');
+echo gettext('Proxy port needs to be an integer value between 1 and 65535');
+echo gettext('FTP Proxy port needs to be an integer value between 1 and 65535');
+echo gettext('Credentials TTL needs to be an integer value above 0');
+echo gettext('Number of children needs to be an integer value above 0');
+echo gettext('Pipe number must be between 1...65535');
+echo gettext('Bandwidth out of range');
+echo gettext('Bandwidth metric should be one of bit,Kbit,Mbit');
+echo gettext('queue size should be between 2...100');
+echo gettext('origin should be regular text of max 30 characters');
+echo gettext('Description should be a string between 1 and 255 characters');
+echo gettext('Queue number must be between 1...65535');
+echo gettext('Related pipe not found');
+echo gettext('Weight must be between 1...100');
+echo gettext('Description should be a string between 1 and 255 characters');
+echo gettext('origin should be regular text of max 30 characters');
+echo gettext('provide a valid sequence for sorting');
+echo gettext('Related pipe or queue not found');
+echo gettext('origin should be regular text of max 30 characters');