1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-28 10:20:45 +02:00

Language selection simplification

work in progress
This commit is contained in:
marj
2009-08-03 21:54:28 +00:00
parent 5e093d018e
commit 96cdd31536
2 changed files with 22 additions and 24 deletions

View File

@@ -61,29 +61,27 @@ function custom_shortcode($parm)
break;
case 'language':
require_once(e_HANDLER.'file_class.php');
$fl = new e_file;
$reject = array('.','..','/','CVS','thumbs.db','*._$');
$lanlist = $fl->get_dirs(e_LANGUAGEDIR);
sort($lanlist);
$action = (e_QUERY && !$_GET['elan']) ? e_SELF.'?'.e_QUERY : e_SELF;
$lantext = "<form method='post' action='".$action."' id='langchange'>
<div><select name='sitelanguage' class='tbox' onchange=\"document.getElementById('langchange').submit()\">\n";
//FIXME obtrusive and may not work with session or subdomains - certainly better to use {LANGUAGELINKS} anyway
$languageList = explode(',', e_LANLIST);
sort($languageList);
$action = (e_QUERY && ! $_GET['elan']) ? e_SELF.'?'.e_QUERY : e_SELF;
$text = '
<form method="post" action="'.$action.'" id="langchange">
<select name="sitelanguage" class="tbox" onchange=\'document.getElementById("langchange").submit()\'>';
foreach($lanlist as $langval)
{
$langname = $langval;
$langval = ($langval == $pref['sitelanguage']) ? '' : $langval;
$selected = ($langval == USERLAN) ? "selected='selected'" : '';
$lantext .= "<option value='".$langval."' $selected>".$langname."</option>\n ";
}
foreach($languageList as $languageFolder)
{
$selected = ($languageFolder == e_LANGUAGE) ? ' selected="selected"' : '';
$text .= '
<option value="'.$languageFolder.'"'.$selected.'>'.$languageFolder.'</option>';
}
$lantext .= "</select>
<input type='hidden' name='setlanguage' value='1' />
</div></form>
";
return $lantext;
break;
$text .= '
</select>
<input type="hidden" name="setlanguage" value="1" />
</form>';
return $text;
break;
case 'clock':
$clock_flat = true;

View File

@@ -9,8 +9,8 @@
*
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/user_menu/userlanguage_menu.php,v $
* $Revision: 1.3 $
* $Date: 2009-08-03 19:41:17 $
* $Revision: 1.4 $
* $Date: 2009-08-03 21:54:28 $
* $Author: marj_nl_fr $
*/
//TODO homogenisation with languagelinks + do not force www + unobtrusive redirect
@@ -47,7 +47,7 @@ else
$action = (e_QUERY && ! $_GET['elan']) ? e_SELF.'?'.e_QUERY : e_SELF;
$text = '
<form method="post" action="'.$action.'">
<div style="text-align:center">
<div class="center">
<select name="sitelanguage" class="tbox">';
foreach($languageList as $languageFolder)
{