Permalink
Browse files

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

…moodle
  • Loading branch information...
dmonllao committed Jan 9, 2018
2 parents 1679485 + 099bca6 commit 51673a34697bae749e18d9533cdf11f32b718454
Showing with 9 additions and 0 deletions.
  1. +7 −0 calendar/lib.php
  2. +2 −0 lang/en/langconfig.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);
}
@@ -48,6 +48,8 @@
$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';

0 comments on commit 51673a3

Please sign in to comment.