mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-04 07:08:51 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-60742-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
David Monllao 2018-01-09 09:52:44 +01:00
commit 51673a3469
2 changed files with 9 additions and 0 deletions
calendar
lib.php
lang/en
langconfig.php

7
calendar/lib.php

@ -1819,6 +1819,13 @@ function calendar_time_representation($time) {
$timeformat = get_config(null, 'calendar_site_timeformat');
}
// Allow language customization of selected time format.
if ($timeformat === CALENDAR_TF_12) {
$timeformat = get_string('strftimetime12', 'langconfig');
} else if ($timeformat === CALENDAR_TF_24) {
$timeformat = get_string('strftimetime24', 'langconfig');
}
return userdate($time, empty($timeformat) ? $langtimeformat : $timeformat);
}

2
lang/en/langconfig.php

@ -48,6 +48,8 @@ $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['strftimetime12'] = '%I:%M %p';
$string['strftimetime24'] = '%H:%M';
$string['thisdirection'] = 'ltr';
$string['thisdirectionvertical'] = 'btt';
$string['thislanguage'] = 'English';