diff options
author | Renato Botelho <renato@netgate.com> | 2016-01-18 16:22:07 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-01-18 16:22:07 -0200 |
commit | f633de3388610244c923578ab92c6445b51b95a4 (patch) | |
tree | 43ed5ada7f633cd0289f48c5439d6be8de20f559 /src/usr/local/www | |
parent | 814e91ece98bfc5ca5cbcf048d9c20e1e02d7dc8 (diff) | |
parent | 7d95365e787678fa75359917470c54a9ea4b80cc (diff) | |
download | pfsense-f633de3388610244c923578ab92c6445b51b95a4.zip pfsense-f633de3388610244c923578ab92c6445b51b95a4.tar.gz |
Merge pull request #2469 from phil-davis/gt4
Diffstat (limited to 'src/usr/local/www')
-rw-r--r-- | src/usr/local/www/firewall_aliases.php | 2 | ||||
-rwxr-xr-x | src/usr/local/www/firewall_aliases_import.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat.php | 10 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_1to1_edit.php | 26 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_edit.php | 42 |
5 files changed, 42 insertions, 42 deletions
diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php index 8a5b675..ffecc25 100644 --- a/src/usr/local/www/firewall_aliases.php +++ b/src/usr/local/www/firewall_aliases.php @@ -212,7 +212,7 @@ display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('Firewall Aliases') . " " . $bctab?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=sprintf(gettext('Firewall Aliases %s'), $bctab)?></h2></div> <div class="panel-body"> <div class="table-responsive"> diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php index 7260412..094211a 100755 --- a/src/usr/local/www/firewall_aliases_import.php +++ b/src/usr/local/www/firewall_aliases_import.php @@ -95,7 +95,7 @@ if ($_POST['aliasimport'] != "") { do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); if (is_validaliasname($_POST['name']) == false) { - $input_errors[] = gettext("The alias name may only consist of the characters") . " a-z, A-Z, 0-9, _."; + $input_errors[] = sprintf(gettext("The alias name may only consist of the characters %s"), "a-z, A-Z, 0-9, _."); } /* check for name duplicates */ @@ -107,7 +107,7 @@ if ($_POST['aliasimport'] != "") { /* Check for reserved keyword names */ foreach ($reserved_keywords as $rk) { if ($rk == $_POST['name']) { - $input_errors[] = sprintf(gettext("Cannot use a reserved keyword as alias name %s"), $rk); + $input_errors[] = sprintf(gettext("Cannot use a reserved keyword as an alias name: %s"), $rk); } } diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php index 4a6f2f2..ec7a708 100644 --- a/src/usr/local/www/firewall_nat.php +++ b/src/usr/local/www/firewall_nat.php @@ -239,7 +239,7 @@ foreach ($a_nat as $natent): <?php elseif (!empty($natent['associated-rule-id'])): ?> - <i class="fa fa-random" title="<?=gettext("Firewall rule ID ")?><?=htmlspecialchars($natent['associated-rule-id'])?> . <?=gettext('is managed by this rule')?>"></i> + <i class="fa fa-random" title="<?=sprintf(gettext("Firewall rule ID %s is managed by this rule"), htmlspecialchars($natent['associated-rule-id']))?>"></i> <?php endif; ?> @@ -266,7 +266,7 @@ foreach ($a_nat as $natent): <?php if (isset($alias['src'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['src']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['src'])?>" data-html="true"> + <a href="/firewall_aliases_edit.php?id=<?=$alias['src']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['src'])?>" data-html="true"> <?php endif; ?> @@ -283,7 +283,7 @@ foreach ($a_nat as $natent): <?php if (isset($alias['srcport'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['srcport']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['srcport'])?>" data-html="true"> + <a href="/firewall_aliases_edit.php?id=<?=$alias['srcport']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['srcport'])?>" data-html="true"> <?php endif; ?> @@ -301,7 +301,7 @@ foreach ($a_nat as $natent): <?php if (isset($alias['dst'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['dst']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['dst'])?>" data-html="true"> + <a href="/firewall_aliases_edit.php?id=<?=$alias['dst']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['dst'])?>" data-html="true"> <?php endif; ?> @@ -318,7 +318,7 @@ foreach ($a_nat as $natent): <?php if (isset($alias['dstport'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['dstport']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['dstport'])?>" data-html="true"> + <a href="/firewall_aliases_edit.php?id=<?=$alias['dstport']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['dstport'])?>" data-html="true"> <?php endif; ?> diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php index 4d5c865..4b6178f 100644 --- a/src/usr/local/www/firewall_nat_1to1_edit.php +++ b/src/usr/local/www/firewall_nat_1to1_edit.php @@ -284,16 +284,16 @@ include("head.inc"); function build_srctype_list() { global $pconfig, $ifdisp; - $list = array('any' => 'Any', 'single' => 'Single host or alias', 'network' => 'Network'); + $list = array('any' => gettext('Any'), 'single' => gettext('Single host or alias'), 'network' => gettext('Network')); $sel = is_specialnet($pconfig['src']); if (have_ruleint_access("pppoe")) { - $list['pppoe'] = 'PPPoE clients'; + $list['pppoe'] = gettext('PPPoE clients'); } if (have_ruleint_access("l2tp")) { - $list['l2tp'] = 'L2TP clients'; + $list['l2tp'] = gettext('L2TP clients'); } foreach ($ifdisp as $ifent => $ifdesc) { @@ -326,14 +326,14 @@ function build_dsttype_list() { global $pconfig, $config, $ifdisp; $sel = is_specialnet($pconfig['dst']); - $list = array('any' => 'Any', 'single' => 'Single host or alias', 'network' => 'Network', '(self)' => 'This Firewall (self)'); + $list = array('any' => gettext('Any'), 'single' => gettext('Single host or alias'), 'network' => gettext('Network'), '(self)' => gettext('This Firewall (self)')); if (have_ruleint_access("pppoe")) { - $list['pppoe'] = 'PPPoE clients'; + $list['pppoe'] = gettext('PPPoE clients'); } if (have_ruleint_access("l2tp")) { - $list['l2tp'] = 'L2TP clients'; + $list['l2tp'] = gettext('L2TP clients'); } foreach ($ifdisp as $if => $ifdesc) { @@ -423,22 +423,22 @@ foreach ($iflist as $if => $ifdesc) { if ($config['l2tp']['mode'] == "server") { if (have_ruleint_access("l2tp")) { - $interfaces['l2tp'] = "L2TP VPN"; + $interfaces['l2tp'] = gettext("L2TP VPN"); } } if (is_pppoe_server_enabled() && have_ruleint_access("pppoe")) { - $interfaces['pppoe'] = "PPPoE Server"; + $interfaces['pppoe'] = gettext("PPPoE Server"); } /* add ipsec interfaces */ if (ipsec_enabled() && have_ruleint_access("enc0")) { - $interfaces["enc0"] = "IPsec"; + $interfaces["enc0"] = gettext("IPsec"); } /* add openvpn/tun interfaces */ if ($config['openvpn']["openvpn-server"] || $config['openvpn']["openvpn-client"]) { - $interfaces["openvpn"] = "OpenVPN"; + $interfaces["openvpn"] = gettext("OpenVPN"); } $section->addInput(new Form_Select( @@ -520,9 +520,9 @@ $section->addInput(new Form_Select( 'NAT reflection', $pconfig['natreflection'], array( - 'default' => 'Use system default', - 'enable' => 'Enable', - 'disable' => 'Disable' + 'default' => gettext('Use system default'), + 'enable' => gettext('Enable'), + 'disable' => gettext('Disable') ) )); diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index d64c308..65316f0 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -531,16 +531,16 @@ if ($_POST) { function build_srctype_list() { global $pconfig, $ifdisp, $config; - $list = array('any' => 'Any', 'single' => 'Single host or alias', 'network' => 'Network'); + $list = array('any' => gettext('Any'), 'single' => gettext('Single host or alias'), 'network' => gettext('Network')); $sel = is_specialnet($pconfig['src']); if (have_ruleint_access("pppoe")) { - $list['pppoe'] = 'PPPoE clients'; + $list['pppoe'] = gettext('PPPoE clients'); } if (have_ruleint_access("l2tp")) { - $list['l2tp'] = 'L2TP clients'; + $list['l2tp'] = gettext('L2TP clients'); } foreach ($ifdisp as $ifent => $ifdesc) { @@ -577,14 +577,14 @@ function build_dsttype_list() { global $pconfig, $config, $ifdisp; $sel = is_specialnet($pconfig['dst']); - $list = array('any' => 'Any', 'single' => 'Single host or alias', 'network' => 'Network', '(self)' => 'This Firewall (self)'); + $list = array('any' => gettext('Any'), 'single' => gettext('Single host or alias'), 'network' => gettext('Network'), '(self)' => gettext('This Firewall (self)')); if (have_ruleint_access("pppoe")) { - $list['pppoe'] = 'PPPoE clients'; + $list['pppoe'] = gettext('PPPoE clients'); } if (have_ruleint_access("l2tp")) { - $list['l2tp'] = 'L2TP clients'; + $list['l2tp'] = gettext('L2TP clients'); } foreach ($ifdisp as $if => $ifdesc) { @@ -681,22 +681,22 @@ foreach ($iflist as $if => $ifdesc) { if ($config['l2tp']['mode'] == "server") { if (have_ruleint_access("l2tp")) { - $interfaces['l2tp'] = "L2TP VPN"; + $interfaces['l2tp'] = gettext("L2TP VPN"); } } if (is_pppoe_server_enabled() && have_ruleint_access("pppoe")) { - $interfaces['pppoe'] = "PPPoE Server"; + $interfaces['pppoe'] = gettext("PPPoE Server"); } /* add ipsec interfaces */ if (ipsec_enabled() && have_ruleint_access("enc0")) { - $interfaces["enc0"] = "IPsec"; + $interfaces["enc0"] = gettext("IPsec"); } /* add openvpn/tun interfaces */ if ($config['openvpn']["openvpn-server"] || $config['openvpn']["openvpn-client"]) { - $interfaces["openvpn"] = "OpenVPN"; + $interfaces["openvpn"] = gettext("OpenVPN"); } $section->addInput(new Form_Select( @@ -752,7 +752,7 @@ $group->add(new Form_IpAddress( $section->add($group); -$portlist = array("" => 'Other', 'any' => 'Any'); +$portlist = array("" => gettext('Other'), 'any' => gettext('Any')); foreach ($wkports as $wkport => $wkportdesc) { $portlist[$wkport] = $wkportdesc; @@ -906,24 +906,24 @@ $section->addInput(new Form_Select( 'NAT reflection', $pconfig['natreflection'], array( - 'default' => 'Use system default', - 'enable' => 'Enable (NAT + Proxy)', - 'purenat' => 'Enable (Pure NAT)', - 'disable' => 'Disable' + 'default' => gettext('Use system default'), + 'enable' => gettext('Enable (NAT + Proxy)'), + 'purenat' => gettext('Enable (Pure NAT)'), + 'disable' => gettext('Disable') ) )); if (isset($id) && $a_nat[$id] && (!isset($_GET['dup']) || !is_numericint($_GET['dup']))) { $hlpstr = ''; - $rulelist = array('' => 'None', 'pass' => 'Pass'); + $rulelist = array('' => gettext('None'), 'pass' => gettext('Pass')); if (is_array($config['filter']['rule'])) { filter_rules_sort(); foreach ($config['filter']['rule'] as $filter_id => $filter_rule) { if (isset($filter_rule['associated-rule-id'])) { - $rulelist[$filter_rule['associated-rule-id']] = 'Rule ' . $filter_rule['descr']; + $rulelist[$filter_rule['associated-rule-id']] = sprintf(gettext('Rule %s'), $filter_rule['descr']); if ($filter_rule['associated-rule-id'] == $pconfig['associated-rule-id']) { $hlpstr = '<a href="firewall_rules_edit.php?id=' . $filter_id . '">' . gettext("View the filter rule") . '</a><br />'; @@ -933,7 +933,7 @@ if (isset($id) && $a_nat[$id] && (!isset($_GET['dup']) || !is_numericint($_GET[' } if (isset($pconfig['associated-rule-id'])) { - $rulelist['new'] = 'Create new associated filter rule'; + $rulelist['new'] = gettext('Create new associated filter rule'); } $section->addInput(new Form_Select( @@ -949,9 +949,9 @@ if (isset($id) && $a_nat[$id] && (!isset($_GET['dup']) || !is_numericint($_GET[' 'add-associated', array( '' => 'None', - 'add-associated' => 'Add associated filter rule', - 'add-unassociated' => 'Add unassociated filter rule', - 'pass' => 'Pass' + 'add-associated' => gettext('Add associated filter rule'), + 'add-unassociated' => gettext('Add unassociated filter rule'), + 'pass' => gettext('Pass') ) ))->setHelp('The "pass" selection does not work properly with Multi-WAN. It will only work on an interface containing the default gateway.'); } |