diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index f5887d5ad12..2bd4d58cbc7 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -122,3 +122,4 @@ availablelicenses,core_admin managelicenses,core_admin userfilterplaceholder,core sitebackpackverify,core_badges +filetypesnotwhitelisted,core_form diff --git a/lang/en/form.php b/lang/en/form.php index 165f367c9f7..4014ba243c9 100644 --- a/lang/en/form.php +++ b/lang/en/form.php @@ -46,7 +46,7 @@ $string['err_wrongfileextension'] = 'Some files ({$a->wrongfiles}) cannot be upl $string['filesofthesetypes'] = 'Accepted file types:'; $string['filetypesany'] = 'All file types'; $string['filetypesnotall'] = 'It is not allowed to select \'All file types\' here'; -$string['filetypesnotwhitelisted'] = 'These file types are not allowed here: {$a}'; +$string['filetypesnotallowed'] = 'These file types are not allowed here: {$a}'; $string['filetypesothers'] = 'Other files'; $string['filetypesunknown'] = 'Unknown file types: {$a}'; $string['general'] = 'General'; @@ -85,3 +85,6 @@ $string['timeunit'] = 'Time unit'; $string['timing'] = 'Timing'; $string['unmaskpassword'] = 'Unmask'; $string['year'] = 'Year'; + +// Deprecated since Moodle 3.10. +$string['filetypesnotwhitelisted'] = 'These file types are not allowed here: {$a}'; diff --git a/lib/adminlib.php b/lib/adminlib.php index 3a7045d3880..2e6eaf51839 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -11276,7 +11276,7 @@ class admin_setting_filetypes extends admin_setting_configtext { } else { $troublemakers = $this->util->get_not_whitelisted($data, $this->onlytypes); - return get_string('filetypesnotwhitelisted', 'core_form', implode(' ', $troublemakers)); + return get_string('filetypesnotallowed', 'core_form', implode(' ', $troublemakers)); } } diff --git a/lib/form/filetypes.php b/lib/form/filetypes.php index 9c70b5a8ff5..3068704086f 100644 --- a/lib/form/filetypes.php +++ b/lib/form/filetypes.php @@ -245,7 +245,7 @@ class MoodleQuickForm_filetypes extends MoodleQuickForm_group { $notwhitelisted = $this->util->get_not_whitelisted($value['filetypes'], $this->onlytypes); if ($notwhitelisted) { - return get_string('filetypesnotwhitelisted', 'core_form', implode(', ', $notwhitelisted)); + return get_string('filetypesnotallowed', 'core_form', implode(', ', $notwhitelisted)); } }