L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-32632 fix date formatting on Windows

Browse Source
This commit is contained in:
Petr Skoda
2012-06-01 12:24:33 +02:00
parent 4db061680e
commit 63d59875b5
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+18 -11
View File
@@ -2013,8 +2013,17 @@ function userdate($date, $format = '', $timezone = 99, $fixday = true, $fixhour
$timezone = get_user_timezone_offset($timezone);
// If we are running under Windows convert to windows encoding and then back to UTF-8
// (because it's impossible to specify UTF-8 to fetch locale info in Win32)
if (abs($timezone) > 13) { /// Server time
$datestring = strftime($format, $date);
if ($CFG->ostype == 'WINDOWS' and ($localewincharset = get_string('localewincharset', 'langconfig'))) {
$format = textlib::convert($format, 'utf-8', $localewincharset);
$datestring = strftime($format, $date);
$datestring = textlib::convert($datestring, $localewincharset, 'utf-8');
} else {
$datestring = strftime($format, $date);
}
if ($fixday) {
$daystring = ltrim(str_replace(array(' 0', ' '), '', strftime(' %d', $date)));
$datestring = str_replace('DD', $daystring, $datestring);
@@ -2023,9 +2032,16 @@ function userdate($date, $format = '', $timezone = 99, $fixday = true, $fixhour
$hourstring = ltrim(str_replace(array(' 0', ' '), '', strftime(' %I', $date)));
$datestring = str_replace('HH', $hourstring, $datestring);
}
} else {
$date += (int)($timezone * 3600);
$datestring = gmstrftime($format, $date);
if ($CFG->ostype == 'WINDOWS' and ($localewincharset = get_string('localewincharset', 'langconfig'))) {
$format = textlib::convert($format, 'utf-8', $localewincharset);
$datestring = gmstrftime($format, $date);
$datestring = textlib::convert($datestring, $localewincharset, 'utf-8');
} else {
$datestring = gmstrftime($format, $date);
}
if ($fixday) {
$daystring = ltrim(str_replace(array(' 0', ' '), '', gmstrftime(' %d', $date)));
$datestring = str_replace('DD', $daystring, $datestring);
@@ -2036,15 +2052,6 @@ function userdate($date, $format = '', $timezone = 99, $fixday = true, $fixhour
}
}
/// If we are running under Windows convert from windows encoding to UTF-8
/// (because it's impossible to specify UTF-8 to fetch locale info in Win32)
if ($CFG->ostype == 'WINDOWS') {
if ($localewincharset = get_string('localewincharset', 'langconfig')) {
$datestring = textlib::convert($datestring, $localewincharset, 'utf-8');
}
}
return $datestring;
}