mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-71927' of https://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2021-06-17 10:52:18 +08:00
commit f2ed5255e5
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/en/langconfig.php
View File

@ -43,7 +43,9 @@ $string['strftimedatefullshort'] = '%d/%m/%y';
$string['strftimedateshort'] = '%d %B';
$string['strftimedateshortmonthabbr'] = '%d %b';
$string['strftimedatetime'] = '%d %B %Y, %I:%M %p';
$string['strftimedatetimeaccurate'] = '%d %B %Y, %I:%M:%S %p';
$string['strftimedatetimeshort'] = '%d/%m/%y, %H:%M';
$string['strftimedatetimeshortaccurate'] = '%d/%m/%y, %H:%M:%S';
$string['strftimedaydate'] = '%A, %d %B %Y';
$string['strftimedaydatetime'] = '%A, %d %B %Y, %I:%M %p';
$string['strftimedayshort'] = '%A, %d %B';

2
lib/classes/string_manager_standard.php
View File

@ -302,7 +302,9 @@ class core_string_manager_standard implements core_string_manager {
'strftimedatefullshort' => 1,
'strftimedateshort' => 1,
'strftimedatetime' => 1,
'strftimedatetimeaccurate' => 1,
'strftimedatetimeshort' => 1,
'strftimedatetimeshortaccurate' => 1,
'strftimedaydate' => 1,
'strftimedaydatetime' => 1,
'strftimedayshort' => 1,

2
question/engine/renderer.php
View File

@ -472,7 +472,7 @@ class core_question_renderer extends plugin_renderer_base {
$restrictedqa = new question_attempt_with_restricted_history($qa, $i, null);
$row = [$stepno,
userdate($step->get_timecreated(), get_string('strftimedatetimeshort')),
userdate($step->get_timecreated(), get_string('strftimedatetimeshortaccurate', 'core_langconfig')),
s($qa->summarise_action($step)) . $this->action_author($step, $options),
$restrictedqa->get_state_string($options->correctness)];

4
report/log/classes/table_log.php
View File

@ -145,9 +145,9 @@ class report_log_table_log extends table_sql {
public function col_time($event) {
if (empty($this->download)) {
$dateformat = get_string('strftimedatetime', 'core_langconfig');
$dateformat = get_string('strftimedatetimeaccurate', 'core_langconfig');
} else {
$dateformat = get_string('strftimedatetimeshort', 'core_langconfig');
$dateformat = get_string('strftimedatetimeshortaccurate', 'core_langconfig');
}
return userdate($event->timecreated, $dateformat);
}

2
report/loglive/classes/table_log.php
View File

@ -116,7 +116,7 @@ class report_loglive_table_log extends table_sql {
* @return string HTML for the time column
*/
public function col_time($event) {
$recenttimestr = get_string('strftimedatetime', 'core_langconfig');
$recenttimestr = get_string('strftimedatetimeaccurate', 'core_langconfig');
return userdate($event->timecreated, $recenttimestr);
}