mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
Merge branch 'MDL-73854-master' of https://github.com/HuongNV13/moodle
This commit is contained in:
commit
73a9aa130f
4
calendar/classes/external/month_exporter.php
vendored
4
calendar/classes/external/month_exporter.php
vendored
@ -246,10 +246,10 @@ class month_exporter extends exporter {
|
||||
'date' => (new date_exporter($date))->export($output),
|
||||
'periodname' => userdate($this->calendar->time, get_string('strftimemonthyear')),
|
||||
'previousperiod' => (new date_exporter($previousperiod))->export($output),
|
||||
'previousperiodname' => $previousperiod['month'],
|
||||
'previousperiodname' => userdate($previousperiod[0], get_string('strftimemonth')),
|
||||
'previousperiodlink' => $previousperiodlink->out(false),
|
||||
'nextperiod' => (new date_exporter($nextperiod))->export($output),
|
||||
'nextperiodname' => $nextperiod['month'],
|
||||
'nextperiodname' => userdate($nextperiod[0], get_string('strftimemonth')),
|
||||
'nextperiodlink' => $nextperiodlink->out(false),
|
||||
'larrow' => $output->larrow(),
|
||||
'rarrow' => $output->rarrow(),
|
||||
|
@ -50,6 +50,7 @@ $string['strftimedaydate'] = '%A, %d %B %Y';
|
||||
$string['strftimedaydatetime'] = '%A, %d %B %Y, %I:%M %p';
|
||||
$string['strftimedayshort'] = '%A, %d %B';
|
||||
$string['strftimedaytime'] = '%a, %H:%M';
|
||||
$string['strftimemonth'] = '%B';
|
||||
$string['strftimemonthyear'] = '%B %Y';
|
||||
$string['strftimerecent'] = '%d %b, %H:%M';
|
||||
$string['strftimerecentfull'] = '%a, %d %b %Y, %I:%M %p';
|
||||
|
@ -309,6 +309,7 @@ class core_string_manager_standard implements core_string_manager {
|
||||
'strftimedaydatetime' => 1,
|
||||
'strftimedayshort' => 1,
|
||||
'strftimedaytime' => 1,
|
||||
'strftimemonth' => 1,
|
||||
'strftimemonthyear' => 1,
|
||||
'strftimerecent' => 1,
|
||||
'strftimerecentfull' => 1,
|
||||
|
Loading…
x
Reference in New Issue
Block a user