Project

General

Profile

« Previous | Next » 

Revision eafb21b3

Added by Phil Davis almost 13 years ago

Separate backend keywords from GUI language display in captive portal

When the GUI language was set to Portuguese, keywords like "default" and "unformatted" would be translated into Portuguese and written to config.xml - causing problems downstream in starting Captive Portal. Now the displayed values are in the GUI language but the underlying keywords stay in "computer-speak" in config.xml - forum http://forum.pfsense.org/index.php/topic,51988.msg281131.html#msg281131

View differences:

usr/local/www/services_captiveportal.php
816 816 
			<tr>
817 817 
				<td class="vncell" valign="top"><?=gettext("Type"); ?></td>
818 818 
				<td class="vtable"><select name="radiusvendor" id="radiusvendor">
819 
				<option><?=gettext("default"); ?></option>
819 
				<option value="default"><?php echo gettext("default"); ?></option>
820 820 
				<?php
821 821 
				$radiusvendors = array("cisco");
822 822 
				foreach ($radiusvendors as $radiusvendor){
......
836 836 
        <td class="vncell" valign="top"><?=gettext("MAC address format"); ?></td>
837 837 
        <td class="vtable">
838 838 
        <select name="radmac_format" id="radmac_format">
839 
        <option><?=gettext("default"); ?></option>
839 
        <option value="default"><?php echo gettext("default"); ?></option>
840 840 
        <?php
841 
        $macformats = array(gettext("singledash"),gettext("ietf"),gettext("cisco"),gettext("unformatted"));
841 
        $macformats = array("singledash","ietf","cisco","unformatted");
842 842 
        foreach ($macformats as $macformat) {
843 843 
            if ($pconfig['radmac_format'] == $macformat)
844 
                echo "<option selected value=\"$macformat\">$macformat</option>\n";
844 
                echo "<option selected value=\"$macformat\">",gettext($macformat),"</option>\n";
845 845 
            else
846 
                echo "<option value=\"$macformat\">$macformat</option>\n";
846 
                echo "<option value=\"$macformat\">",gettext($macformat),"</option>\n";
847 847 
        }
848 848 
        ?>
849 849 
        </select></br>

Also available in: Unified diff