mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 16:04:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-65801' of https://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2022-01-14 09:30:11 +08:00
commit 626c8b43bf
27 changed files with 7 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/tool/analytics/lang/en/deprecated.txt
View File

@ -1 +0,0 @@
getpredictions,tool_analytics

3
admin/tool/analytics/lang/en/tool_analytics.php
View File

@ -152,6 +152,3 @@ $string['viewlog'] = 'Evaluation log';
$string['weeksenddateautomaticallyset'] = 'End date automatically set based on start date and the number of sections';
$string['weeksenddatedefault'] = 'End date automatically calculated from the course start date.';
$string['privacy:metadata'] = 'The Analytic models plugin does not store any personal data.';
// Deprecated since Moodle 3.8.
$string['getpredictions'] = 'Get predictions';

4
auth/cas/lang/en/auth_cas.php
View File

@ -78,7 +78,3 @@ $string['noldapserver'] = 'No LDAP server configured for CAS! Syncing disabled.'
$string['pluginname'] = 'CAS server (SSO)';
$string['synctask'] = 'CAS users sync job';
$string['privacy:metadata'] = 'The CAS server (SSO) authentication plugin does not store any personal data.';
// Deprecated since Moodle 3.7.
$string['accesCAS'] = 'CAS users';
$string['accesNOCAS'] = 'other users';

2
auth/cas/lang/en/deprecated.txt
View File

@ -1,2 +0,0 @@
accesCAS,auth_cas
accesNOCAS,auth_cas

4
blocks/myoverview/lang/en/block_myoverview.php
View File

@ -89,7 +89,3 @@ $string['privacy:request:preference:set'] = 'The value of the setting \'{$a->nam
// Deprecated since Moodle 4.0.
$string['clearsearch'] = "Clear search";
// Deprecated since Moodle 3.7.
$string['complete'] = 'complete';
$string['nocourses'] = 'No courses';

2
blocks/myoverview/lang/en/deprecated.txt
View File

@ -1,3 +1 @@
nocourses,block_myoverview
complete,block_myoverview
clearsearch,block_myoverview

13
lang/en/admin.php
View File

@ -1537,19 +1537,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.7.
$string['allowblockstodock'] = 'Allow blocks to use the dock';
$string['configallowblockstodock'] = 'If enabled and supported by the selected theme users can choose to move blocks to a special dock.';
// Deprecated since Moodle 3.8.
$string['configuserquota'] = 'The maximum number of bytes that a user can store in their own private file area. {$a->bytes} bytes == {$a->displaysize}';
$string['registermoodlenet'] = '<p>We\'d love to stay in touch and provide you with important things for your Moodle site!</p><p>By registering:</p><ul><li>You can subscribe to receive notifications of new Moodle releases, security alerts and other important news.</li><li>You can access and activate mobile push notifications from your Moodle site through our free <a href="https://download.moodle.org/mobile/">Moodle app</a>.</li><li>You are contributing to our <a href="https://stats.moodle.org">Moodle statistics</a> of the worldwide community, which help us improve Moodle and our community sites.</li><li>If you wish, your site can be included in the <a href="https://stats.moodle.org/sites/">list of registered Moodle sites</a> in your country.</li></ul>';
$string['registermoodleorg'] = 'When you register your site';
$string['registermoodleorgli1'] = 'You are added to a low-volume mailing list for important notifications such as security alerts and new releases of Moodle.';
$string['registermoodleorgli2'] = 'Statistics about your site will be added to the {$a} of the worldwide Moodle community.';
$string['registerwithmoodleorg'] = 'Register your site';
$string['configrequestcategoryselection'] = 'Allow the selection of a category when requesting a course.';
$string['requestcategoryselection'] = 'Enable category selection';
// Deprecated since Moodle 3.9.
$string['availablelicenses'] = 'Available licences';
$string['managelicenses'] = 'Manage licences';

8
lang/en/block.php
View File

@ -73,11 +73,3 @@ $string['thisspecificpage'] = 'This specific page';
$string['visible'] = 'Visible';
$string['weight'] = 'Weight';
$string['wherethisblockappears'] = 'Where this block appears';
// Deprecated since Moodle 3.7.
$string['addtodock'] = 'Move this to the dock';
$string['dockblock'] = 'Dock {$a} block';
$string['hidedockpanel'] = 'Hide the dock panel';
$string['undockall'] = 'Undock all';
$string['undockblock'] = 'Undock {$a} block';
$string['undockitem'] = 'Undock this item';

4
lang/en/cache.php
View File

@ -217,7 +217,3 @@ $string['usage_totalmargin'] = 'Error margin (95%)';
$string['usage_realtotal'] = 'Actual usage (if known)';
$string['userinputsharingkey'] = 'Custom key for sharing';
$string['userinputsharingkey_help'] = 'Enter your own private key here. When you set up other stores on other sites you wish to share data with make sure you set the exact same key there.';
// Deprecated since Moodle 3.8.
$string['purgedefinitionsuccess'] = 'Successfully purged the requested definition.';
$string['purgestoresuccess'] = 'Successfully purged the requested store.';

6
lang/en/calendar.php
View File

@ -287,9 +287,3 @@ $string['yoursubscriptions'] = 'Imported calendars';
$string['calendarurl'] = 'Calendar URL: {$a}';
$string['importfrominstructions'] = 'Please provide either a URL to a remote calendar, or upload a file.';
$string['monthlyview'] = 'Monthly view';
// Deprecated since Moodle 3.8.
$string['global'] = 'Global';
$string['globalevent'] = 'Global event';
$string['globalevents'] = 'Global events';
$string['eventtypeglobal'] = 'global';

89
lang/en/deprecated.txt
View File

@ -7,98 +7,9 @@ myprofile,core
viewallmyentries,core_blog
messagecontactrequestsnotification,core_message
messagecontactrequestsnotificationsubject,core_message
nomessages,core_message
searchallavailablecourses_desc,core_admin
search:mycourse,core_search
outputdisabled,core_message
outputdoesnotexist,core_message
outputenabled,core_message
outputnotconfigured,core_message
addtodock,core_block
dockblock,core_block
hidedockpanel,core_block
undockall,core_block
undockblock,core_block
undockitem,core_block
canceledit,core_message
purgedefinitionsuccess,core_cache
purgestoresuccess,core_cache
eventrolecapabilitiesupdated,core_role
configuserquota,core_admin
addscreenshots,core_hub
advertise,core_hub
advertised,core_hub
advertiseon,core_hub
readvertiseon,core_hub
advertisepublication_help,core_hub
courseunpublished,core_hub
courseurl,core_hub
courseurl_help,core_hub
creatorname,core_hub
creatorname_help,core_hub
creatornotes,core_hub
creatornotes_help,core_hub
contributornames,core_hub
contributornames_help,core_hub
deletescreenshots,core_hub
deletescreenshots_help,core_hub
description,core_hub
description_help,core_hub
detectednotexistingpublication,core_hub
errorcoursepublish,core_hub
errorcourseinfo,core_hub
errorcoursewronglypublished,core_hub
errorbadimageheightwidth,core_hub
errorregistration,core_hub
errorunpublishcourses,core_hub
existingscreenshotnumber,core_hub
existingscreenshots,core_hub
nosearch,core_hub
notregisteredonhub,core_hub
publicationinfo,core_hub
publish,core_hub
publishcourse,core_hub
publishcourseon,core_hub
publishedon,core_hub
publisheremail,core_hub
publisheremail_help,core_hub
publishername,core_hub
publishername_help,core_hub
removefromhub,core_hub
screenshots,core_hub
screenshots_help,core_hub
sendingcourse,core_hub
share,core_hub
shared,core_hub
shareon,core_hub
sharepublication_help,core_hub
status,core_hub
statuspublished,core_hub
statusunpublished,core_hub
tags,core_hub
tags_help,core_hub
unpublish,core_hub
unpublishalladvertisedcourses,core_hub
unpublishalluploadedcourses,core_hub
unpublishconfirmation,core_hub
unpublishcourse,core_hub
updatestatus,core_hub
registermoodlenet,core_admin
registermoodleorg,core_admin
registermoodleorgli1,core_admin
registermoodleorgli2,core_admin
registerwithmoodleorg,core_admin
completeregistration,core_hub
registersite,core_hub
updatesite,core_hub
unregisterexplained,core_hub
configrequestcategoryselection,core_admin
requestcategoryselection,core_admin
calendarurl,core_calendar
global,core_calendar
globalevent,core_calendar
globalevents,core_calendar
eventtypeglobal,core_calendar
documentation,core_webservice
africa/asmera,core_timezones
africa/timbuktu,core_timezones

66
lang/en/hub.php
View File

@ -56,6 +56,7 @@ $string['eduleveltertiary'] = 'Tertiary';
$string['emailalert'] = 'Email notifications';
$string['emailalert_help'] = 'If this is enabled the hub administrator will send you emails about security issues and other important news.';
$string['enrollable'] = 'Enrollable';
$string['errorcoursewronglypublished'] = 'A publication error has been returned by Moodle.net. Please try again later.';
$string['errorotherhubsnotsupported'] = 'This page can no longer be used for registration with custom sites directories.';
$string['errorws'] = '{$a}';
$string['errorwstokenreset'] = '{$a}. Registration token on this site has been reset. You can now register your site again.';
@ -171,70 +172,5 @@ $string['urlalreadyregistered'] = 'Your site seems to be already registered, whi
$string['usersnumber'] = 'Number of users ({$a})';
$string['wrongtoken'] = 'The registration failed for some unknown reason (network?). Please try again.';
// Deprecated since Moodle 3.8.
$string['addscreenshots'] = 'Add screenshots';
$string['advertise'] = 'Share this course for people to join';
$string['advertised'] = 'For people to join';
$string['advertiseon'] = 'Share this course on {$a}';
$string['readvertiseon'] = 'Update advertising information on {$a}';
$string['advertisepublication_help'] = 'This course will be listed on Moodle.net as a course that people can enrol in and participate. Email-based self-registration should be enabled on the site and you need to enable self enrolment in this course.';
$string['completeregistration'] = 'Complete registration with Moodle.net';
$string['courseunpublished'] = 'The course {$a->courseshortname} is no longer shared on {$a->hubname}.';
$string['courseurl'] = 'Course URL';
$string['courseurl_help'] = 'It is the URL of your course. This URL is displayed as a link in a search result.';
$string['creatorname'] = 'Creator';
$string['creatorname_help'] = 'The creator is the course creator.';
$string['creatornotes'] = 'Creator notes';
$string['creatornotes_help'] = 'Creator notes are a guide for teachers on how to use the course.';
$string['contributornames'] = 'Other contributors';
$string['contributornames_help'] = 'You can use this field to list the names of anyone else who contributed to this course.';
$string['deletescreenshots'] = 'Delete these screenshots';
$string['deletescreenshots_help'] = 'Delete all the currently uploaded screenshots.';
$string['description'] = 'Description';
$string['description_help'] = 'This description text will be showing in the course listing on Moodle.net.';
$string['detectednotexistingpublication'] = '{$a->hubname} is listing a course that does not exist any more. Alert {$a->hubname} administrator that the publication number {$a->id} should be removed.';
$string['errorcoursepublish'] = 'An error occurred during the course publication ({$a}). Please try again later.';
$string['errorcourseinfo'] = 'An error occurred when retrieving course metadata from {$a}. Please try again to retrieve the course metadata by reloading this page later. Otherwise you can decide to continue the registration process with the following default metadata. ';
$string['errorcoursewronglypublished'] = 'A publication error has been returned by Moodle.net. Please try again later.';
$string['errorbadimageheightwidth'] = 'The image should have a maximum size of {$a->width} X {$a->height}';
$string['errorregistration'] = 'An error occurred during registration, please try again later. ({$a})';
$string['errorunpublishcourses'] = 'Due to an unexpected error, the courses could not be deleted from Moodle.net. Try again later (recommended) or contact Moodle.net administrator.';
$string['existingscreenshotnumber'] = '{$a} existing screenshots. You will be able to see these screenshots on this page, only once the Moodle.net administrator enables your course.';
$string['existingscreenshots'] = 'Existing screenshots';
$string['nosearch'] = 'Don\'t publish hub or courses';
$string['notregisteredonhub'] = 'Your administrator needs to register this site with Moodle.net before you can share a course.';
$string['publicationinfo'] = 'Course publication information';
$string['publish'] = 'Share';
$string['publishcourse'] = 'Share {$a}';
$string['publishcourseon'] = 'Share on {$a}';
$string['publishedon'] = 'Course sharing';
$string['publisheremail'] = 'Publisher email';
$string['publisheremail_help'] = 'The publisher email address allows the hub administrator to alert the publisher about any changes to the status of the published course.';
$string['publishername'] = 'Publisher';
$string['publishername_help'] = 'The publisher is the person or organisation that is the official publisher of the course. Unless you are publishing it on behalf of someone else, it will usually be you.';
$string['registersite'] = 'Register with {$a}';
$string['removefromhub'] = 'Remove from Moodle.net';
$string['screenshots'] = 'Screenshots';
$string['screenshots_help'] = 'Any screenshots of the course will be displayed in search results.';
$string['sendingcourse'] = 'Sending course';
$string['share'] = 'Share this course for people to download';
$string['shared'] = 'For people to download';
$string['shareon'] = 'Upload this course to {$a}';
$string['sharepublication_help'] = 'A backup of this course will be available on Moodle.net for people to restore and use on their own site.';
$string['status'] = 'Listing status';
$string['statuspublished'] = 'Listed';
$string['statusunpublished'] = 'Not listed';
$string['tags'] = 'Tags';
$string['tags_help'] = 'Tags help to further categorise your course and help it to be found. Please use simple, meaningful words and separate them with a comma. Example: math, algebra, geometry';
$string['unpublish'] = 'Stop sharing';
$string['unpublishalladvertisedcourses'] = 'Remove all courses that were shared on Moodle.net for people to join';
$string['unpublishalluploadedcourses'] = 'Remove all courses that were shared on Moodle.net for people to download';
$string['unpublishconfirmation'] = 'Do you really want to remove the course "{$a->courseshortname}" from "{$a->hubname}"';
$string['unpublishcourse'] = 'Stop sharing {$a}';
$string['updatesite'] = 'Update registration on {$a}';
$string['updatestatus'] = 'Check it now.';
$string['unregisterfrom'] = 'Unregister from {$a}';
$string['unregisterexplained'] = 'If the site with URL {$a} is registered, then its registration will be removed.';
// Deprecate since 3.11.
$string['sitecommnewsno'] = 'No, I do not wish to receive any emails';

8
lang/en/message.php
View File

@ -276,14 +276,6 @@ $string['you'] = 'You:';
$string['youhaveblockeduser'] = 'You have blocked this user.';
$string['yourcontactrequestpending'] = 'Your contact request is pending with {$a}';
// Deprecated since Moodle 3.7.
$string['nomessages'] = 'No messages';
$string['outputdisabled'] = 'Output disabled';
$string['outputdoesnotexist'] = 'Message output does not exist';
$string['outputenabled'] = 'Output enabled';
$string['outputnotconfigured'] = 'Not configured';
$string['canceledit'] = 'Cancel editing messages';
// Deprecated since Moodle 3.9.
$string['messagecontactrequestsnotification'] = '{$a} is requesting to be added as a contact.';
$string['messagecontactrequestsnotificationsubject'] = 'Contact request from {$a}';

4
lang/en/role.php
View File

@ -240,6 +240,7 @@ $string['eventroleallowoverrideupdated'] = 'Allow role override';
$string['eventroleallowswitchupdated'] = 'Allow role switch';
$string['eventroleallowviewupdated'] = 'Allow role view';
$string['eventroleassigned'] = 'Role assigned';
$string['eventrolecapabilitiesupdated'] = 'Role capabilities updated';
$string['eventroledeleted'] = 'Role deleted';
$string['eventroleunassigned'] = 'Role unassigned';
$string['eventroleupdated'] = 'Role updated';
@ -517,6 +518,3 @@ $string['privacy:metadata:role_capabilities:tableexplanation'] = 'The capabiliti
$string['privacy:metadata:role_capabilities:timemodified'] = 'The date when the capability was created or modified.';
$string['privacy:metadata:role_cohortroles'] = 'Roles to cohort';
$string['course:togglecompletion'] = 'Manually mark activities as complete';
// Deprecated since Moodle 3.8.
$string['eventrolecapabilitiesupdated'] = 'Role capabilities updated';

10
lib/tests/string_manager_standard_test.php
View File

@ -74,12 +74,12 @@ class core_string_manager_standard_testcase extends advanced_testcase {
// Check non-deprecated string.
$this->assertFalse($stringman->string_deprecated('hidden', 'grades'));
// Check deprecated string.
$this->assertTrue($stringman->string_deprecated('purgedefinitionsuccess', 'core_cache'));
$this->assertTrue($stringman->string_exists('purgedefinitionsuccess', 'core_cache'));
// 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->assertDebuggingNotCalled();
$this->assertEquals('Successfully purged the requested definition.', get_string('purgedefinitionsuccess', 'core_cache'));
$this->assertDebuggingCalled('String [purgedefinitionsuccess,core_cache] is deprecated. '.
$this->assertEquals('Course page', get_string('coursepage', 'core_admin'));
$this->assertDebuggingCalled('String [coursepage,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://docs.moodle.org/dev/String_deprecation');
}

9
mod/assign/lang/en/assign.php
View File

@ -653,17 +653,8 @@ $string['viewrevealidentitiesconfirm'] = 'View reveal student identities confirm
$string['workflowfilter'] = 'Workflow filter';
$string['xofy'] = '{$a->x} of {$a->y}';
// Deprecated since Moodle 3.8.
$string['duedateno'] = 'No due date';
$string['mysubmission'] = 'My submission: ';
$string['nolatesubmissions'] = 'No late submissions accepted. ';
$string['nosubmissionsacceptedafter'] = 'No submissions accepted after ';
$string['notsubmittedyet'] = 'Not submitted yet';
$string['submissionsnotgraded'] = 'Submissions not graded: {$a}';
// Deprecated since Moodle 3.11.
$string['allowsubmissionsfromdatesummary'] = 'This assignment will accept submissions from <strong>{$a}</strong>';
$string['allowsubmissionsanddescriptionfromdatesummary'] = 'The assignment details and submission form will be available from <strong>{$a}</strong>';
$string['relativedatessubmissionduedateafter'] = '{$a->datediffstr} after course start';
$string['relativedatessubmissionduedatebefore'] = '{$a->datediffstr} before course start';

6
mod/assign/lang/en/deprecated.txt
View File

@ -1,10 +1,4 @@
allowsubmissionsfromdatesummary,mod_assign
allowsubmissionsanddescriptionfromdatesummary,mod_assign
duedateno,mod_assign
mysubmission,mod_assign
nolatesubmissions,mod_assign
nosubmissionsacceptedafter,mod_assign
notsubmittedyet,mod_assign
relativedatessubmissionduedateafter,mod_assign
relativedatessubmissionduedatebefore,mod_assign
submissionsnotgraded,mod_assign

4
mod/choice/lang/en/choice.php
View File

@ -159,7 +159,3 @@ $string['viewchoices'] = 'View choices';
$string['withselected'] = 'With selected';
$string['userchoosethisoption'] = 'Users who chose this option';
$string['yourselection'] = 'Your selection';
// Deprecated since Moodle 3.8.
$string['choiceactivityname'] = 'Choice: {$a}';
$string['choicecloseson'] = 'Choice closes on {$a}';

2
mod/choice/lang/en/deprecated.txt
View File

@ -1,2 +0,0 @@
choiceactivityname,mod_choice
choicecloseson,mod_choice

4
mod/forum/lang/en/deprecated.txt
View File

@ -1,5 +1 @@
cannotdeletediscussioninsinglediscussion,mod_forum
inpagereplysubject,mod_forum
overviewnumpostssince,mod_forum
overviewnumunread,mod_forum
postmailinfolink,mod_forum

6
mod/forum/lang/en/forum.php
View File

@ -782,9 +782,3 @@ $string['viewgrades'] = 'View grades';
$string['postmailinfolink'] = 'This is a copy of a message posted in {$a->coursename}.
To reply click on this link: {$a->replylink}';
// Deprecated since Moodle 3.8.
$string['cannotdeletediscussioninsinglediscussion'] = 'You cannot delete the first post in a single discussion';
$string['inpagereplysubject'] = 'Re: {$a}';
$string['overviewnumpostssince'] = '{$a} posts since last login';
$string['overviewnumunread'] = '{$a} total unread';

4
mod/lesson/lang/en/deprecated.txt
View File

@ -1,4 +0,0 @@
additionalattemptsremaining,mod_lesson
lessoncloseson,mod_lesson
lessonname,mod_lesson
xattempts,mod_lesson

6
mod/lesson/lang/en/lesson.php
View File

@ -605,9 +605,3 @@ $string['youranswer'] = 'Your answer';
$string['yourcurrentgradeis'] = 'Your current grade is {$a}';
$string['yourcurrentgradeisoutof'] = 'Your current grade is {$a->grade} out of {$a->total}';
$string['youshouldview'] = 'You should answer at least: {$a}';
// Deprecated since Moodle 3.8.
$string['additionalattemptsremaining'] = 'Completed, You can re-attempt this lesson';
$string['lessoncloseson'] = 'Lesson closes on {$a}';
$string['lessonname'] = 'Lesson: {$a}';
$string['xattempts'] = '{$a} attempts';

4
mod/quiz/lang/en/deprecated.txt
View File

@ -1,7 +1,3 @@
numattemptsmade,mod_quiz
reviewofattempt,mod_quiz
reviewofpreview,mod_quiz
settingsoverrides,mod_quiz
completionpass,mod_quiz
completionpassdesc,mod_quiz
completionpass_help,mod_quiz

6
mod/quiz/lang/en/quiz.php
View File

@ -1039,12 +1039,6 @@ $string['xhtml'] = 'XHTML';
$string['youneedtoenrol'] = 'You need to enrol in this course before you can attempt this quiz';
$string['yourfinalgradeis'] = 'Your final grade for this quiz is {$a}.';
// Deprecated since Moodle 3.8.
$string['numattemptsmade'] = '{$a} attempts made on this quiz';
$string['reviewofattempt'] = 'Review of attempt {$a}';
$string['reviewofpreview'] = 'Review of preview';
$string['settingsoverrides'] = 'Settings overrides';
// Deprecated since Moodle 3.11.
$string['completionattemptsexhausteddesc'] = 'Complete if all available attempts are exhausted';

1
mod/scorm/lang/en/deprecated.txt
View File

@ -1,2 +1 @@
duedate,mod_scorm
info,mod_scorm

3
mod/scorm/lang/en/scorm.php
View File

@ -456,8 +456,5 @@ $string['width'] = 'Width';
$string['window'] = 'Window';
$string['youmustselectastatus'] = 'You must select a status to require';
// Deprecated since Moodle 3.8.
$string['duedate'] = 'Due date';
// Deprecated since Moodle 4.0.
$string['info'] = 'Info';