1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-28 18:30:53 +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; break;
case 'language': case 'language':
require_once(e_HANDLER.'file_class.php'); //FIXME obtrusive and may not work with session or subdomains - certainly better to use {LANGUAGELINKS} anyway
$fl = new e_file; $languageList = explode(',', e_LANLIST);
$reject = array('.','..','/','CVS','thumbs.db','*._$'); sort($languageList);
$lanlist = $fl->get_dirs(e_LANGUAGEDIR); $action = (e_QUERY && ! $_GET['elan']) ? e_SELF.'?'.e_QUERY : e_SELF;
sort($lanlist); $text = '
$action = (e_QUERY && !$_GET['elan']) ? e_SELF.'?'.e_QUERY : e_SELF; <form method="post" action="'.$action.'" id="langchange">
$lantext = "<form method='post' action='".$action."' id='langchange'> <select name="sitelanguage" class="tbox" onchange=\'document.getElementById("langchange").submit()\'>';
<div><select name='sitelanguage' class='tbox' onchange=\"document.getElementById('langchange').submit()\">\n";
foreach($lanlist as $langval) foreach($languageList as $languageFolder)
{ {
$langname = $langval; $selected = ($languageFolder == e_LANGUAGE) ? ' selected="selected"' : '';
$langval = ($langval == $pref['sitelanguage']) ? '' : $langval; $text .= '
$selected = ($langval == USERLAN) ? "selected='selected'" : ''; <option value="'.$languageFolder.'"'.$selected.'>'.$languageFolder.'</option>';
$lantext .= "<option value='".$langval."' $selected>".$langname."</option>\n "; }
}
$lantext .= "</select> $text .= '
<input type='hidden' name='setlanguage' value='1' /> </select>
</div></form> <input type="hidden" name="setlanguage" value="1" />
"; </form>';
return $lantext; return $text;
break; break;
case 'clock': case 'clock':
$clock_flat = true; $clock_flat = true;

View File

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