From 1563486928e50a30175318f510568bda889ab53f Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 3 Aug 2010 12:57:54 -0300 Subject: Sync interfaces_* with mainline/master --- usr/local/www/interfaces_gre_edit.php | 52 ++++++++++++++++---------------- usr/local/www/interfaces_qinq_edit.php | 54 +++++++++++++++++----------------- 2 files changed, 53 insertions(+), 53 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/interfaces_gre_edit.php b/usr/local/www/interfaces_gre_edit.php index a59affc..3eae000 100644 --- a/usr/local/www/interfaces_gre_edit.php +++ b/usr/local/www/interfaces_gre_edit.php @@ -71,7 +71,7 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "if tunnel-remote-addr tunnel-remote-net tunnel-local-addr"); - $reqdfieldsn = explode(",", "Parent interface,Local address, Remote tunnel address, Remote tunnel network, Local tunnel address"); + $reqdfieldsn = array(gettext("Parent interface"),gettext("Local address"),gettext("Remote tunnel address"),gettext("Remote tunnel network"), gettext("Local tunnel address")); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); @@ -85,7 +85,7 @@ if ($_POST) { continue; if (($gre['if'] == $_POST['if']) && ($gre['tunnel-remote-net'] == $_POST['tunnel-remote-net'])) { - $input_errors[] = "A gre with the network {$gre['remote-network']} is already defined."; + $input_errors[] = sprintf(gettext("A gre with the network %s is already defined."),$gre['remote-network']); break; } } @@ -105,7 +105,7 @@ if ($_POST) { $gre['greif'] = interface_gre_configure($gre); if ($gre['greif'] == "" || !stristr($gre['greif'], "gre")) - $input_errors[] = "Error occured creating interface, please retry."; + $input_errors[] = gettext("Error occured creating interface, please retry."); else { if (isset($id) && $a_gres[$id]) $a_gres[$id] = $gre; @@ -120,7 +120,7 @@ if ($_POST) { } } -$pgtitle = array("Firewall","GRE","Edit"); +$pgtitle = array(gettext("Firewall"),gettext("GRE"),gettext("Edit")); include("head.inc"); ?> @@ -131,10 +131,10 @@ include("head.inc");
- + - + + - + + - + + - + + - + + - + - + + - + +
GRE configuration
Parent interface
- The interface here serves as the local address to be used for the GRE tunnel.
GRE remote address
- Peer address where encapsulated GRE packets will be sent
GRE tunnel local address
- Local GRE tunnel endpoint
GRE tunnel remote address
- Remote GRE address endpoint. The subnet part is used for the determining the network that is tunneled.
Mobile tunnel >
- Specify which encapsulation method the tunnel should use.
Route search type >
- For correct operation, the GRE device needs a route to the destination - that is less specific than the one over the tunnel. (Basically, there - needs to be a route to the decapsulating host that does not run over the - tunnel, as this would be a loop.) +
WCCP version >
- Specify which WCCP encapsulation(version 1 or 2) method the tunnel should use
Description -
You may enter a description here - for your reference (not parsed).
  - + "> " onclick="history.back()"> diff --git a/usr/local/www/interfaces_qinq_edit.php b/usr/local/www/interfaces_qinq_edit.php index 1ea76e4..a820e14 100755 --- a/usr/local/www/interfaces_qinq_edit.php +++ b/usr/local/www/interfaces_qinq_edit.php @@ -36,7 +36,7 @@ ##|*MATCH=interfaces_qinq_edit.php* ##|-PRIV -$pgtitle = array("Interfaces","QinQ", "Edit"); +$pgtitle = array(gettext("Interfaces"),gettext("QinQ"), gettext("Edit")); require("guiconfig.inc"); @@ -81,19 +81,19 @@ if ($_POST) { $pconfig = $_POST; if (empty($_POST['tag'])) - $input_errors[] = "First level tag cannot be empty."; + $input_errors[] = gettext("First level tag cannot be empty."); if (isset($id) && $a_qinqs[$id]['tag'] != $_POST['tag']) - $input_errors[] = "You are editing an existing entry and modifying the first level tag is not allowed."; + $input_errors[] = gettext("You are editing an existing entry and modifying the first level tag is not allowed."); if (isset($id) && $a_qinqs[$id]['if'] != $_POST['if']) - $input_errors[] = "You are editing an existing entry and modifying the interface is not allowed."; + $input_errors[] = gettext("You are editing an existing entry and modifying the interface is not allowed."); if (!isset($id)) { foreach ($a_qinqs as $qinqentry) if ($qinqentry['tag'] == $_POST['tag'] && $qinqentry['if'] == $_POST['if']) - $input_errors[] = "QinQ level already exists for this interface, edit it!"; + $input_errors[] = gettext("QinQ level already exists for this interface, edit it!"); if (is_array($config['vlans']['vlan'])) { foreach ($config['vlans']['vlan'] as $vlan) if ($vlan['tag'] == $_POST['tag'] && $vlan['if'] == $_POST['if']) - $input_errors[] = "A normal VLAN exists with this tag please remove it to use this tag for QinQ first level."; + $input_errors[] = gettext("A normal VLAN exists with this tag please remove it to use this tag for QinQ first level."); } } @@ -120,7 +120,7 @@ if ($_POST) { if (count($member) > 1) { if (preg_match("/([^0-9])+/", $member[0], $match) || preg_match("/([^0-9])+/", $member[1], $match)) - $input_errors[] = "Tags can contain only numbers or a range in format #-#."; + $input_errors[] = gettext("Tags can contain only numbers or a range in format #-#."); for ($i = $member[0]; $i <= $member[1]; $i++) { if ($isfirst > 0) @@ -130,7 +130,7 @@ if ($_POST) { } } else { if (preg_match("/([^0-9])+/", $_POST["members{$x}"], $match)) - $input_errors[] = "Tags can contain only numbers or a range in format #-#."; + $input_errors[] = gettext("Tags can contain only numbers or a range in format #-#."); if ($isfirst > 0) $members .= " "; @@ -190,7 +190,7 @@ if ($_POST) { $gentry = array(); $gentry['ifname'] = "QinQ"; $gentry['members'] = "{$additions}"; - $gentry['descr'] = "QinQ VLANs group"; + $gentry['descr'] = gettext("QinQ VLANs group"); $config['ifgroups']['ifgroupentry'][] = $gentry; } } @@ -266,11 +266,11 @@ function removeRow(el) { } } - rowname[0] = "members"; + rowname[0] = ; rowtype[0] = "textbox"; rowsize[0] = "30"; - rowname[2] = "detail"; + rowname[2] = ; rowtype[2] = "textbox"; rowsize[2] = "50"; @@ -282,10 +282,10 @@ function removeRow(el) { - + - + + - + - + - + - +
Interface QinQ Edit
Parent interface
- Only QinQ capable interfaces will be shown.
First level tag
- This is the first level VLAN tag. On top of this are stacked the member VLANs defined below. +
Options
@@ -330,30 +330,30 @@ function removeRow(el) {
> - Adds interface to QinQ interface groups so you can write filter rules easily. +
Description
- You may enter a description here for your reference (not parsed). +
Member (s)
 - You can specify ranges in the input below. The format is pretty simple i.e 9-100 or 10.20... +
- + " class="formselect" id="members" value="">
Tag
- + " />
- + " />
  - - + " /> + " /> -- cgit v1.1