diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 12:57:54 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 12:57:54 -0300 |
commit | 1563486928e50a30175318f510568bda889ab53f (patch) | |
tree | 7a1ffc02d6cd6be8f5d6f00ec80206a6483779ad | |
parent | 5f4fda7e8347ca44e6a8bb367c4f3b53cf556e3b (diff) | |
download | pfsense-1563486928e50a30175318f510568bda889ab53f.zip pfsense-1563486928e50a30175318f510568bda889ab53f.tar.gz |
Sync interfaces_* with mainline/master
-rw-r--r-- | usr/local/www/interfaces_gre_edit.php | 52 | ||||
-rwxr-xr-x | usr/local/www/interfaces_qinq_edit.php | 54 |
2 files changed, 53 insertions, 53 deletions
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"); <form action="interfaces_gre_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td colspan="2" valign="top" class="listtopic">GRE configuration</td> + <td colspan="2" valign="top" class="listtopic"><?=gettext("GRE configuration");?></td> </tr> <tr> - <td width="22%" valign="top" class="vncellreq">Parent interface</td> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Parent interface");?></td> <td width="78%" class="vtable"> <select name="if" class="formselect"> <?php @@ -148,24 +148,24 @@ include("head.inc"); ?> </select> <br/> - <span class="vexpl">The interface here serves as the local address to be used for the GRE tunnel.</span></td> + <span class="vexpl"><?=gettext("The interface here serves as the local address to be used for the GRE tunnel.");?></span></td> </tr> <tr> - <td valign="top" class="vncellreq">GRE remote address</td> + <td valign="top" class="vncellreq"><?=gettext("GRE remote address");?></td> <td class="vtable"> <input name="remote-addr" type="text" class="formfld unknown" id="remote-addr" size="16" value="<?=$pconfig['remote-addr'];?>"> <br> - <span class="vexpl">Peer address where encapsulated GRE packets will be sent </span></td> + <span class="vexpl"><?=gettext("Peer address where encapsulated GRE packets will be sent ");?></span></td> </tr> <tr> - <td valign="top" class="vncellreq">GRE tunnel local address </td> + <td valign="top" class="vncellreq"><?=gettext("GRE tunnel local address ");?></td> <td class="vtable"> <input name="tunnel-local-addr" type="text" class="formfld unknown" id="tunnel-local-addr" size="16" value="<?=$pconfig['tunnel-local-addr'];?>"> <br> - <span class="vexpl">Local GRE tunnel endpoint</span></td> + <span class="vexpl"><?=gettext("Local GRE tunnel endpoint");?></span></td> </tr> <tr> - <td valign="top" class="vncellreq">GRE tunnel remote address </td> + <td valign="top" class="vncellreq"><?=gettext("GRE tunnel remote address ");?></td> <td class="vtable"> <input name="tunnel-remote-addr" type="text" class="formfld unknown" id="tunnel-remote-addr" size="16" value="<?=$pconfig['tunnel-remote-addr'];?>"> <select name="tunnel-remote-net" class="formselect" id="tunnel-remote-net"> @@ -180,46 +180,46 @@ include("head.inc"); ?> </select> <br/> - <span class="vexpl">Remote GRE address endpoint. The subnet part is used for the determining the network that is tunneled.</span></td> + <span class="vexpl"><?=gettext("Remote GRE address endpoint. The subnet part is used for the determining the network that is tunneled.");?></span></td> </tr> <tr> - <td valign="top" class="vncell">Mobile tunnel</td> + <td valign="top" class="vncell"><?=gettext("Mobile tunnel");?></td> <td class="vtable"> <input name="link0" type="checkbox" id="link0" <?if ($pconfig['link0']) echo "checked";?>> <br> - <span class="vexpl">Specify which encapsulation method the tunnel should use. </span></td> + <span class="vexpl"><?=gettext("Specify which encapsulation method the tunnel should use. ");?></span></td> </tr> <tr> - <td valign="top" class="vncell">Route search type</td> + <td valign="top" class="vncell"><?=gettext("Route search type");?></td> <td class="vtable"> <input name="link1" type="checkbox" id="link1" <?if ($pconfig['link1']) echo "checked";?>> <br> <span class="vexpl"> - 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.) + <?=gettext("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.");?> </span></td> </tr> <tr> - <td valign="top" class="vncell">WCCP version</td> + <td valign="top" class="vncell"><?=gettext("WCCP version");?></td> <td class="vtable"> <input name="link2" type="checkbox" id="link2" <?if ($pconfig['link2']) echo "checked";?>> <br> - <span class="vexpl">Specify which WCCP encapsulation(version 1 or 2) method the tunnel should use</span></td> + <span class="vexpl"><?=gettext("Specify which WCCP encapsulation(version 1 or 2) method the tunnel should use");?></span></td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Description</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> <td width="78%" class="vtable"> <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"> - <br> <span class="vexpl">You may enter a description here - for your reference (not parsed).</span></td> + <br> <span class="vexpl"><?=gettext("You may enter a description here". + " for your reference (not parsed).");?></span></td> </tr> <tr> <td width="22%" valign="top"> </td> <td width="78%"> <input type="hidden" name="greif" value="<?=$pconfig['greif']; ?>"> - <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" value="Cancel" onclick="history.back()"> + <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"> <input type="button" value="<?=gettext("Cancel");?>" onclick="history.back()"> <?php if (isset($id) && $a_gres[$id]): ?> <input name="id" type="hidden" value="<?=$id;?>"> <?php endif; ?> 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] = <?=gettext("members");?>; rowtype[0] = "textbox"; rowsize[0] = "30"; - rowname[2] = "detail"; + rowname[2] = <?=gettext("detail");?>; rowtype[2] = "textbox"; rowsize[2] = "50"; </script> @@ -282,10 +282,10 @@ function removeRow(el) { <form action="interfaces_qinq_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td colspan="2" valign="top" class="listtopic">Interface QinQ Edit</td> + <td colspan="2" valign="top" class="listtopic"><?=gettext("Interface QinQ Edit");?></td> </tr> <tr> - <td width="22%" valign="top" class="vncellreq">Parent interface</td> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Parent interface");?></td> <td width="78%" class="vtable"> <select name="if" id="if" class="formselect"> <?php @@ -302,20 +302,20 @@ function removeRow(el) { ?> </select> <br/> - <span class="vexpl">Only QinQ capable interfaces will be shown.</span></td> + <span class="vexpl"><?=gettext("Only QinQ capable interfaces will be shown.");?></span></td> </tr> <tr> - <td width="22%" valign="top" class="vncellreq">First level tag</td> + <td width="22%" valign="top" class="vncellreq"><?=gettext("First level tag");?></td> <td width="78%" class="vtable"> <input name="tag" type="text" class="formfld unknown" id="tag" size="10" value="<?=$pconfig['tag'];?>" /> <br /> <span class="vexpl"> - This is the first level VLAN tag. On top of this are stacked the member VLANs defined below. + <?=gettext("This is the first level VLAN tag. On top of this are stacked the member VLANs defined below.");?> </span> </td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Options</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Options");?></td> <td width="78%" class="vtable"> <?php /* ?> <br/> @@ -330,30 +330,30 @@ function removeRow(el) { <?php */ ?> <br/> <input name="autogroup" type="checkbox" value="yes" id="autogroup" <? if ($pconfig['autogroup']) echo "checked";?>> - <span class="vexpl"> Adds interface to QinQ interface groups so you can write filter rules easily.</span> + <span class="vexpl"><?=gettext("Adds interface to QinQ interface groups so you can write filter rules easily.");?></span> </td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Description</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> <td width="78%" class="vtable"> <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=$pconfig['descr'];?>" /> <br /> <span class="vexpl"> - You may enter a description here for your reference (not parsed). + <?=gettext("You may enter a description here for your reference (not parsed).");?> </span> </td> </tr> <tr> - <td width="22%" valign="top" class="vncellreq"><div id="membersnetworkport">Member (s)</div></td> + <td width="22%" valign="top" class="vncellreq"><div id="membersnetworkport"><?=gettext("Member (s)");?></div></td> <td width="78%" class="vtable"> <span vlass="vexpl"> - You can specify ranges in the input below. The format is pretty simple i.e 9-100 or 10.20... + <?=gettext("You can specify ranges in the input below. The format is pretty simple i.e 9-100 or 10.20...");?> </span> <br/> <table id="maintable"> <tbody> <tr> - <td><div id="onecolumn">Tag</div></td> + <td><div id="onecolumn"><?=gettext("Tag");?></div></td> </tr> <?php @@ -370,7 +370,7 @@ function removeRow(el) { <input name="members<?php echo $tracker; ?>" class="formselect" id="members<?php echo $tracker; ?>" value="<? echo $members;?>"> </td> <td> - <input type="image" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(this); return false;" value="Delete" /> + <input type="image" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(this); return false;" value="<?=gettext("Delete");?>" /> </td> </tr> <?php @@ -385,15 +385,15 @@ function removeRow(el) { </tfoot> </table> <a onclick="javascript:addRowTo('maintable'); return false;" href="#"> - <img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="add another entry" /> + <img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" /> </a> </td> </tr> <tr> <td width="22%" valign="top"> </td> <td width="78%"> - <input id="submit" name="submit" type="submit" class="formbtn" value="Save" /> - <a href="interfaces_qinq.php"><input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="Cancel" /></a> + <input id="submit" name="submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> + <a href="interfaces_qinq.php"><input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="<?=gettext("Cancel");?>" /></a> <?php if (isset($id) && $a_qinqs[$id]): ?> <input name="id" type="hidden" value="<?=$id;?>" /> <?php endif; ?> |