Merge pull request #766 from btactic/language_autodetect

Improve autodetection of language.
This commit is contained in:
Thomas Müller 2012-12-12 03:43:17 -08:00
commit 72fe339c10
1 changed files with 8 additions and 2 deletions

View File

@ -294,8 +294,14 @@ class OC_L10N{
}
foreach($accepted_languages as $i) {
$temp = explode(';', $i);
if(array_search($temp[0], $available) !== false) {
return $temp[0];
$temp[0] = str_replace('-','_',$temp[0]);
if( ($key = array_search($temp[0], $available)) !== false) {
return $available[$key];
}
foreach($available as $l) {
if ( $temp[0] == substr($l,0,2) ) {
return $l;
}
}
}
}