diff options
author | Phil Davis <phil.davis@inf.org> | 2017-02-03 09:12:05 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2017-02-03 09:12:05 +0545 |
commit | 314a088a804ed893319c72ba070bc5b23df55fcd (patch) | |
tree | a2a30da2e891b96c70f20942c9ffa62e2df041bb | |
parent | 5ea71ebda681dbab323ccdb44ab3bfdea7c0f5d6 (diff) | |
download | pfsense-314a088a804ed893319c72ba070bc5b23df55fcd.zip pfsense-314a088a804ed893319c72ba070bc5b23df55fcd.tar.gz |
Remove unneeded sprint and gettext in setHelp
-rw-r--r-- | src/etc/inc/pfsense-utils.inc | 2 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_vlan_edit.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/services_captiveportal.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/services_dhcpv6_edit.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/services_wol.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/services_wol_edit.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/status_logs_settings.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/system.php | 4 |
8 files changed, 12 insertions, 12 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 306b8c0..77f9bb0 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -190,7 +190,7 @@ function gen_webguicss_field(&$section, $value) { 'Theme', $value, $csslist - ))->setHelp(sprintf(gettext('Choose an alternative css file (if installed) to change the appearance of the webConfigurator. css files are located in /usr/local/www/css/%s'), '<span id="csstxt"></span>')); + ))->setHelp('Choose an alternative css file (if installed) to change the appearance of the webConfigurator. css files are located in /usr/local/www/css/%s', '<span id="csstxt"></span>'); } /****f* pfsense-utils/gen_webguifixedmenu_field diff --git a/src/usr/local/www/interfaces_vlan_edit.php b/src/usr/local/www/interfaces_vlan_edit.php index 067de87..8c317eb 100644 --- a/src/usr/local/www/interfaces_vlan_edit.php +++ b/src/usr/local/www/interfaces_vlan_edit.php @@ -194,7 +194,7 @@ $section->addInput(new Form_Input( 'text', $pconfig['tag'], ['placeholder' => '1'] -))->setWidth(6)->setHelp(gettext('802.1Q VLAN tag (between 1 and 4094).')); +))->setWidth(6)->setHelp('802.1Q VLAN tag (between 1 and 4094).'); $section->addInput(new Form_Input( 'pcp', @@ -202,7 +202,7 @@ $section->addInput(new Form_Input( 'text', $pconfig['pcp'], ['placeholder' => '0'] -))->setWidth(6)->setHelp(gettext('802.1Q VLAN Priority (between 0 and 7).')); +))->setWidth(6)->setHelp('802.1Q VLAN Priority (between 0 and 7).'); $section->addInput(new Form_Input( 'descr', diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php index 3b6a29a..d856356 100644 --- a/src/usr/local/www/services_captiveportal.php +++ b/src/usr/local/www/services_captiveportal.php @@ -655,9 +655,9 @@ $section->addInput(new Form_Checkbox( null, 'Enable Pass-through MAC automatic addition with username', $pconfig['passthrumacaddusername'] -))->setHelp(sprintf('If enabled with the automatically MAC passthrough entry created, the username used during authentication will be saved. ' . +))->setHelp('If enabled with the automatically MAC passthrough entry created, the username used during authentication will be saved. ' . 'To remove the passthrough MAC entry either log in and remove it manually from the %s or send a POST from another system.', - '<a href="services_captiveportal_mac.php">MAC tab</a>')); + '<a href="services_captiveportal_mac.php">MAC tab</a>'); $section->addInput(new Form_Checkbox( 'peruserbw', diff --git a/src/usr/local/www/services_dhcpv6_edit.php b/src/usr/local/www/services_dhcpv6_edit.php index 4808963..ee354ff 100644 --- a/src/usr/local/www/services_dhcpv6_edit.php +++ b/src/usr/local/www/services_dhcpv6_edit.php @@ -218,7 +218,7 @@ $section->addInput(new Form_Input( 'text', $pconfig['duid'], ['placeholder' => 'DUID-LLT - ETH -- TIME --- ---- address ---- xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx'] -))->setHelp(gettext('Enter a DUID in the following format: ') . '<br />' . +))->setHelp('Enter a DUID in the following format: %1$s %2$s', '<br />', 'DUID-LLT - ETH -- TIME --- ---- address ---- ' . 'xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx'); diff --git a/src/usr/local/www/services_wol.php b/src/usr/local/www/services_wol.php index 8e84b27..4119561 100644 --- a/src/usr/local/www/services_wol.php +++ b/src/usr/local/www/services_wol.php @@ -147,7 +147,7 @@ $section->addInput(new Form_Input( '*MAC address', 'text', $mac -))->setHelp(gettext('Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx')); +))->setHelp('Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx'); $form->add($section); diff --git a/src/usr/local/www/services_wol_edit.php b/src/usr/local/www/services_wol_edit.php index e549e22..17b192f 100644 --- a/src/usr/local/www/services_wol_edit.php +++ b/src/usr/local/www/services_wol_edit.php @@ -141,14 +141,14 @@ $section->addInput(new Form_Input( '*MAC address', 'text', $pconfig['mac'] -))->setHelp(gettext('Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx')); +))->setHelp('Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx'); $section->addInput(new Form_Input( 'descr', 'Description', 'text', $pconfig['descr'] -))->setHelp(gettext('A description may be entered here for administrative reference (not parsed).')); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); $form->add($section); print $form; diff --git a/src/usr/local/www/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php index aad3a67..f59c9c6 100644 --- a/src/usr/local/www/status_logs_settings.php +++ b/src/usr/local/www/status_logs_settings.php @@ -293,7 +293,7 @@ $section->addInput(new Form_Checkbox( 'Raw Logs', 'Show raw filter logs', $pconfig['rawfilter'] -))->setHelp(gettext('If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information, but it is more difficult to read.')); +))->setHelp('If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information, but it is more difficult to read.'); $section->addINput(new Form_Checkbox( 'igmpxverbose', diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index dad944e..64d843c 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -522,10 +522,10 @@ $section->addInput(new Form_Checkbox( 'DNS Server Override', 'Allow DNS server list to be overridden by DHCP/PPP on WAN', $pconfig['dnsallowoverride'] -))->setHelp(gettext('If this option is set, %s will use DNS servers '. +))->setHelp('If this option is set, %s will use DNS servers '. 'assigned by a DHCP/PPP server on WAN for its own purposes (including '. 'the DNS Forwarder/DNS Resolver). However, they will not be assigned to DHCP '. - 'clients.'), $g['product_name']); + 'clients.', $g['product_name']); $section->addInput(new Form_Checkbox( 'dnslocalhost', |