extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-08 06:59:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed common::setLocal() to fallback to en_US, not en_EN (which does not exist) and then de_DE (giving german)

Browse Source
This commit is contained in:
Ralf Becker 2010-01-24 01:08:48 +00:00
parent 6cdc417ee8
commit e1122bb88f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpgwapi/inc/class.common.inc.php
View File

@ -53,13 +53,16 @@ class common
$lang.'_'.$country, $lang.'_'.$country,
$lang.'_'.$country_from_lang, $lang.'_'.$country_from_lang,
$lang, $lang,
'en_EN', 'en_US',
'de_DE', // this works with utf-8, en_EN@utf-8 does NOT!
'C', 'C',
) as $local) ) as $local)
{ {
if (($ret = setlocale($category,$local.'@'.$charset))) return $ret; if (($ret = setlocale($category,$local.'@'.$charset)) ||
if (($ret = setlocale($category,$local))) return $ret; ($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!"); 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 return false; // should not happen, as the 'C' local should at least be available everywhere