From 029474c319c2b81a8dc9652beb075d34698cb78d Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Fri, 21 Apr 2023 11:24:31 +0100 Subject: [PATCH] MDL-70189 lang: final removal of deprecated 311 strings. --- admin/tool/mobile/lang/en/deprecated.txt | 1 - admin/tool/mobile/lang/en/tool_mobile.php | 3 --- admin/tool/oauth2/lang/en/deprecated.txt | 5 ----- admin/tool/oauth2/lang/en/tool_oauth2.php | 7 ------- auth/mnet/lang/en/auth_mnet.php | 8 -------- auth/mnet/lang/en/deprecated.txt | 6 ------ blocks/myprofile/lang/en/block_myprofile.php | 7 ------- blocks/myprofile/lang/en/deprecated.txt | 5 ----- lang/en/admin.php | 6 ------ lang/en/badges.php | 7 ------- lang/en/deprecated.txt | 17 ----------------- lang/en/group.php | 3 --- lang/en/moodle.php | 11 ----------- lang/en/webservice.php | 3 --- mod/assign/lang/en/assign.php | 6 ------ mod/assign/lang/en/deprecated.txt | 4 ---- mod/chat/lang/en/chat.php | 3 --- mod/chat/lang/en/deprecated.txt | 1 - mod/data/lang/en/data.php | 3 --- mod/data/lang/en/deprecated.txt | 1 - .../openclosedate/lang/en/deprecated.txt | 1 - .../lang/en/quizaccess_openclosedate.php | 8 -------- mod/quiz/lang/en/quiz.php | 3 --- 23 files changed, 119 deletions(-) delete mode 100644 admin/tool/mobile/lang/en/deprecated.txt delete mode 100644 admin/tool/oauth2/lang/en/deprecated.txt delete mode 100644 auth/mnet/lang/en/deprecated.txt delete mode 100644 blocks/myprofile/lang/en/deprecated.txt delete mode 100644 mod/assign/lang/en/deprecated.txt delete mode 100644 mod/quiz/accessrule/openclosedate/lang/en/deprecated.txt diff --git a/admin/tool/mobile/lang/en/deprecated.txt b/admin/tool/mobile/lang/en/deprecated.txt deleted file mode 100644 index 272872fc82f..00000000000 --- a/admin/tool/mobile/lang/en/deprecated.txt +++ /dev/null @@ -1 +0,0 @@ -openusingembeddedbrowser,tool_mobile \ No newline at end of file diff --git a/admin/tool/mobile/lang/en/tool_mobile.php b/admin/tool/mobile/lang/en/tool_mobile.php index d67646a5035..ef6b4eb1fec 100644 --- a/admin/tool/mobile/lang/en/tool_mobile.php +++ b/admin/tool/mobile/lang/en/tool_mobile.php @@ -151,6 +151,3 @@ $string['privacy:metadata:core_userkey'] = 'User\'s keys used to create auto-log $string['responsivemainmenuitems'] = 'Responsive menu items'; $string['switchaccount'] = 'Switch account'; $string['viewqrcode'] = 'View QR code'; - -// Deprecated since Moodle 3.11. -$string['openusingembeddedbrowser'] = 'Open using embedded browser'; diff --git a/admin/tool/oauth2/lang/en/deprecated.txt b/admin/tool/oauth2/lang/en/deprecated.txt deleted file mode 100644 index 58a843c552e..00000000000 --- a/admin/tool/oauth2/lang/en/deprecated.txt +++ /dev/null @@ -1,5 +0,0 @@ -createnewfacebookissuer,tool_oauth2 -createnewgoogleissuer,tool_oauth2 -createnewissuer,tool_oauth2 -createnewmicrosoftissuer,tool_oauth2 -createnewnextcloudissuer,tool_oauth2 diff --git a/admin/tool/oauth2/lang/en/tool_oauth2.php b/admin/tool/oauth2/lang/en/tool_oauth2.php index 3315a42ced4..0a0b1933345 100644 --- a/admin/tool/oauth2/lang/en/tool_oauth2.php +++ b/admin/tool/oauth2/lang/en/tool_oauth2.php @@ -125,10 +125,3 @@ $string['userfieldinternalfield'] = 'Internal field name'; $string['userfieldmappingdeleted'] = 'User field mapping deleted'; $string['userfieldmappingsforissuer'] = 'User field mappings for issuer: {$a}'; $string['privacy:metadata'] = 'The OAuth 2 services plugin does not store any personal data.'; - -// Deprecated since Moodle 3.11. -$string['createnewfacebookissuer'] = 'Create new Facebook service'; -$string['createnewgoogleissuer'] = 'Create new Google service'; -$string['createnewissuer'] = 'Create new custom service'; -$string['createnewmicrosoftissuer'] = 'Create new Microsoft service'; -$string['createnewnextcloudissuer'] = 'Create new Nextcloud service'; diff --git a/auth/mnet/lang/en/auth_mnet.php b/auth/mnet/lang/en/auth_mnet.php index 75306144a37..a483a22156c 100644 --- a/auth/mnet/lang/en/auth_mnet.php +++ b/auth/mnet/lang/en/auth_mnet.php @@ -94,11 +94,3 @@ $string['privacy:metadata:mnet_session:useragent'] = 'User agent used to access $string['privacy:metadata:mnet_session:userid'] = 'ID of the user jumping to remote system.'; $string['privacy:metadata:mnet_session:username'] = 'Username of the user jumping to remote system.'; $string['unknownhost'] = 'Unknown host'; - -// Deprecated since Moodle 3.11. -$string['privacy:metadata:mnet_external:aim'] = 'The AIM identifier of the user'; -$string['privacy:metadata:mnet_external:icq'] = 'The ICQ number of the user.'; -$string['privacy:metadata:mnet_external:msn'] = 'The MSN identifier of the user'; -$string['privacy:metadata:mnet_external:skype'] = 'The Skype identifier of the user'; -$string['privacy:metadata:mnet_external:url'] = 'A URL related to this user.'; -$string['privacy:metadata:mnet_external:yahoo'] = 'The Yahoo identifier of the user'; diff --git a/auth/mnet/lang/en/deprecated.txt b/auth/mnet/lang/en/deprecated.txt deleted file mode 100644 index a933b89fd12..00000000000 --- a/auth/mnet/lang/en/deprecated.txt +++ /dev/null @@ -1,6 +0,0 @@ -privacy:metadata:mnet_external:aim,auth_mnet -privacy:metadata:mnet_external:icq,auth_mnet -privacy:metadata:mnet_external:msn,auth_mnet -privacy:metadata:mnet_external:skype,auth_mnet -privacy:metadata:mnet_external:url,auth_mnet -privacy:metadata:mnet_external:yahoo,auth_mnet diff --git a/blocks/myprofile/lang/en/block_myprofile.php b/blocks/myprofile/lang/en/block_myprofile.php index 79c4342b0e2..b96daff7896 100644 --- a/blocks/myprofile/lang/en/block_myprofile.php +++ b/blocks/myprofile/lang/en/block_myprofile.php @@ -43,10 +43,3 @@ $string['myprofile:myaddinstance'] = 'Add a new logged in user block to Dashboar $string['myprofile_settings'] = 'Visible user information'; $string['pluginname'] = 'Logged in user'; $string['privacy:metadata'] = 'The Logged in user block only shows information about the logged in user and does not store data itself.'; - -// Deprecated since Moodle 3.11. -$string['display_icq'] = 'Display ICQ'; -$string['display_skype'] = 'Display Skype'; -$string['display_yahoo'] = 'Display Yahoo'; -$string['display_aim'] = 'Display AIM'; -$string['display_msn'] = 'Display MSN'; \ No newline at end of file diff --git a/blocks/myprofile/lang/en/deprecated.txt b/blocks/myprofile/lang/en/deprecated.txt deleted file mode 100644 index 78e29683f8a..00000000000 --- a/blocks/myprofile/lang/en/deprecated.txt +++ /dev/null @@ -1,5 +0,0 @@ -display_aim,block_myprofile -display_icq,block_myprofile -display_msn,block_myprofile -display_skype,block_myprofile -display_yahoo,block_myprofile diff --git a/lang/en/admin.php b/lang/en/admin.php index 886bd7aabd3..72483863da9 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -1597,12 +1597,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 3.11. -$string['configenableactivitychooser'] = 'The activity chooser is a dialog box with a short description of each activity and resource. If disabled, separate resource and activity drop-down menus are provided instead.'; -$string['enableactivitychooser'] = 'Enable activity chooser'; -$string['configmodchooserdefault'] = 'Should the activity chooser be presented to users by default?'; -$string['modchooserdefault'] = 'Activity chooser default'; - // Deprecated since Moodle 4.0. $string['coursepage'] = 'Course page'; $string['mediapluginswf'] = 'Enable .swf filter'; diff --git a/lang/en/badges.php b/lang/en/badges.php index b078a063fd4..463eb8b4c51 100644 --- a/lang/en/badges.php +++ b/lang/en/badges.php @@ -578,13 +578,6 @@ $string['warnexpired'] = ' (This badge has expired!)'; $string['year'] = 'Year(s)'; $string['includeauthdetails'] = "Include authentication details with the backpack"; -// Deprecated since Moodle 3.11. -$string['addbackpack'] = 'Add backpack'; -$string['error:backpacknotavailable'] = 'Your site is not accessible from the Internet, so any badges issued from this site cannot be verified by external backpack services.'; -$string['error:backpackproblem'] = 'There was a problem connecting to your backpack service provider. Please try again later.'; -$string['sitebackpack'] = 'Active external backpack'; -$string['sitebackpack_help'] = 'The external backpack that users can connect to from this site. Note that changing this setting after users have connected their backpacks will require each user to go to their backpack settings page and disconnect then reconnect.'; - // Deprecated since Moodle 4.0. $string['evidence'] = 'Evidence'; $string['recipientdetails'] = 'Recipient details'; diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index 32eb96d0d18..fe1cdb27e95 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -8,23 +8,6 @@ viewallmyentries,core_blog searchallavailablecourses_desc,core_admin search:mycourse,core_search calendarurl,core_calendar -hidepicture,core_group -hidepicture,core_moodle -sitebackpack,core_badges -sitebackpack_help,core_badges -usernameoridnousererror,core_webservice -usernameoridoccurenceerror,core_webservice -addbackpack,core_badges -error:backpacknotavailable,core_badges -error:backpackproblem,core_badges -grade,core -aimid,core -yahooid,core -icqnumber,core -msnid,core -configenableactivitychooser,core_admin -enableactivitychooser,core_admin -coursepreferences,core yourprogress,core_completion importfrominstructions,core_calendar proceedtocourse,core_enrol diff --git a/lang/en/group.php b/lang/en/group.php index c7c91442d83..ec14b10f3a7 100644 --- a/lang/en/group.php +++ b/lang/en/group.php @@ -216,6 +216,3 @@ $string['visibilitymembers'] = 'Only visible to members'; $string['visibilityown'] = 'Only see own membership'; $string['visibilitynone'] = 'Hidden'; $string['memberofgroup'] = 'Group member of: {$a}'; - -// Deprecated since Moodle 3.11. -$string['hidepicture'] = 'Hide picture'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index f737937547d..040c8c95016 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -2420,17 +2420,6 @@ $string['yourwordforx'] = 'Your word for \'{$a}\''; $string['zippingbackup'] = 'Zipping backup'; $string['deprecatedeventname'] = '{$a} (no longer in use)'; -// Deprecated since Moodle 3.11. -$string['hidepicture'] = 'Hide picture'; -$string['grade'] = 'Grade'; -$string['aimid'] = 'AIM ID'; -$string['yahooid'] = 'Yahoo ID'; -$string['skypeid'] = 'Skype ID'; -$string['icqnumber'] = 'ICQ number'; -$string['msnid'] = 'MSN ID'; -$string['coursepreferences'] = 'Course preferences'; -$string['registrationno'] = 'No, I do not wish to receive any emails'; - // Deprecated since Moodle 4.0. $string['createuserandpass'] = 'Choose your username and password'; $string['descriptiona'] = 'Description: {$a}'; diff --git a/lang/en/webservice.php b/lang/en/webservice.php index a7d88049f16..5f45015d89e 100644 --- a/lang/en/webservice.php +++ b/lang/en/webservice.php @@ -230,9 +230,6 @@ $string['wsdocumentationlogin'] = 'or enter your web service username and passwo $string['wspassword'] = 'Web service password'; $string['wsusername'] = 'Web service username'; -// Deprecated since Moodle 3.11. -$string['usernameoridnousererror'] = 'No users were found with this username/user id.'; -$string['usernameoridoccurenceerror'] = 'More than one user was found with this username. Please enter the user id.'; // Deprecated since Moodle 4.2. $string['missingversionfile'] = 'Coding error: version.php file is missing for the component {$a}'; $string['cannotgetcoursecontents'] = 'Cannot get course contents'; diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php index 7f369dd22d9..a9896de2750 100644 --- a/mod/assign/lang/en/assign.php +++ b/mod/assign/lang/en/assign.php @@ -661,9 +661,3 @@ $string['viewsubmissiongradingtable'] = 'View submission grading table.'; $string['viewrevealidentitiesconfirm'] = 'View reveal student identities confirmation page.'; $string['workflowfilter'] = 'Workflow filter'; $string['xofy'] = '{$a->x} of {$a->y}'; - -// Deprecated since Moodle 3.11. -$string['allowsubmissionsfromdatesummary'] = 'This assignment will accept submissions from {$a}'; -$string['allowsubmissionsanddescriptionfromdatesummary'] = 'The assignment details and submission form will be available from {$a}'; -$string['relativedatessubmissionduedateafter'] = '{$a->datediffstr} after course start'; -$string['relativedatessubmissionduedatebefore'] = '{$a->datediffstr} before course start'; diff --git a/mod/assign/lang/en/deprecated.txt b/mod/assign/lang/en/deprecated.txt deleted file mode 100644 index 6dc9ed500d3..00000000000 --- a/mod/assign/lang/en/deprecated.txt +++ /dev/null @@ -1,4 +0,0 @@ -allowsubmissionsfromdatesummary,mod_assign -allowsubmissionsanddescriptionfromdatesummary,mod_assign -relativedatessubmissionduedateafter,mod_assign -relativedatessubmissionduedatebefore,mod_assign diff --git a/mod/chat/lang/en/chat.php b/mod/chat/lang/en/chat.php index f30bbe154d3..1cc170d5bd9 100644 --- a/mod/chat/lang/en/chat.php +++ b/mod/chat/lang/en/chat.php @@ -176,8 +176,5 @@ $string['usingchat_help'] = 'The chat module contains some features to make chat * 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 3.11. -$string['sessionstart'] = 'The next chat session will start on {$a->date}, ({$a->fromnow} from now)'; - // 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 index 7c5b10207a1..537cf2d30f1 100644 --- a/mod/chat/lang/en/deprecated.txt +++ b/mod/chat/lang/en/deprecated.txt @@ -1,2 +1 @@ -sessionstart,mod_chat nextsession,mod_chat diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php index 58ab8cba385..71fff9898a9 100644 --- a/mod/data/lang/en/data.php +++ b/mod/data/lang/en/data.php @@ -475,9 +475,6 @@ $string['viewtodate'] = 'Read only to'; $string['viewtodatevalidation'] = 'The read only to date cannot be before the read only from date.'; $string['wrongdataid'] = 'Wrong data ID provided'; -// Deprecated since Moodle 3.11. -$string['unsupportedexport'] = '({$a->fieldtype}) cannot be exported.'; - // Deprecated since Moodle 4.1. $string['buttons'] = 'Actions'; $string['nolisttemplate'] = 'List view template is not yet defined'; diff --git a/mod/data/lang/en/deprecated.txt b/mod/data/lang/en/deprecated.txt index a977a74abee..c56751ca789 100644 --- a/mod/data/lang/en/deprecated.txt +++ b/mod/data/lang/en/deprecated.txt @@ -1,4 +1,3 @@ -unsupportedexport,mod_data buttons,mod_data nosingletemplate,mod_data nolisttemplate,mod_data diff --git a/mod/quiz/accessrule/openclosedate/lang/en/deprecated.txt b/mod/quiz/accessrule/openclosedate/lang/en/deprecated.txt deleted file mode 100644 index 03fecc7b713..00000000000 --- a/mod/quiz/accessrule/openclosedate/lang/en/deprecated.txt +++ /dev/null @@ -1 +0,0 @@ -quiznotavailable,quizaccess_openclosedate diff --git a/mod/quiz/accessrule/openclosedate/lang/en/quizaccess_openclosedate.php b/mod/quiz/accessrule/openclosedate/lang/en/quizaccess_openclosedate.php index b835cde0b87..ed74832bda7 100644 --- a/mod/quiz/accessrule/openclosedate/lang/en/quizaccess_openclosedate.php +++ b/mod/quiz/accessrule/openclosedate/lang/en/quizaccess_openclosedate.php @@ -23,14 +23,6 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -defined('MOODLE_INTERNAL') || die(); - - $string['notavailable'] = 'This quiz is currently not available.'; $string['pluginname'] = 'Open and close date access rule'; $string['privacy:metadata'] = 'The Open and close date quiz access rule plugin does not store any personal data.'; - -// Deprecated since Moodle 3.11. -$string['quiznotavailable'] = 'The quiz will not be available until {$a}'; - diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php index 87e71d3057b..e5c24a60eab 100644 --- a/mod/quiz/lang/en/quiz.php +++ b/mod/quiz/lang/en/quiz.php @@ -1074,9 +1074,6 @@ $string['questionversionlatest'] = 'v{$a} (latest)'; $string['alwayslatest'] = 'Always latest'; $string['gobacktoquiz'] = 'Go back'; -// Deprecated since Moodle 3.11. -$string['completionattemptsexhausteddesc'] = 'Complete if all available attempts are exhausted'; - // Deprecated since Moodle 4.0. $string['completionpass'] = 'Require passing grade'; $string['completionpassdesc'] = 'Student must achieve a passing grade to complete this activity';