setHelp and gettext changes for firewall* pages

9 files changed, 108 insertions, 66 deletions

diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php
index 0428d40..bdc0d1b 100644
--- a/src/usr/local/www/firewall_aliases.php
+++ b/src/usr/local/www/firewall_aliases.php
@@ -289,9 +289,9 @@ endif
 <div>
 	<div class="infoblock">
 		<?php print_info_box(gettext('Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number ' .
-			'of changes that have to be made if a host, network or port changes. <br />' .
-			'The name of an alias can be entered instead of the host, network or port where indicated. The alias will be resolved according to the list above.' . '<br />' .
-			'If an alias cannot be resolved (e.g. because it was deleted), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.'), 'info', false); ?>
+			'of changes that have to be made if a host, network or port changes.') . '<br />' .
+			gettext('The name of an alias can be entered instead of the host, network or port where indicated. The alias will be resolved according to the list above.') . '<br />' .
+			gettext('If an alias cannot be resolved (e.g. because it was deleted), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.'), 'info', false); ?>
 	</div>
 </div>
 
diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php
index 9a82a58..cfe3de3 100644
--- a/src/usr/local/www/firewall_aliases_edit.php
+++ b/src/usr/local/www/firewall_aliases_edit.php
@@ -218,7 +218,7 @@ if ($_POST) {
 			if (!is_URL($alias['url']) || empty($alias['url'])) {
 				$input_errors[] = gettext("A valid URL must be provided.");
 			} elseif (!process_alias_urltable($alias['name'], $alias['type'], $alias['url'], 0, true, true)) {
-				$input_errors[] = gettext("Unable to fetch usable data from URL") . " " . htmlspecialchars($alias['url']);
+				$input_errors[] = sprintf(gettext("Unable to fetch usable data from URL %s"), htmlspecialchars($alias['url']));
 			}
 			if ($_POST["detail0"] <> "") {
 				if ((strpos($_POST["detail0"], "||") === false) && (substr($_POST["detail0"], 0, 1) != "|") && (substr($_POST["detail0"], -1, 1) != "|")) {
diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php
index 753a1d8..d42f1a4 100644
--- a/src/usr/local/www/firewall_aliases_import.php
+++ b/src/usr/local/www/firewall_aliases_import.php
@@ -215,18 +215,36 @@ if ($tab == "port") {
 	$sectiontext = gettext('Port Alias Details');
 	$helptext = gettext('Paste in the ports to import separated by a carriage return. ' .
 		'The list may contain port numbers, port ranges, blank lines (ignored) and ' .
-		'an optional description after each port. e.g.:</span>' .
-		'<ul><li>22</li><li>1234:1250</li><li>443 HTTPS port</li><li>4000:4099 Description of a port range</li>' .
-		'</ul><span class="help-block">');
+		'an optional description after each port. e.g.:') .
+		'</span><ul><li>' .
+		'22' .
+		'</li><li>' .
+		'1234:1250' .
+		'</li><li>' .
+		gettext('443 HTTPS port') .
+		'</li><li>' .
+		gettext('4000:4099 Description of a port range') .
+		'</li></ul><span class="help-block">';
 } else {
 	$sectiontext = gettext('IP Alias Details');
 	$helptext = gettext('Paste in the aliases to ' .
 		'import separated by a carriage return. Common examples are lists of IPs, ' .
 		'networks, blacklists, etc. The list may contain IP addresses, with or without ' .
 		'CIDR prefix, IP ranges, blank lines (ignored) and an optional description after ' .
-		'each IP. e.g.:</span><ul><li>172.16.1.2</li><li>172.16.0.0/24</li><li>10.11.12.100-' .
-		'10.11.12.200</li><li>192.168.1.254 Home router</li><li>10.20.0.0/16 Office ' .
-		'network</li><li>10.40.1.10-10.40.1.19 Managed switches</li></ul><span class="help-block">');
+		'each IP. e.g.:') . 
+		'</span><ul><li>' .
+		'172.16.1.2' .
+		'</li><li>' .
+		'172.16.0.0/24' .
+		'</li><li>' .
+		'10.11.12.100-10.11.12.200' .
+		'</li><li>' .
+		gettext('192.168.1.254 Home router') .
+		'</li><li>' .
+		gettext('10.20.0.0/16 Office network') .
+		'</li><li>' .
+		gettext('10.40.1.10-10.40.1.19 Managed switches') .
+		'</li></ul><span class="help-block">';
 }
 
 $section = new Form_Section($sectiontext);
diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php
index 8b4d4b2..236dd6f 100644
--- a/src/usr/local/www/firewall_nat_1to1.php
+++ b/src/usr/local/www/firewall_nat_1to1.php
@@ -252,8 +252,8 @@ display_top_tabs($tab_array);
 </form>
 
 <div class="infoblock">
-<?php print_info_box(gettext('Depending on the way the WAN connection is setup, this may also need a ') . '<a href="firewall_virtual_ip.php">' .
-			   gettext("Virtual IP") . '</a>.' . '<br />' .
+<?php print_info_box(sprintf(gettext('Depending on the way the WAN connection is setup, this may also need a %1$sVirtual IP%2$s.'), '<a href="firewall_virtual_ip.php">', '</a>') .
+			   '<br />' .
 			   gettext('If a 1:1 NAT entry is added for any of the interface IPs on this system, ' .
 					   'it will make this system inaccessible on that IP address. i.e. if ' .
 					   'the WAN IP address is used, any services on this system (IPsec, OpenVPN server, etc.) ' .
diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php
index 34e790e..6803436 100644
--- a/src/usr/local/www/firewall_nat_edit.php
+++ b/src/usr/local/www/firewall_nat_edit.php
@@ -274,7 +274,7 @@ if ($_POST) {
 	}
 
 	if ((strtoupper($_POST['proto']) == "TCP" || strtoupper($_POST['proto']) == "UDP" || strtoupper($_POST['proto']) == "TCP/UDP") && (!isset($_POST['nordr']) && !is_portoralias($_POST['localbeginport']))) {
-		$input_errors[] = sprintf(gettext("A valid redirect target port must be specified. It must be a port alias or integer between 1 and 65535."), $_POST['localbeginport']);
+		$input_errors[] = sprintf(gettext("%s is not a valid redirect target port. It must be a port alias or integer between 1 and 65535."), $_POST['localbeginport']);
 	}
 
 	/* if user enters an alias and selects "network" then disallow. */
@@ -854,8 +854,7 @@ $section->addInput(new Form_IpAddress(
 	'*Redirect target IP',
 	$pconfig['localip'],
 	'ALIASV4V6'
-))->setHelp('Enter the internal IP address of the server on which to map the ports.' . '<br />' .
-			'e.g.: 192.168.1.12');
+))->setHelp('Enter the internal IP address of the server on which to map the ports.%s e.g.: 192.168.1.12', '<br />');
 
 $group = new Form_Group('*Redirect target port');
 $group->addClass('lclportrange');
@@ -868,8 +867,8 @@ $group->add(new Form_Select(
 ))->setHelp('Port');
 
 $group->setHelp('Specify the port on the machine with the IP address entered above. In case of a port range, specify the ' .
-				'beginning port of the range (the end port will be calculated automatically).' . '<br />' .
-				'This is usually identical to the "From port" above.');
+				'beginning port of the range (the end port will be calculated automatically).%s' .
+				'This is usually identical to the "From port" above.', '<br />');
 
 $group->add(new Form_Input(
 	'localbeginport_cust',
@@ -962,14 +961,20 @@ if ($has_created_time || $has_updated_time) {
 	if ($has_created_time) {
 		$section->addInput(new Form_StaticText(
 			'Created',
-			date(gettext("n/j/y H:i:s"), $a_nat[$id]['created']['time']) . gettext(" by ") . $a_nat[$id]['created']['username']
+			sprintf(
+				gettext('%1$s by %2$s'),
+				date(gettext("n/j/y H:i:s"), $a_nat[$id]['created']['time']),
+				$a_nat[$id]['created']['username'])
 		));
 	}
 
 	if ($has_updated_time) {
 		$section->addInput(new Form_StaticText(
 			'Updated',
-			date(gettext("n/j/y H:i:s"), $a_nat[$id]['updated']['time']) . gettext(" by ") . $a_nat[$id]['updated']['username']
+			sprintf(
+				gettext('%1$s by %2$s'),
+				date(gettext("n/j/y H:i:s"), $a_nat[$id]['updated']['time']),
+				$a_nat[$id]['updated']['username'])
 		));
 	}
 
diff --git a/src/usr/local/www/firewall_nat_npt_edit.php b/src/usr/local/www/firewall_nat_npt_edit.php
index 470e3c1..e9dd078 100644
--- a/src/usr/local/www/firewall_nat_npt_edit.php
+++ b/src/usr/local/www/firewall_nat_npt_edit.php
@@ -199,8 +199,8 @@ $section->addInput(new Form_Select(
 	'*Interface',
 	$pconfig['interface'],
 	build_if_list()
-))->setHelp('Choose which interface this rule applies to.' . '<br />' .
-			'Hint: Typically the "WAN" is used here.');
+))->setHelp('Choose which interface this rule applies to.%s' .
+			'Hint: Typically the "WAN" is used here.', '<br />');
 
 $section->addInput(new Form_Checkbox(
 	'srcnot',
diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php
index 10b2044..2ee8824 100644
--- a/src/usr/local/www/firewall_nat_out.php
+++ b/src/usr/local/www/firewall_nat_out.php
@@ -233,7 +233,7 @@ $group->add(new Form_Checkbox(
 	null,
 	$mode == 'automatic',
 	'automatic'
-))->displayAsRadio()->setHelp('Automatic outbound NAT rule generation.' . '<br />' . '(IPsec passthrough included)');
+))->displayAsRadio()->setHelp('Automatic outbound NAT rule generation.%s(IPsec passthrough included)', '<br />');
 
 $group->add(new Form_Checkbox(
 	'mode',
@@ -241,7 +241,7 @@ $group->add(new Form_Checkbox(
 	null,
 	$mode == 'hybrid',
 	'hybrid'
-))->displayAsRadio()->setHelp('Hybrid Outbound NAT rule generation.' . '<br />' . '(Automatic Outbound NAT + rules below)');
+))->displayAsRadio()->setHelp('Hybrid Outbound NAT rule generation.%s(Automatic Outbound NAT + rules below)', '<br />');
 
 $group->add(new Form_Checkbox(
 	'mode',
@@ -249,7 +249,7 @@ $group->add(new Form_Checkbox(
 	null,
 	$mode == 'advanced',
 	'advanced'
-))->displayAsRadio()->setHelp('Manual Outbound NAT rule generation.' . '<br />' . '(AON - Advanced Outbound NAT)');
+))->displayAsRadio()->setHelp('Manual Outbound NAT rule generation.%s(AON - Advanced Outbound NAT)', '<br />');
 
 $group->add(new Form_Checkbox(
 	'mode',
@@ -257,7 +257,7 @@ $group->add(new Form_Checkbox(
 	null,
 	$mode == 'disabled',
 	'disabled'
-))->displayAsRadio()->setHelp('Disable Outbound NAT rule generation.' . '<br />' . '(No Outbound NAT rules)');
+))->displayAsRadio()->setHelp('Disable Outbound NAT rule generation.%s(No Outbound NAT rules)', '<br />');
 
 $section->add($group);
 
@@ -632,15 +632,21 @@ endif;
 
 <div class="infoblock">
 <?php
-	print_info_box(gettext('If automatic outbound NAT is selected, a mapping is automatically generated for each interface\'s subnet (except WAN-type connections) and the rules ' .
-							'on the "Mappings" section of this page are ignored.' . '<br />' .
-							'If manual outbound NAT is selected, outbound NAT rules will not be automatically generated and only the mappings specified on this page ' .
-							'will be used.' . '<br />' .
-							'If hybrid outbound NAT is selected, mappings specified on this page will be used, followed by the automatically generated ones.' . '<br />' .
-							'If disable outbound NAT is selected, no rules will be used.' . '<br />' .
-							'If a target address other than an interface\'s IP address is used, then depending on the way the WAN connection is setup, a ') .
-							'<a href="firewall_virtual_ip.php">' . gettext("Virtual IP") . '</a>' . gettext(" may also be required."),
-				   'info', false);
+	print_info_box(
+		gettext('If automatic outbound NAT is selected, a mapping is automatically generated for each interface\'s subnet (except WAN-type connections) and the rules on the "Mappings" section of this page are ignored.') .
+			'<br />' .
+			gettext('If manual outbound NAT is selected, outbound NAT rules will not be automatically generated and only the mappings specified on this page will be used.') .
+			'<br />' .
+			gettext('If hybrid outbound NAT is selected, mappings specified on this page will be used, followed by the automatically generated ones.') .
+			'<br />' .
+			gettext('If disable outbound NAT is selected, no rules will be used.') .
+			'<br />' .
+			sprintf(
+				gettext('If a target address other than an interface\'s IP address is used, then depending on the way the WAN connection is setup, a %1$sVirtual IP%2$s may also be required.'),
+				'<a href="firewall_virtual_ip.php">',
+				'</a>'),
+		'info',
+		false);
 ?>
 </div>
 
diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php
index 1062692..b6b7442 100644
--- a/src/usr/local/www/firewall_nat_out_edit.php
+++ b/src/usr/local/www/firewall_nat_out_edit.php
@@ -581,17 +581,17 @@ $section->addInput(new Form_Select(
 	'*Address',
 	$pconfig['target'],
 	build_target_list()
-))->setHelp(	'Connections matching this rule will be mapped to the specified <b>Address</b>.' . '<br />' .
-		'The <b>Address</b> can be an Interface, a Host-type Alias, or a ' .
-		'<a href="firewall_virtual_ip.php">' . gettext("Virtual IP") . '</a> ' . ' address.');
+))->setHelp('Connections matching this rule will be mapped to the specified %1$sAddress%2$s.%3$s' .
+		'The %1$sAddress%2$s can be an Interface, a Host-type Alias, or a %4$sVirtual IP%5$s address.',
+		'<b>', '</b>', '<br />', '<a href="firewall_virtual_ip.php">', '</a>');
 
 $section->addInput(new Form_IpAddress(
 	'targetip',
 	'Other subnet',
 	$pconfig['targetip']
 ))->addMask('targetip_subnet', $pconfig['targetip_subnet'])->setHelp(
-		'This subnet must be routed to the firewall or each address in the subnet must be defined in one or more ' .
-		'<a href="firewall_virtual_ip.php">' . gettext("Virtual IP") . '</a> ' . ' addresses.');
+		'This subnet must be routed to the firewall or each address in the subnet must be defined in one or more %1$sVirtual IP%2$s addresses.',
+		'<a href="firewall_virtual_ip.php">', '</a>');
 
 $section->addInput(new Form_Select(
 	'poolopts',
@@ -606,13 +606,14 @@ $section->addInput(new Form_Select(
 		'source-hash' => gettext('Source hash'),
 		'bitmask' => gettext('Bit mask')
 	)
-))->setHelp('Only Round Robin types work with Host Aliases. Any type can be used with a Subnet.' . '<br />' .
-			'</span><ul class="help-block">' .
-				'<li>' . 'Round Robin: Loops through the translation addresses.' . '</li>' .
-				'<li>' . 'Random: Selects an address from the translation address pool at random.' . '</li>' .
-				'<li>' . 'Source Hash: Uses a hash of the source address to determine the translation address, ensuring that the redirection address is always the same for a given source.' . '</li>' .
-				'<li>' . 'Bitmask: Applies the subnet mask and keeps the last portion identical; 10.0.1.50 -&gt; x.x.x.50.' . '</li>' .
-				'<li>' . 'Sticky Address: The Sticky Address option can be used with the Random and Round Robin pool types to ensure that a particular source address is always mapped to the same translation address.' . '</li>' .
+))->setHelp('%s',
+			gettext('Only Round Robin types work with Host Aliases. Any type can be used with a Subnet.') .
+			'<br /></span><ul class="help-block">' .
+				'<li>' . gettext('Round Robin: Loops through the translation addresses.') . '</li>' .
+				'<li>' . gettext('Random: Selects an address from the translation address pool at random.') . '</li>' .
+				'<li>' . gettext('Source Hash: Uses a hash of the source address to determine the translation address, ensuring that the redirection address is always the same for a given source.') . '</li>' .
+				'<li>' . gettext('Bitmask: Applies the subnet mask and keeps the last portion identical; 10.0.1.50 -&gt; x.x.x.50.') . '</li>' .
+				'<li>' . gettext('Sticky Address: The Sticky Address option can be used with the Random and Round Robin pool types to ensure that a particular source address is always mapped to the same translation address.') . '</li>' .
 			'</ul><span class="help-block">');
 
 $section->addInput(new Form_Input(
@@ -630,10 +631,10 @@ $group->add(new Form_Input(
 	null,
 	'text',
 	$pconfig['natport']
-))->setHelp('Enter the external source <b>Port or Range</b> used for remapping '.
-		'the original source port on connections matching the rule. <br/><br/>'.
-		'Port ranges are a low port and high port number separated by ":".<br/>'.
-		'Leave blank when <b>Static Port</b> is checked.');
+))->setHelp('Enter the external source %1$sPort or Range%2$s used for remapping '.
+		'the original source port on connections matching the rule. %3$s'.
+		'Port ranges are a low port and high port number separated by ":".%4$s'.
+		'Leave blank when %1$sStatic Port%2$s is checked.', '<b>', '</b>', '<br/><br/>', '<br/>');
 
 $group->add(new Form_Checkbox(
 	'staticnatport',
@@ -690,14 +691,20 @@ if ($has_created_time || $has_updated_time) {
 	if ($has_created_time) {
 		$section->addInput(new Form_StaticText(
 			'Created',
-			date(gettext("n/j/y H:i:s"), $a_out[$id]['created']['time']) . gettext(" by ") . $a_out[$id]['created']['username']
+			sprintf(
+				gettext('%1$s by %2$s'),
+				date(gettext("n/j/y H:i:s"), $a_out[$id]['created']['time']),
+				$a_out[$id]['created']['username'])
 		));
 	}
 
 	if ($has_updated_time) {
 		$section->addInput(new Form_StaticText(
 			'Updated',
-			date(gettext("n/j/y H:i:s"), $a_out[$id]['updated']['time']) . gettext(" by ") . $a_out[$id]['updated']['username']
+			sprintf(
+				gettext('%1$s by %2$s'),
+				date(gettext("n/j/y H:i:s"), $a_out[$id]['updated']['time']),
+				$a_out[$id]['updated']['username'])
 		));
 	}
 
diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php
index f2d5eef..c403990 100644
--- a/src/usr/local/www/firewall_rules_edit.php
+++ b/src/usr/local/www/firewall_rules_edit.php
@@ -53,7 +53,7 @@ foreach ($icmptypes as $k => $v) {
 $icmplookup = array(
 	'inet' => array('name' => 'IPv4', 'icmptypes' => $icmptypes4, 'helpmsg' => gettext('For ICMP rules on IPv4, one or more of these ICMP subtypes may be specified.')),
 	'inet6' => array('name' => 'IPv6', 'icmptypes' => $icmptypes6, 'helpmsg' => gettext('For ICMP rules on IPv6, one or more of these ICMP subtypes may be specified.')),
-	'inet46' => array('name' => 'IPv4+6', 'icmptypes' => $icmptypes46, 'helpmsg' => gettext('For ICMP rules on IPv4+IPv6, one or more of these ICMP subtypes may be specified. (Other ICMP subtypes are only valid under IPv4 <i>or</i> IPv6, not both)'))
+	'inet46' => array('name' => 'IPv4+6', 'icmptypes' => $icmptypes46, 'helpmsg' => sprintf(gettext('For ICMP rules on IPv4+IPv6, one or more of these ICMP subtypes may be specified. (Other ICMP subtypes are only valid under IPv4 %1$sor%2$s IPv6, not both)'), '<i>', '</i>'))
 );
 
 if (isset($_POST['referer'])) {
@@ -1166,10 +1166,10 @@ $section->addInput(new Form_Select(
 	$pconfig['type'],
 	$values
 ))->setHelp('Choose what to do with packets that match the criteria specified '.
-	'below.<br/>Hint: the difference between block and reject is that with '.
+	'below.%sHint: the difference between block and reject is that with '.
 	'reject, a packet (TCP RST or ICMP port unreachable for UDP) is returned '.
 	'to the sender, whereas with block the packet is dropped silently. In '.
-	'either case, the original packet is discarded.');
+	'either case, the original packet is discarded.', '<br/>');
 
 $section->addInput(new Form_Checkbox(
 	'disabled',
@@ -1393,9 +1393,9 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) {
 			null,
 			'fa-cog'
 		))->setAttribute('type','button')->addClass('btn-info btn-sm')->setHelp(
-			'The <b>Source Port Range</b> for a connection is typically random '.
+			'The %1$sSource Port Range%2$s for a connection is typically random '.
 			'and almost never equal to the destination port. '.
-			'In most cases this setting must remain at its default value, <b>any</b>.');
+			'In most cases this setting must remain at its default value, %1$sany%2$s.', '<b>', '</b>');
 	}
 
 	$portValues = ['' => gettext('(other)'), 'any' => gettext('any')];
@@ -1450,8 +1450,7 @@ $section->addInput(new Form_Checkbox(
 	$pconfig['log']
 ))->setHelp('Hint: the firewall has limited local log space. Don\'t turn on logging '.
 	'for everything. If doing a lot of logging, consider using a remote '.
-	'syslog server (see the <a href="status_logs_settings.php">Status: System Logs: '.
-	'Settings</a> page).');
+	'syslog server (see the %1$sStatus: System Logs: Settings%2$s page).', '<a href="status_logs_settings.php">', '</a>');
 
 $section->addInput(new Form_Input(
 	'descr',
@@ -1514,7 +1513,7 @@ $section->addInput(new Form_Input(
 	'text',
 	$pconfig['tag']
 ))->setHelp('A packet matching this rule can be marked and this mark used to match '.
-	'on other NAT/filter rules. It is called <b>Policy filtering</b>.');
+	'on other NAT/filter rules. It is called %1$sPolicy filtering%2$s.', '<b>', '</b>');
 
 $section->addInput(new Form_Input(
 	'tagged',
@@ -1596,8 +1595,8 @@ $section->addInput(new Form_Select(
 		'synproxy state' => gettext('Synproxy'),
 		'none' => gettext('None'),
 	)
-))->setHelp('Select which type of state tracking mechanism to use.  If in doubt, use keep state.' . '<br />' .
-			'<span></span>');
+))->setHelp('Select which type of state tracking mechanism to use.  If in doubt, use keep state.%1$s',
+			'<br /><span></span>');
 
 $section->addInput(new Form_Checkbox(
 	'nosync',
@@ -1687,9 +1686,10 @@ $group->add(new Form_Select(
 $section->add($group)->setHelp('Choose the Out queue/Virtual interface only if '.
 	'In is also selected. The Out selection is applied to traffic leaving '.
 	'the interface where the rule is created, the In selection is applied to traffic coming '.
-	'into the chosen interface.<br />If creating a floating rule, if the '.
+	'into the chosen interface.%1$sIf creating a floating rule, if the '.
 	'direction is In then the same rules apply, if the direction is Out the '.
-	'selections are reversed, Out is for incoming and In is for outgoing.'
+	'selections are reversed, Out is for incoming and In is for outgoing.',
+	'<br />'
 );
 
 $group = new Form_Group('Ackqueue / Queue');
@@ -1736,14 +1736,20 @@ if ($has_created_time || $has_updated_time) {
 	if ($has_created_time) {
 		$section->addInput(new Form_StaticText(
 			'Created',
-			date('n/j/y H:i:s', $a_filter[$id]['created']['time']) . gettext(' by ') .'<b>'. $a_filter[$id]['created']['username'] .'</b>'
+			sprintf(
+				gettext('%1$s by %2$s'),
+				date(gettext("n/j/y H:i:s"), $a_filter[$id]['created']['time']),
+				'<b>' . $a_filter[$id]['created']['username'] . '</b>')
 		));
 	}
 
 	if ($has_updated_time) {
 		$section->addInput(new Form_StaticText(
 			'Updated',
-			date('n/j/y H:i:s', $a_filter[$id]['updated']['time']) . gettext(' by ') .'<b>'. $a_filter[$id]['updated']['username'] .'</b>'
+			sprintf(
+				gettext('%1$s by %2$s'),
+				date(gettext("n/j/y H:i:s"), $a_filter[$id]['updated']['time']),
+				'<b>' . $a_filter[$id]['updated']['username'] . '</b>')
 		));
 	}
 }