moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-73891-master' of https://github.com/sarjona/moodle

Browse source
This commit is contained in:
Ilya Tregubov 2022-03-21 10:12:27 +06:00
commit 8b871d98b4
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
admin/blocks.php
View file

@ -69,6 +69,7 @@
echo $OUTPUT->header(); echo $OUTPUT->header();
echo $OUTPUT->heading($strmanageblocks); echo $OUTPUT->heading($strmanageblocks);
echo $OUTPUT->notification(get_string('noteunneededblocks', 'admin'), 'info');
/// Main display starts here /// Main display starts here
/// Get and sort the existing blocks /// Get and sort the existing blocks

1
lang/en/admin.php
View file

@ -898,6 +898,7 @@ $string['none'] = 'None';
$string['nonewsettings'] = 'No new settings were added during this upgrade.'; $string['nonewsettings'] = 'No new settings were added during this upgrade.';
$string['nonexistentbookmark'] = 'The bookmark you requested does not exist.'; $string['nonexistentbookmark'] = 'The bookmark you requested does not exist.';
$string['nosupportedlogstore'] = 'No supported logstore found'; $string['nosupportedlogstore'] = 'No supported logstore found';
$string['noteunneededblocks'] = 'Note: Blocks set to show will not be listed in the \'Add a block\' menu in a course if they are specified in the theme setting \'Unneeded blocks\'.';
$string['maxtimelimit'] = 'Maximum time limit'; $string['maxtimelimit'] = 'Maximum time limit';
$string['maxtimelimit_desc'] = 'To restrict the maximum PHP execution time that Moodle will allow without any output being displayed, enter a value in seconds here. 0 means that Moodle default restrictions are used. If you have a front-end server with its own time limit, set this value lower to receive PHP errors in logs. Does not apply to CLI scripts.'; $string['maxtimelimit_desc'] = 'To restrict the maximum PHP execution time that Moodle will allow without any output being displayed, enter a value in seconds here. 0 means that Moodle default restrictions are used. If you have a front-end server with its own time limit, set this value lower to receive PHP errors in logs. Does not apply to CLI scripts.';
$string['moodleapp'] = 'Moodle app'; $string['moodleapp'] = 'Moodle app';