Merge pull request #40 from scambra/dateformat-fixes

Dateformat fixes
remotes/origin/stable5
Lukas Reschke 12 years ago
commit d18ea0e76c
  1. 7
      lib/l10n.php

@ -223,7 +223,12 @@ class OC_L10N{
$locales[] = $locales[0].'_'.strtoupper($locales[0]);
}
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;
case 'firstday':
case 'jsdate':

Loading…
Cancel
Save