fix strftime in windows, use %#d instead of %e in windows

This commit is contained in:
scambra 2012-10-19 14:03:51 +02:00
parent ab944094e2
commit 9601352d46
1 changed files with 6 additions and 1 deletions

View File

@ -223,7 +223,12 @@ class OC_L10N{
$locales[] = $locales[0].'_'.strtoupper($locales[0]); $locales[] = $locales[0].'_'.strtoupper($locales[0]);
} }
setlocale(LC_TIME, $locales); setlocale(LC_TIME, $locales);
return strftime($this->localizations[$type], $data); $format = $this->localizations[$type];
// Check for Windows to find and replace the %e modifier correctly
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
$format = preg_replace('#(?<!%)((?:%%)*)%e#', '\1%#d', $format);
}
return strftime($format, $data);
break; break;
case 'firstday': case 'firstday':
case 'jsdate': case 'jsdate':