holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"fixed not correctly translated holidays downloaded from egroupware.org

Browse Source 
(charset was not recogniced because of HTTP headers before charset line)"
This commit is contained in:
Ralf Becker 2009-04-09 07:14:07 +00:00
parent cb46bce9cf
commit 1c1ae40e40
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
calendar/inc/class.boholiday.inc.php
View File

@ -26,7 +26,7 @@
'delete_holiday' => True,
'delete_locale' => True,
'accept_holiday' => True,
'read_entries' => True,
'read_entry' => True,
'add_entry' => True,
@ -168,7 +168,7 @@
}
// sort holidays by year / occurence:
usort($holidays,'_holiday_cmp');
$last_year = -1;
foreach($holidays as $holiday)
{
@ -291,16 +291,23 @@
$lines = @file(EGW_SERVER_ROOT.'/calendar/egroupware.org/holidays.'.strtoupper($locale).'.csv');
}
else
{
$lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale).'.csv');
}
if (!$lines)
{
return false;
}
$charset = split("[\t\n ]+",$lines[0]); // give a bit flexibility in the syntax AND remove the lineend (\n)
if (strpos($charset[0],'charset') !== false && $charset[1])
// reading the holidayfile from egroupware.org via network::gethttpsocketfile contains all the headers!
foreach($lines as $n => $line)
{
$lines = $GLOBALS['egw']->translation->convert($lines,$charset[1]);
$fields = split("[\t\n ]+",$line);
if ($fields[0] == 'charset' && $fields[1])
{
$lines = $GLOBALS['egw']->translation->convert($lines,$fields[1]);
break;
}
}
$c_lines = count($lines);
foreach ($lines as $i => $line)
@ -475,7 +482,7 @@
$dow_str = Array(lang('Sun'),lang('Mon'),lang('Tue'),lang('Wed'),lang('Thu'),lang('Fri'),lang('Sat'));
$dow = $dow_str[$holiday['dow']];
$str = lang('%1 %2 in %3',$occ,$dow,$month);
}
else