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

Merge branch 'MDL-6102-master' of git://github.com/sammarshallou/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2012-01-09 22:02:10 +01:00
parent fb051bf072 487de67c48
commit 528dbf2f7d
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en/langconfig.php
+4 -4
View File
@@ -39,16 +39,16 @@ $string['parentlanguage'] = '';
$string['strftimedate'] = '%d %B %Y';
$string['strftimedatefullshort'] = '%d/%m/%y';
$string['strftimedateshort'] = '%d %B';
$string['strftimedatetime'] = '%d %B %Y, %I:%M %p';
$string['strftimedatetime'] = '%d %B %Y, %l:%M %p';
$string['strftimedatetimeshort'] = '%d/%m/%y, %H:%M';
$string['strftimedaydate'] = '%A, %d %B %Y';
$string['strftimedaydatetime'] = '%A, %d %B %Y, %I:%M %p';
$string['strftimedaydatetime'] = '%A, %d %B %Y, %l:%M %p';
$string['strftimedayshort'] = '%A, %d %B';
$string['strftimedaytime'] = '%a, %H:%M';
$string['strftimemonthyear'] = '%B %Y';
$string['strftimerecent'] = '%d %b, %H:%M';
$string['strftimerecentfull'] = '%a, %d %b %Y, %I:%M %p';
$string['strftimetime'] = '%I:%M %p';
$string['strftimerecentfull'] = '%a, %d %b %Y, %l:%M %p';
$string['strftimetime'] = '%l:%M %p';
$string['thisdirection'] = 'ltr';
$string['thisdirectionvertical'] = 'btt';
$string['thislanguage'] = 'English';
lib/moodlelib.php
+3 -1
View File
@@ -1987,8 +1987,10 @@ function userdate($date, $format = '', $timezone = 99, $fixday = true) {
$textlib = textlib_get_instance();
$datestring = $textlib->convert($datestring, $localewincharset, 'utf-8');
}
}
}
// When using the %l (12-hour time with no leading zero), it adds unwanted spaces
$datestring = trim(str_replace(' ', ' ', $datestring));
return $datestring;
}