From 011619dbd3b3e287bc608adecfa05e3d51ec8105 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Mon, 9 Oct 2023 10:15:23 +0100 Subject: [PATCH] MDL-71734 lang: final removal of deprecated 400 strings. --- admin/tool/usertours/lang/en/deprecated.txt | 1 - .../tool/usertours/lang/en/tool_usertours.php | 3 --- auth/lti/lang/en/auth_lti.php | 3 --- auth/lti/lang/en/deprecated.txt | 1 - .../myoverview/lang/en/block_myoverview.php | 6 ----- blocks/myoverview/lang/en/deprecated.txt | 4 --- blocks/timeline/lang/en/block_timeline.php | 5 ---- blocks/timeline/lang/en/deprecated.txt | 3 --- lang/en/admin.php | 5 ---- lang/en/badges.php | 5 ---- lang/en/calendar.php | 5 ---- lang/en/competency.php | 2 -- lang/en/completion.php | 3 --- lang/en/contentbank.php | 3 --- lang/en/deprecated.txt | 27 ------------------- lang/en/enrol.php | 3 --- lang/en/grades.php | 6 ----- lang/en/message.php | 9 ------- lang/en/moodle.php | 5 ---- lang/en/question.php | 3 --- .../recordrtc/lang/en/atto_recordrtc.php | 4 --- .../plugins/recordrtc/lang/en/deprecated.txt | 2 -- lib/tests/string_manager_standard_test.php | 8 +++--- media/player/videojs/lang/en/deprecated.txt | 4 --- .../player/videojs/lang/en/media_videojs.php | 6 ----- mod/chat/lang/en/chat.php | 3 --- mod/chat/lang/en/deprecated.txt | 1 - mod/forum/lang/en/deprecated.txt | 6 ++++- mod/forum/lang/en/forum.php | 5 ---- mod/glossary/lang/en/deprecated.txt | 1 - mod/glossary/lang/en/glossary.php | 3 --- mod/page/lang/en/deprecated.txt | 2 -- mod/page/lang/en/page.php | 4 --- mod/quiz/lang/en/deprecated.txt | 6 ----- mod/quiz/lang/en/quiz.php | 8 ------ .../report/grading/lang/en/deprecated.txt | 7 ----- .../report/grading/lang/en/quiz_grading.php | 9 +------ mod/scorm/lang/en/deprecated.txt | 4 +-- mod/scorm/lang/en/scorm.php | 5 ---- mod/survey/lang/en/deprecated.txt | 3 --- mod/survey/lang/en/survey.php | 5 ---- report/security/lang/en/deprecated.txt | 4 --- report/security/lang/en/report_security.php | 6 ----- repository/dropbox/lang/en/deprecated.txt | 3 --- .../dropbox/lang/en/repository_dropbox.php | 5 ---- theme/boost/lang/en/deprecated.txt | 1 - theme/boost/lang/en/theme_boost.php | 3 --- 47 files changed, 11 insertions(+), 209 deletions(-) delete mode 100644 admin/tool/usertours/lang/en/deprecated.txt delete mode 100644 blocks/myoverview/lang/en/deprecated.txt delete mode 100644 blocks/timeline/lang/en/deprecated.txt delete mode 100644 lib/editor/atto/plugins/recordrtc/lang/en/deprecated.txt delete mode 100644 media/player/videojs/lang/en/deprecated.txt delete mode 100644 mod/chat/lang/en/deprecated.txt delete mode 100644 mod/page/lang/en/deprecated.txt delete mode 100644 mod/survey/lang/en/deprecated.txt delete mode 100644 report/security/lang/en/deprecated.txt delete mode 100644 repository/dropbox/lang/en/deprecated.txt diff --git a/admin/tool/usertours/lang/en/deprecated.txt b/admin/tool/usertours/lang/en/deprecated.txt deleted file mode 100644 index fc9dfbd1832..00000000000 --- a/admin/tool/usertours/lang/en/deprecated.txt +++ /dev/null @@ -1 +0,0 @@ -previousstep,tool_usertours diff --git a/admin/tool/usertours/lang/en/tool_usertours.php b/admin/tool/usertours/lang/en/tool_usertours.php index 815806de4a9..12e15dbac65 100644 --- a/admin/tool/usertours/lang/en/tool_usertours.php +++ b/admin/tool/usertours/lang/en/tool_usertours.php @@ -303,6 +303,3 @@ $string['tour_gradebook_tour_description'] = 'Search and navigation features in $string['tour_gradebook_tour_name'] = 'Gradebook Grader Report'; $string['tour_final_step_title'] = 'End of tour'; $string['tour_final_step_content'] = 'This is the end of your user tour. It won\'t show again unless you reset it using the link in the footer.'; - -// Deprecated since Moodle 4.0. -$string['previousstep'] = 'Previous'; diff --git a/auth/lti/lang/en/auth_lti.php b/auth/lti/lang/en/auth_lti.php index a20574fbcad..3c4033d584c 100644 --- a/auth/lti/lang/en/auth_lti.php +++ b/auth/lti/lang/en/auth_lti.php @@ -52,8 +52,5 @@ $string['provisioningmodeexistingonly'] = 'Existing accounts only (prompt)'; $string['useexistingaccount'] = 'Use existing account'; $string['welcome'] = 'Welcome!'; -// Deprecated since Moodle 4.0. -$string['privacy:metadata'] = 'The LTI authentication plugin does not store any personal data.'; - // Deprecated since Moodle 4.4. $string['firstlaunchnoauthnotice'] = 'To link your existing account you must be logged in to the site. Please log in to the site in a new tab/window and then relaunch the tool here. For further information, see the documentation Publish as LTI tool.'; diff --git a/auth/lti/lang/en/deprecated.txt b/auth/lti/lang/en/deprecated.txt index f893c28f5df..47d590ccfc6 100644 --- a/auth/lti/lang/en/deprecated.txt +++ b/auth/lti/lang/en/deprecated.txt @@ -1,2 +1 @@ -privacy:metadata,auth_lti firstlaunchnoauthnotice,auth_lti diff --git a/blocks/myoverview/lang/en/block_myoverview.php b/blocks/myoverview/lang/en/block_myoverview.php index 8536a60c8af..08be768497b 100644 --- a/blocks/myoverview/lang/en/block_myoverview.php +++ b/blocks/myoverview/lang/en/block_myoverview.php @@ -94,9 +94,3 @@ $string['zero_request_title'] = 'Request your first course'; $string['zero_request_intro'] = 'Need help getting started? Check out the Moodle documentation or take your first steps with our Quickstart guide.'; $string['zero_nocourses_title'] = 'Create your first course'; $string['zero_nocourses_intro'] = 'Need help getting started? Check out the Moodle documentation or take your first steps with our Quickstart guide.'; - -// Deprecated since Moodle 4.0. -$string['clearsearch'] = "Clear search"; -$string['aria:lastaccessed'] = 'Sort courses by last accessed date'; -$string['aria:shortname'] = 'Sort courses by course short name'; -$string['aria:title'] = 'Sort courses by course name'; diff --git a/blocks/myoverview/lang/en/deprecated.txt b/blocks/myoverview/lang/en/deprecated.txt deleted file mode 100644 index 864e2de8f17..00000000000 --- a/blocks/myoverview/lang/en/deprecated.txt +++ /dev/null @@ -1,4 +0,0 @@ -clearsearch,block_myoverview -aria:shortname,block_myoverview -aria:lastaccessed,block_myoverview -aria:title,block_myoverview diff --git a/blocks/timeline/lang/en/block_timeline.php b/blocks/timeline/lang/en/block_timeline.php index 8abe6f94230..e10486d3640 100644 --- a/blocks/timeline/lang/en/block_timeline.php +++ b/blocks/timeline/lang/en/block_timeline.php @@ -48,8 +48,3 @@ $string['viewcourse'] = 'View course'; $string['privacy:metadata:timelinesortpreference'] = 'The user sort preference for the timeline block.'; $string['privacy:metadata:timelinefilterpreference'] = 'The user day filter preference for the timeline block.'; $string['privacy:metadata:timelinelimitpreference'] = 'The user page limit preference for the timeline block.'; - -// Deprecated since Moodle 4.0. -$string['ariaeventlistpagelimit'] = 'Show {$a} activities per page'; -$string['ariaeventlistpaginationnavdates'] = 'Timeline activities pagination'; -$string['ariaeventlistpaginationnavcourses'] = 'Timeline activities for course {$a} pagination'; diff --git a/blocks/timeline/lang/en/deprecated.txt b/blocks/timeline/lang/en/deprecated.txt deleted file mode 100644 index 6c46d756af6..00000000000 --- a/blocks/timeline/lang/en/deprecated.txt +++ /dev/null @@ -1,3 +0,0 @@ -ariaeventlistpagelimit,block_timeline -ariaeventlistpaginationnavdates,block_timeline -ariaeventlistpaginationnavcourses,block_timeline diff --git a/lang/en/admin.php b/lang/en/admin.php index d6d570dac53..0ce05488c4e 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -1622,11 +1622,6 @@ $string['cachesessionhelp'] = 'User specific cache that expires when the user\'s $string['cacheapplication'] = 'Application cache'; $string['cacheapplicationhelp'] = 'Cached items are shared among all users and expire by a determined time to live (ttl).'; -// Deprecated since Moodle 4.0. -$string['coursepage'] = 'Course page'; -$string['mediapluginswf'] = 'Enable .swf filter'; -$string['mediapluginswfnote'] = 'As a default security measure, normal users should not be allowed to embed swf flash files.'; - // Deprecated since Moodle 4.1. $string['multilangforceold'] = 'Force old multilang syntax: <span> without the class="multilang" and <lang>'; diff --git a/lang/en/badges.php b/lang/en/badges.php index aa06edae44e..04f87eecc42 100644 --- a/lang/en/badges.php +++ b/lang/en/badges.php @@ -592,11 +592,6 @@ $string['warnexpired'] = ' (This badge has expired!)'; $string['year'] = 'Year(s)'; $string['includeauthdetails'] = "Include authentication details with the backpack"; -// Deprecated since Moodle 4.0. -$string['evidence'] = 'Evidence'; -$string['recipientdetails'] = 'Recipient details'; -$string['recipientidentificationproblem'] = 'Cannot find a recipient of this badge among the existing users.'; - // Deprecated since Moodle 4.3. $string['backpackemail'] = 'Email address'; $string['backpackemail_help'] = 'The email address associated with your backpack. While you are connected, any badges earned on this site will be associated with this email address.'; diff --git a/lang/en/calendar.php b/lang/en/calendar.php index 2239d623973..22594ba74f2 100644 --- a/lang/en/calendar.php +++ b/lang/en/calendar.php @@ -283,8 +283,3 @@ $string['whendate'] = 'When: {$a}'; $string['yesterday'] = 'Yesterday'; $string['youcandeleteallrepeats'] = 'This event is part of a repeating event series. You can delete this event only, or all {$a} events in the series at once.'; $string['yoursubscriptions'] = 'Imported calendars'; - -// Deprecated since Moodle 4.0. -$string['calendarurl'] = 'Calendar URL: {$a}'; -$string['importfrominstructions'] = 'Please provide either a URL to a remote calendar, or upload a file.'; -$string['monthlyview'] = 'Monthly view'; diff --git a/lang/en/competency.php b/lang/en/competency.php index 55fc9b76ff3..0c1ca6e7c99 100644 --- a/lang/en/competency.php +++ b/lang/en/competency.php @@ -201,5 +201,3 @@ $string['usercompetencystatus_inreview'] = 'In review'; $string['usercompetencystatus_waitingforreview'] = 'Waiting for review'; $string['userplans'] = 'Learning plans'; -// Deprecated since Moodle 4.0. -$string['invalidpersistenterror'] = 'Error: {$a}'; diff --git a/lang/en/completion.php b/lang/en/completion.php index 8d924d9f059..5a148022ef5 100644 --- a/lang/en/completion.php +++ b/lang/en/completion.php @@ -255,9 +255,6 @@ $string['writingcompletiondata'] = 'Writing completion data'; $string['xdays'] = '{$a} days'; $string['youmust'] = 'You must'; -// Deprecated since Moodle 4.0. -$string['yourprogress'] = 'Your progress'; - // Deprecated since Moodle 4.3. $string['editcoursecompletionsettings'] = 'Edit course completion settings'; $string['completiondefault'] = 'Default completion tracking'; diff --git a/lang/en/contentbank.php b/lang/en/contentbank.php index 06a010e09bc..a5395a7804a 100644 --- a/lang/en/contentbank.php +++ b/lang/en/contentbank.php @@ -98,6 +98,3 @@ $string['visibilitypref_help'] = 'Content you create in the content bank will us $string['visibilitysetpublic'] = 'Make public'; $string['visibilitysetunlisted'] = 'Make unlisted'; $string['visibilitytitleunlisted'] = '{$a} (Unlisted)'; - -// Deprecated since 4.0. -$string['close'] = 'Close'; diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index 79d40637f4c..e716cbf526e 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -7,33 +7,6 @@ myprofile,core viewallmyentries,core_blog searchallavailablecourses_desc,core_admin search:mycourse,core_search -calendarurl,core_calendar -yourprogress,core_completion -importfrominstructions,core_calendar -proceedtocourse,core_enrol -coursepage,core_admin -invalidpersistenterror,core_competency -mediapluginswf,core_admin -mediapluginswfnote,core_admin -createuserandpass,core -supplyinfo,core -monthlyview,core_calendar -evidence,core_badges -recipientdetails,core_badges -recipientidentificationproblem,core_badges -navmethod,core_grades -dropdown,core_grades -tabs,core_grades -combo,core_grades -defaults,core_message -loggedin_help,core_message -loggedindescription,core_message -loggedoff_help,core_message -loggedoffdescription,core_message -sendingvia,core_message -sendingviawhen,core_message -close,core_contentbank -notflagged,core_question cannotswitcheditmodeon,core_error multilangforceold,core_admin nopermissionmove,core_question diff --git a/lang/en/enrol.php b/lang/en/enrol.php index f3243be8736..014e59d32c4 100644 --- a/lang/en/enrol.php +++ b/lang/en/enrol.php @@ -171,6 +171,3 @@ $string['privacy:metadata:user_enrolments:timemodified'] = 'The time when the us $string['privacy:metadata:user_enrolments:userid'] = 'The ID of the user'; $string['youenrolledincourse'] = 'You are enrolled in the course.'; $string['youunenrolledfromcourse'] = 'You are unenrolled from the course "{$a}".'; - -// Deprecated since Moodle 4.0. -$string['proceedtocourse'] = 'Proceed to course content'; diff --git a/lang/en/grades.php b/lang/en/grades.php index 9649e94b6c9..4c7f7819a58 100644 --- a/lang/en/grades.php +++ b/lang/en/grades.php @@ -892,12 +892,6 @@ $string['yourgrade'] = 'Your grade'; $string['aria-toggledropdown'] = 'Toggle the following dropdown'; $string['aria:dropdowngrades'] = 'Grade items found'; -// Deprecated since Moodle 4.0. -$string['navmethod'] = 'Navigation method'; -$string['dropdown'] = 'Drop-down menu'; -$string['tabs'] = 'Tabs'; -$string['combo'] = 'Tabs and drop-down menu'; - // Deprecated since Moodle 4.2. $string['showanalysisicon'] = 'Show grade analysis icon'; $string['showanalysisicon_desc'] = 'Whether to show grade analysis icon by default. If the activity module supports it, the grade analysis icon links to a page with more detailed explanation of the grade and how it was obtained.'; diff --git a/lang/en/message.php b/lang/en/message.php index 967a2d60a66..aac4d96aded 100644 --- a/lang/en/message.php +++ b/lang/en/message.php @@ -274,12 +274,3 @@ $string['wouldliketocontactyou'] = 'Would like to contact you'; $string['you'] = 'You:'; $string['youhaveblockeduser'] = 'You have blocked this user.'; $string['yourcontactrequestpending'] = 'Your contact request is pending with {$a}'; - -// Deprecated since Moodle 4.0. -$string['defaults'] = 'Defaults'; -$string['loggedin_help'] = 'Configure how you would like to receive notifications when you are logged into Moodle'; -$string['loggedindescription'] = 'When you are logged into Moodle'; -$string['loggedoff_help'] = 'Configure how you would like to receive notifications when you are not logged into Moodle'; -$string['loggedoffdescription'] = 'When you are not logged into Moodle'; -$string['sendingvia'] = 'Sending "{$a->provider}" via "{$a->processor}"'; -$string['sendingviawhen'] = 'Sending "{$a->provider}" via "{$a->processor}" when {$a->state}'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index 21bfc94f34d..e800300a800 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -2459,11 +2459,6 @@ $string['yourwordforx'] = 'Your word for \'{$a}\''; $string['zippingbackup'] = 'Zipping backup'; $string['deprecatedeventname'] = '{$a} (no longer in use)'; -// Deprecated since Moodle 4.0. -$string['createuserandpass'] = 'Choose your username and password'; -$string['descriptiona'] = 'Description: {$a}'; -$string['supplyinfo'] = 'More details'; - // Deprecated since Moodle 4.3. $string['clicktochangeinbrackets'] = '{$a} (Click to change)'; $string['modshowcmtitle'] = 'Show activity'; diff --git a/lang/en/question.php b/lang/en/question.php index cef4b112288..70f91188fb3 100644 --- a/lang/en/question.php +++ b/lang/en/question.php @@ -520,8 +520,5 @@ $string['versioninfo'] = 'Version {$a->version} (of {$a->latestversion})'; $string['versioninfolatest'] = 'Version {$a->version} (latest)'; $string['question_version'] = 'Question version'; -// Deprecated since Moodle 4.0. -$string['notflagged'] = 'Not flagged'; - // Deprecated since Moodle 4.1. $string['nopermissionmove'] = 'You don\'t have permission to move questions from here. You must save the question in this category or save it as a new question.'; diff --git a/lib/editor/atto/plugins/recordrtc/lang/en/atto_recordrtc.php b/lib/editor/atto/plugins/recordrtc/lang/en/atto_recordrtc.php index 56afcedc337..8d7cd19080f 100644 --- a/lib/editor/atto/plugins/recordrtc/lang/en/atto_recordrtc.php +++ b/lib/editor/atto/plugins/recordrtc/lang/en/atto_recordrtc.php @@ -78,7 +78,3 @@ $string['uploadprogress'] = 'completed'; $string['videobitrate'] = 'Video bitrate'; $string['videobitrate_desc'] = 'Quality of video recording (larger number means higher quality)'; $string['videortc'] = 'Record video'; - -// Deprecated since Moodle 4.0. -$string['timelimit'] = 'Time limit in seconds'; -$string['timelimit_desc'] = 'Maximum recording length allowed for the audio/video clips'; diff --git a/lib/editor/atto/plugins/recordrtc/lang/en/deprecated.txt b/lib/editor/atto/plugins/recordrtc/lang/en/deprecated.txt deleted file mode 100644 index c27b09f6683..00000000000 --- a/lib/editor/atto/plugins/recordrtc/lang/en/deprecated.txt +++ /dev/null @@ -1,2 +0,0 @@ -timelimit,atto_recordrtc -timelimit_desc,atto_recordrtc diff --git a/lib/tests/string_manager_standard_test.php b/lib/tests/string_manager_standard_test.php index 2e296bb46ca..5f84cfee1a9 100644 --- a/lib/tests/string_manager_standard_test.php +++ b/lib/tests/string_manager_standard_test.php @@ -83,11 +83,11 @@ class string_manager_standard_test extends \advanced_testcase { $this->assertFalse($stringman->string_deprecated('hidden', 'grades')); // Check deprecated string, make sure to update once that chosen below is finally removed. - $this->assertTrue($stringman->string_deprecated('coursepage', 'core_admin')); - $this->assertTrue($stringman->string_exists('coursepage', 'core_admin')); + $this->assertTrue($stringman->string_deprecated('selectdevice', 'core_admin')); + $this->assertTrue($stringman->string_exists('selectdevice', 'core_admin')); $this->assertDebuggingNotCalled(); - $this->assertEquals('Course page', get_string('coursepage', 'core_admin')); - $this->assertDebuggingCalled('String [coursepage,core_admin] is deprecated. '. + $this->assertEquals('Select device', get_string('selectdevice', 'core_admin')); + $this->assertDebuggingCalled('String [selectdevice,core_admin] is deprecated. '. 'Either you should no longer be using that string, or the string has been incorrectly deprecated, in which case you should report this as a bug. '. 'Please refer to https://moodledev.io/general/projects/api/string-deprecation'); } diff --git a/media/player/videojs/lang/en/deprecated.txt b/media/player/videojs/lang/en/deprecated.txt deleted file mode 100644 index f3abc1bd83b..00000000000 --- a/media/player/videojs/lang/en/deprecated.txt +++ /dev/null @@ -1,4 +0,0 @@ -configrtmp,media_videojs -configuseflash,media_videojs -rtmp,media_videojs -useflash,media_videojs diff --git a/media/player/videojs/lang/en/media_videojs.php b/media/player/videojs/lang/en/media_videojs.php index c608c2afe57..35235c46357 100644 --- a/media/player/videojs/lang/en/media_videojs.php +++ b/media/player/videojs/lang/en/media_videojs.php @@ -39,9 +39,3 @@ $string['privacy:metadata'] = 'The VideoJS player media plugin does not store an $string['videoextensions'] = 'Video file extensions'; $string['videocssclass'] = 'CSS class for video'; $string['youtube'] = 'YouTube videos'; - -// Deprecated since Moodle 4.0. -$string['configrtmp'] = 'If enabled, links that start with rtmp:// will be handled by the plugin, irrespective of whether the extension is enabled in the Video file extensions (videoextensions) setting. Flash fallback must be enabled for RTMP to work.'; -$string['configuseflash'] = 'Use Flash player if video format is not natively supported by the browser and/or natively by the VideoJS player. If enabled, VideoJS will be engaged for any file extension from the above list without browser check. Please note that Flash is not available in mobile browsers and discouraged in many desktop ones.'; -$string['rtmp'] = 'RTMP streams'; -$string['useflash'] = 'Use Flash fallback'; diff --git a/mod/chat/lang/en/chat.php b/mod/chat/lang/en/chat.php index 1cc170d5bd9..02a8ca0955c 100644 --- a/mod/chat/lang/en/chat.php +++ b/mod/chat/lang/en/chat.php @@ -175,6 +175,3 @@ $string['usingchat_help'] = 'The chat module contains some features to make chat * Beeps - You can send a sound to other participants by clicking the "beep" link next to their name. A useful shortcut to beep all the people in the chat at once is to type "beep all". * HTML - If you know some HTML code, you can use it in your text to do things like insert images, play sounds or create different coloured text'; $string['viewreport'] = 'Past sessions'; - -// Deprecated since Moodle 4.0. -$string['nextsession'] = 'Next scheduled session'; diff --git a/mod/chat/lang/en/deprecated.txt b/mod/chat/lang/en/deprecated.txt deleted file mode 100644 index 537cf2d30f1..00000000000 --- a/mod/chat/lang/en/deprecated.txt +++ /dev/null @@ -1 +0,0 @@ -nextsession,mod_chat diff --git a/mod/forum/lang/en/deprecated.txt b/mod/forum/lang/en/deprecated.txt index 2c694a40b32..6684b4153be 100644 --- a/mod/forum/lang/en/deprecated.txt +++ b/mod/forum/lang/en/deprecated.txt @@ -1 +1,5 @@ -postmailinfolink,mod_forum +completionpostsgroup,mod_forum +completiondiscussionsgroup,mod_forum +completiondiscussionshelp,mod_forum +completionrepliesgroup,mod_forum +completionreplieshelp,mod_forum diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index 0273cc257d3..3ac6fc73ac2 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -792,11 +792,6 @@ $string['showmoreusers'] = 'Show more users'; $string['viewconversation'] = 'View discussion'; $string['viewgrades'] = 'View grades'; -// Deprecated since Moodle 4.0. -$string['postmailinfolink'] = 'This is a copy of a message posted in {$a->coursename}. - -To reply click on this link: {$a->replylink}'; - // Deprecated since Moodle 4.3. $string['completionpostsgroup'] = 'Require posts'; $string['completiondiscussionsgroup'] = 'Require discussions'; diff --git a/mod/glossary/lang/en/deprecated.txt b/mod/glossary/lang/en/deprecated.txt index 082184ce9b5..68e04c0abae 100644 --- a/mod/glossary/lang/en/deprecated.txt +++ b/mod/glossary/lang/en/deprecated.txt @@ -1,2 +1 @@ -waitingapproval,mod_glossary completionentriesgroup,mod_glossary diff --git a/mod/glossary/lang/en/glossary.php b/mod/glossary/lang/en/glossary.php index eeec66f2cb9..5629fa85995 100644 --- a/mod/glossary/lang/en/glossary.php +++ b/mod/glossary/lang/en/glossary.php @@ -339,8 +339,5 @@ $string['withoutauthor'] = 'Concepts without author'; $string['writtenby'] = 'by'; $string['youarenottheauthor'] = 'You are not the author of this comment, so you are not allowed to edit it.'; -// Deprecated since 4.0. -$string['waitingapproval'] = 'Waiting approval'; - // Deprecated since 4.3. $string['completionentriesgroup'] = 'Require entries'; diff --git a/mod/page/lang/en/deprecated.txt b/mod/page/lang/en/deprecated.txt deleted file mode 100644 index f591c2b1018..00000000000 --- a/mod/page/lang/en/deprecated.txt +++ /dev/null @@ -1,2 +0,0 @@ -printheading,mod_page -printheadingexplain,mod_page diff --git a/mod/page/lang/en/page.php b/mod/page/lang/en/page.php index 3553ad2b2aa..8bff5f574d3 100644 --- a/mod/page/lang/en/page.php +++ b/mod/page/lang/en/page.php @@ -72,7 +72,3 @@ $string['printlastmodified'] = 'Display last modified date'; $string['printlastmodifiedexplain'] = 'Display last modified date below content?'; $string['privacy:metadata'] = 'The Page resource plugin does not store any personal data.'; $string['search:activity'] = 'Page'; - -// Deprecated since 4.0. -$string['printheading'] = 'Display page name'; -$string['printheadingexplain'] = 'Display page name above content?'; diff --git a/mod/quiz/lang/en/deprecated.txt b/mod/quiz/lang/en/deprecated.txt index e6e4750db23..07754e4fe63 100644 --- a/mod/quiz/lang/en/deprecated.txt +++ b/mod/quiz/lang/en/deprecated.txt @@ -1,9 +1,3 @@ -completionpass,mod_quiz -completionpassdesc,mod_quiz -completionpass_help,mod_quiz -completiondetail:passgrade,mod_quiz -gradetopassnotset,mod_quiz -basicideasofquiz,mod_quiz completionminattemptsgroup,mod_quiz grade,mod_quiz timetaken,mod_quiz diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php index d8b5b082bf6..579fd1c46ce 100644 --- a/mod/quiz/lang/en/quiz.php +++ b/mod/quiz/lang/en/quiz.php @@ -1078,14 +1078,6 @@ $string['questionversionlatest'] = 'v{$a} (latest)'; $string['alwayslatest'] = 'Always latest'; $string['gobacktoquiz'] = 'Go back'; -// Deprecated since Moodle 4.0. -$string['completionpass'] = 'Require passing grade'; -$string['completionpassdesc'] = 'Student must achieve a passing grade to complete this activity'; -$string['completionpass_help'] = 'If enabled, this activity is considered complete when the student receives a pass grade (as specified in the Grade section of the quiz settings) or higher.'; -$string['completiondetail:passgrade'] = 'Receive a pass grade'; -$string['gradetopassnotset'] = 'This quiz does not yet have a grade to pass set. It may be set in the Grade section of the quiz settings.'; -$string['basicideasofquiz'] = 'The basic ideas of quiz-making'; - // Deprecated since Moodle 4.3. $string['completionminattemptsgroup'] = 'Require attempts'; diff --git a/mod/quiz/report/grading/lang/en/deprecated.txt b/mod/quiz/report/grading/lang/en/deprecated.txt index fa0c6258e67..018ae66be99 100644 --- a/mod/quiz/report/grading/lang/en/deprecated.txt +++ b/mod/quiz/report/grading/lang/en/deprecated.txt @@ -1,8 +1 @@ -bydate,quiz_grading -bystudentidnumber,quiz_grading -bystudentfirstname,quiz_grading -bystudentlastname,quiz_grading -gradingattemptwithidnumber,quiz_grading -orderattempts,quiz_grading -randomly,quiz_grading grade,quiz_grading diff --git a/mod/quiz/report/grading/lang/en/quiz_grading.php b/mod/quiz/report/grading/lang/en/quiz_grading.php index 67b9b49f8fa..4b73324eddc 100644 --- a/mod/quiz/report/grading/lang/en/quiz_grading.php +++ b/mod/quiz/report/grading/lang/en/quiz_grading.php @@ -77,12 +77,5 @@ $string['total'] = 'Total'; $string['unknownquestion'] = 'Unknown question'; $string['updategrade'] = 'update grades'; -// Deprecated since Moodle 4.0. -$string['bydate'] = 'By date'; -$string['bystudentidnumber'] = 'By student ID number'; -$string['bystudentfirstname'] = 'By student first name'; -$string['bystudentlastname'] = 'By student last name'; -$string['gradingattemptwithidnumber'] = 'Attempt number {$a->attempt} for {$a->fullname} ({$a->idnumber})'; -$string['orderattempts'] = 'Order attempts'; -$string['randomly'] = 'Randomly'; +// Deprecated since Moodle 4.4. $string['grade'] = 'grade'; diff --git a/mod/scorm/lang/en/deprecated.txt b/mod/scorm/lang/en/deprecated.txt index 016783b72d0..161293a8cc2 100644 --- a/mod/scorm/lang/en/deprecated.txt +++ b/mod/scorm/lang/en/deprecated.txt @@ -1,3 +1 @@ -info,mod_scorm -displayactivityname,mod_scorm -displayactivityname_help,mod_scorm +completionscorerequired_help,mod_scorm diff --git a/mod/scorm/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php index d319063a3ce..0f79d1fd0d7 100644 --- a/mod/scorm/lang/en/scorm.php +++ b/mod/scorm/lang/en/scorm.php @@ -456,10 +456,5 @@ $string['width'] = 'Width'; $string['window'] = 'Window'; $string['youmustselectastatus'] = 'You must select a status to require'; -// Deprecated since Moodle 4.0. -$string['info'] = 'Info'; -$string['displayactivityname'] = 'Display activity name'; -$string['displayactivityname_help'] = 'Whether or not to display the activity name above the SCORM player.'; - // Deprecated since Moodle 4.3. $string['completionscorerequired_help'] = 'Enabling this setting will require a user to have at least the minimum score entered to be marked complete in this SCORM activity, as well as any other Activity Completion requirements.'; diff --git a/mod/survey/lang/en/deprecated.txt b/mod/survey/lang/en/deprecated.txt deleted file mode 100644 index 8eaa5cc031f..00000000000 --- a/mod/survey/lang/en/deprecated.txt +++ /dev/null @@ -1,3 +0,0 @@ -clicktocontinue,mod_survey -viewsurveyresponses,mod_survey -allquestions,mod_survey diff --git a/mod/survey/lang/en/survey.php b/mod/survey/lang/en/survey.php index cef6a930863..640b9150e2a 100644 --- a/mod/survey/lang/en/survey.php +++ b/mod/survey/lang/en/survey.php @@ -281,8 +281,3 @@ $string['thanksforanswers'] = 'Thanks for answering this survey, {$a}'; $string['time'] = 'Time'; $string['notyetanswered'] = 'Not yet answered'; $string['allquestionrequireanswer'] = 'All questions are required and must be answered.'; - -// Deprecated since Moodle 4.0. -$string['clicktocontinue'] = 'Click here to continue'; -$string['viewsurveyresponses'] = 'View {$a} survey responses'; -$string['allquestions'] = 'All questions in order, all students'; diff --git a/report/security/lang/en/deprecated.txt b/report/security/lang/en/deprecated.txt deleted file mode 100644 index cc725afe394..00000000000 --- a/report/security/lang/en/deprecated.txt +++ /dev/null @@ -1,4 +0,0 @@ -check_mediafilterswf_details,report_security -check_mediafilterswf_error,report_security -check_mediafilterswf_name,report_security -check_mediafilterswf_ok,report_security diff --git a/report/security/lang/en/report_security.php b/report/security/lang/en/report_security.php index 43c92f87ef6..596e4c0c90d 100644 --- a/report/security/lang/en/report_security.php +++ b/report/security/lang/en/report_security.php @@ -144,9 +144,3 @@ $string['pluginname'] = 'Security checks'; $string['security:view'] = 'View security report'; $string['timewarning'] = 'Data processing may take a long time, please be patient...'; $string['privacy:metadata'] = 'The Security overview plugin does not store any personal data.'; - -// Deprecated since Moodle 4.0. -$string['check_mediafilterswf_details'] = '

Automatic swf embedding is very dangerous - any registered user may launch an XSS attack against other server users. Please disable it on production servers.

'; -$string['check_mediafilterswf_error'] = 'Flash media filter is enabled - this is very dangerous for the majority of servers.'; -$string['check_mediafilterswf_name'] = 'Enabled .swf media filter'; -$string['check_mediafilterswf_ok'] = 'Flash media filter is not enabled.'; diff --git a/repository/dropbox/lang/en/deprecated.txt b/repository/dropbox/lang/en/deprecated.txt deleted file mode 100644 index 2808d9f8722..00000000000 --- a/repository/dropbox/lang/en/deprecated.txt +++ /dev/null @@ -1,3 +0,0 @@ -apikey,repository_dropbox -secret,repository_dropbox -instruction,repository_dropbox diff --git a/repository/dropbox/lang/en/repository_dropbox.php b/repository/dropbox/lang/en/repository_dropbox.php index 79b185fa87c..33399017436 100644 --- a/repository/dropbox/lang/en/repository_dropbox.php +++ b/repository/dropbox/lang/en/repository_dropbox.php @@ -37,8 +37,3 @@ $string['logoutdesc'] = '(Logout when you finish using Dropbox)'; $string['oauth2redirecturi'] = 'OAuth 2 Redirect URI'; $string['privacy:metadata:repository_dropbox'] = 'The Dropbox repository plugin does not store any personal data, but does transmit user data from Moodle to the remote system.'; $string['privacy:metadata:repository_dropbox:query'] = 'The Dropbox repository user search text query.'; - -// Deprecated since Moodle 4.0. -$string['apikey'] = 'Dropbox API key'; -$string['secret'] = 'Dropbox secret'; -$string['instruction'] = 'You can get your API Key and secret from Dropbox developers. When setting up your key please select "Full Dropbox" as the "Access level".'; \ No newline at end of file diff --git a/theme/boost/lang/en/deprecated.txt b/theme/boost/lang/en/deprecated.txt index 37e07310d8a..cff2d7cc727 100644 --- a/theme/boost/lang/en/deprecated.txt +++ b/theme/boost/lang/en/deprecated.txt @@ -1,4 +1,3 @@ -totop,theme_boost privacy:drawernavclosed,theme_boost privacy:drawernavopen,theme_boost currentinparentheses,theme_boost \ No newline at end of file diff --git a/theme/boost/lang/en/theme_boost.php b/theme/boost/lang/en/theme_boost.php index 0c9bcd19137..358f127b7a5 100644 --- a/theme/boost/lang/en/theme_boost.php +++ b/theme/boost/lang/en/theme_boost.php @@ -59,9 +59,6 @@ $string['privacy:drawerindexopen'] = 'The current preference for the index drawe $string['privacy:drawerblockclosed'] = 'The current preference for the block drawer is closed.'; $string['privacy:drawerblockopen'] = 'The current preference for the block drawer is open.'; -// Deprecated since Moodle 4.0. -$string['totop'] = 'Go to top'; - // Deprecated since Moodle 4.1. $string['currentinparentheses'] = '(current)'; $string['privacy:drawernavclosed'] = 'The current preference for the navigation drawer is closed.';