Merge branch 'MDL-35224-master' of git://github.com/ankitagarwal/moodle

This commit is contained in:
Dan Poltawski 2012-09-18 14:50:06 +08:00
commit a2c5f73194
2 changed files with 4 additions and 2 deletions

View File

@ -98,11 +98,11 @@ $time = make_timestamp($yr, $mon, $day);
switch($view) {
case 'day':
$PAGE->navbar->add(userdate($time, get_string('strftimedate')));
$pagetitle = get_string('dayview', 'calendar');
$pagetitle = get_string('dayviewtitle', 'calendar', userdate($time, get_string('strftimedaydate')));
break;
case 'month':
$PAGE->navbar->add(userdate($time, get_string('strftimemonthyear')));
$pagetitle = get_string('detailedmonthview', 'calendar');
$pagetitle = get_string('detailedmonthviewtitle', 'calendar', userdate($time, get_string('strftimemonthyear')));
break;
case 'upcoming':
$pagetitle = get_string('upcomingevents', 'calendar');

View File

@ -38,11 +38,13 @@ $string['courseevent'] = 'Course event';
$string['courseevents'] = 'Course events';
$string['courses'] = 'Courses';
$string['dayview'] = 'Day view';
$string['dayviewtitle'] = 'Day view: {$a}';
$string['daywithnoevents'] = 'There are no events this day.';
$string['default'] = 'Default';
$string['deleteevent'] = 'Delete event';
$string['deleteevents'] = 'Delete events';
$string['detailedmonthview'] = 'Detailed month view';
$string['detailedmonthviewtitle'] = 'Detailed month view: {$a}';
$string['durationminutes'] = 'Duration in minutes';
$string['durationnone'] = 'Without duration';
$string['durationuntil'] = 'Until';