mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-27 00:58:55 +01:00
fixed common::setLocal() to fallback to en_US, not en_EN (which does not exist) and then de_DE (giving german)
This commit is contained in:
parent
c73107cb7a
commit
0c5e495994
@ -53,13 +53,16 @@ class common
|
||||
$lang.'_'.$country,
|
||||
$lang.'_'.$country_from_lang,
|
||||
$lang,
|
||||
'en_EN',
|
||||
'de_DE', // this works with utf-8, en_EN@utf-8 does NOT!
|
||||
'en_US',
|
||||
'C',
|
||||
) as $local)
|
||||
{
|
||||
if (($ret = setlocale($category,$local.'@'.$charset))) return $ret;
|
||||
if (($ret = setlocale($category,$local))) return $ret;
|
||||
if (($ret = setlocale($category,$local.'@'.$charset)) ||
|
||||
($ret = setlocale($category,$local)))
|
||||
{
|
||||
//error_log(__METHOD__."($category,$charset) lang=$lang, country=$country, country_from_lang=$country_from_lang: returning '$ret'");
|
||||
return $ret;
|
||||
}
|
||||
}
|
||||
error_log(__METHOD__."($category,$charset) lang=$lang, country=$country, country_from_lang=$country_from_lang: Could not set local!");
|
||||
return false; // should not happen, as the 'C' local should at least be available everywhere
|
||||
|
Loading…
Reference in New Issue
Block a user