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

moodle · Sep 18, 2012 · a2c5f73 · a2c5f73
2 parents b454629 + 3fe4a2f
commit a2c5f73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/calendar/view.php b/calendar/view.php
@@ -98,11 +98,11 @@
 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');

diff --git a/lang/en/calendar.php b/lang/en/calendar.php
@@ -38,11 +38,13 @@
 $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';