mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-59524-master' of git://github.com/cescobedo/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2019-08-13 12:56:32 +08:00
commit c188ddfe93
16 changed files with 8 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auth/ldap/lang/en/auth_ldap.php
View File

@ -164,8 +164,4 @@ $string['diag_toooldversion'] = 'It is very unlikely a modern LDAP server uses L
$string['diag_emptycontext'] = 'Empty context found.';
$string['diag_contextnotfound'] = 'Context {$a} doesn\'t exist or can\'t be read by bind DN.';
$string['diag_rolegroupnotfound'] = 'Group {$a->group} for role {$a->localname} doesn\'t exist or can\'t be read by bind DN.';
// Deprecated since Moodle 3.4.
$string['auth_ldap_creators'] = 'List of groups or contexts whose members are allowed to create new courses. Separate multiple groups with \';\'. Usually something like \'cn=teachers,ou=staff,o=myorg\'';
$string['auth_ldap_creators_key'] = 'Creators';
$string['privacy:metadata'] = 'The LDAP server authentication plugin does not store any personal data.';

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

@ -1,2 +0,0 @@
auth_ldap_creators,auth_ldap
auth_ldap_creators_key,auth_ldap

8
calendar/lib.php
View File

@ -1651,9 +1651,9 @@ function calendar_top_controls($type, $data) {
switch ($type) {
case 'frontpage':
$prevlink = calendar_get_link_previous(get_string('monthprev', 'access'), $urlbase, false, false, false,
$prevlink = calendar_get_link_previous(get_string('monthprev', 'calendar'), $urlbase, false, false, false,
true, $prevmonthtime);
$nextlink = calendar_get_link_next(get_string('monthnext', 'access'), $urlbase, false, false, false, true,
$nextlink = calendar_get_link_next(get_string('monthnext', 'calendar'), $urlbase, false, false, false, true,
$nextmonthtime);
$calendarlink = calendar_get_link_href(new \moodle_url(CALENDAR_URL . 'view.php', array('view' => 'month')),
false, false, false, $time);
@ -1675,9 +1675,9 @@ function calendar_top_controls($type, $data) {
break;
case 'course':
$prevlink = calendar_get_link_previous(get_string('monthprev', 'access'), $urlbase, false, false, false,
$prevlink = calendar_get_link_previous(get_string('monthprev', 'calendar'), $urlbase, false, false, false,
true, $prevmonthtime);
$nextlink = calendar_get_link_next(get_string('monthnext', 'access'), $urlbase, false, false, false,
$nextlink = calendar_get_link_next(get_string('monthnext', 'calendar'), $urlbase, false, false, false,
true, $nextmonthtime);
$calendarlink = calendar_get_link_href(new \moodle_url(CALENDAR_URL . 'view.php', array('view' => 'month')),
false, false, false, $time);

4
lang/en/access.php
View File

@ -39,7 +39,3 @@ $string['skipto'] = 'Skip to {$a}';
$string['tocontent'] = 'Skip to main content';
$string['tonavigation'] = 'Go to navigation';
$string['youarehere'] = 'You are here';
// Deprecated since Moodle 3.4.
$string['monthnext'] = 'Next month';
$string['monthprev'] = 'Previous month';

5
lang/en/admin.php
View File

@ -1414,11 +1414,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.4
$string['moodleorghubname'] = 'Moodle';
$string['hubs'] = 'Hubs';
$string['configloginhttps'] = 'Turning this on will make Moodle use a secure https connection just for the login page (providing a secure login), and then afterwards revert back to the normal http URL for general speed. CAUTION: this setting REQUIRES https to be specifically enabled on the web server - if it is not then YOU COULD LOCK YOURSELF OUT OF YOUR SITE.';
$string['loginhttps'] = 'Use HTTPS for logins';
// 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.';

21
lang/en/calendar.php
View File

@ -268,24 +268,3 @@ $string['weekthis'] = 'This week';
$string['when'] = 'When';
$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.';
// Deprecated since Moodle 3.4.
$string['quickdownloadcalendar'] = 'Quick download / subscribe to calendar';
$string['ical'] = 'iCal';
$string['tt_hidecourse'] = 'Course events are shown (click to hide)';
$string['tt_hideglobal'] = 'Global events are shown (click to hide)';
$string['tt_hidegroups'] = 'Group events are shown (click to hide)';
$string['tt_hideuser'] = 'User events are shown (click to hide)';
$string['tt_showcourse'] = 'Course events are hidden (click to show)';
$string['tt_showglobal'] = 'Global events are hidden (click to show)';
$string['tt_showgroups'] = 'Group events are hidden (click to show)';
$string['tt_showuser'] = 'User events are hidden (click to show)';
$string['hidecourseevents'] = 'Hide course events';
$string['hideglobalevents'] = 'Hide global events';
$string['hidegroupsevents'] = 'Hide group events';
$string['hideuserevents'] = 'Hide user events';
$string['showcourseevents'] = 'Show course events';
$string['showglobalevents'] = 'Show global events';
$string['showgroupsevents'] = 'Show group events';
$string['showuserevents'] = 'Show user events';
$string['subsource'] = 'Event source: {$a->name}';

103
lang/en/deprecated.txt
View File

@ -5,109 +5,6 @@ myfilesmanage,core
mypreferences,core_grades
myprofile,core
viewallmyentries,core_blog
registermoochtips,core_hub
monthnext,core_access
monthprev,core_access
tt_hidecourse,core_calendar
tt_hideglobal,core_calendar
tt_hidegroups,core_calendar
tt_hideuser,core_calendar
tt_showcourse,core_calendar
tt_showglobal,core_calendar
tt_showgroups,core_calendar
tt_showuser,core_calendar
hidecourseevents,core_calendar
hideglobalevents,core_calendar
hidegroupsevents,core_calendar
hideuserevents,core_calendar
showcourseevents,core_calendar
showglobalevents,core_calendar
showgroupsevents,core_calendar
showuserevents,core_calendar
errorcronnoxmlrpc,core_hub
advertiseonhub,core_hub
advertiseonmoodleorg,core_hub
all,core_hub
allowglobalsearch,core_hub
allowpublicsearch,core_hub
badurlformat,core_hub
community,core_hub
cannotsearchcommunity,core_hub
contactable,core_hub
contactable_help,core_hub
contactemail,core_hub
contactname,core_hub
contactphone,core_hub
contactphone_help,core_hub
continue,core_hub
coursemap,core_hub
courseprivate,core_hub
coursepublic,core_hub
errorcron,core_hub
errorhublisting,core_hub
errorlangnotrecognized,core_hub
forceunregister,core_hub
forceunregisterconfirmation,core_hub
hub,core_hub
information,core_hub
moodleorg,core_hub
nocheckstatusfromunreghub,core_hub
nohubselected,core_hub
none,core_hub
nosearch,core_hub
notregisteredonmoodleorg,core_hub
orenterprivatehub,core_hub
prioritise,core_hub
private,core_hub
privatehuburl,core_hub
publichub,core_hub
publish,core
publishon,core_hub
publishonspecifichub,core_hub
registeredmoodleorg,core_hub
registeredon,core_hub
registerwith,core_hub
registrationupdated,core_hub
registrationupdatedfailed,core_hub
selecthub,core_hub
selecthubinfo,core_hub
selecthubforadvertise,core_hub
selecthubforsharing,core_hub
settings,core_hub
settingsupdated,core_hub
shareonhub,core_hub
sitecreated,core_hub
siteregconfcomment,core_hub
siteupdatedcron,core_hub
siteupdatesend,core_hub
siteupdatesstart,core_hub
specifichubregistrationdetail,core_hub
statistics,core_hub
trustme,core_hub
unknownstatus,core_hub
unlistedurl,core_hub
unprioritise,core_hub
unregisterconfirmation,core_hub
untrustme,core_hub
uploaded,core_hub
url,core_hub
warning,core_hub
wrongurlformat,core_hub
xmlrpcdisabledcommunity,core_hub
xmlrpcdisabledpublish,core_hub
xmlrpcdisabledregistration,core_hub
moodleorghubname,core_admin
hubs,core_admin
quickdownloadcalendar,core_calendar
ical,core_calendar
privacy,core_hub
privacy_help,core_hub
configloginhttps,core_admin
loginhttps,core_admin
groupaddnewnote,core_notes
selectnotestate,core_notes
extendenrol,core
groupextendenrol,core
virusfounduser,core_antivirus
formattexttype,core
currentlyselectedusers,core

76
lang/en/hub.php
View File

@ -221,79 +221,3 @@ $string['unregisterexplained'] = 'If the site with URL {$a} is registered on Moo
$string['urlalreadyregistered'] = 'Your site seems to be already registered on Moodle.net, which means something has gone wrong. Please contact the Moodle.net administrator to reset your registration so you can try again.';
$string['usersnumber'] = 'Number of users ({$a})';
$string['wrongtoken'] = 'The registration failed for some unknown reason (network?). Please try again.';
// Deprecated since Moodle 3.4.
$string['registermoochtips'] = 'By registering, you will receive security alerts, can activate mobile app push notifications from your site, and are contributing to our Moodle statistics of the worldwide community.';
$string['errorcronnoxmlrpc'] = 'XML-RPC must be enabled in order to update the registration.';
$string['advertiseonhub'] = 'Share this course for people to join';
$string['advertiseonmoodleorg'] = 'Advertise this course on moodle.org';
$string['all'] = 'All';
$string['allowglobalsearch'] = 'Publish this hub and allow global search of all courses';
$string['allowpublicsearch'] = 'Publish this hub so people can join it';
$string['badurlformat'] = 'Bad URL format';
$string['community'] = 'Community';
$string['cannotsearchcommunity'] = 'Sorry, you don\'t have the right permissions to see this page';
$string['contactable'] = 'Contact from the public';
$string['contactable_help'] = 'Set to yes, the hub will display your email address.';
$string['contactemail'] = 'Contact email';
$string['contactname'] = 'Contact name';
$string['contactphone'] = 'Phone';
$string['contactphone_help'] = 'Phone numbers are displayed to the Hub administrator only and are not shown publicly.';
$string['continue'] = 'Continue';
$string['coursemap'] = 'Course map';
$string['courseprivate'] = 'Private';
$string['coursepublic'] = 'Public';
$string['errorcron'] = 'An error occurred during registration update on "{$a->hubname}" ({$a->errormessage})';
$string['errorhublisting'] = 'An error occurred when retrieving the hub listing from Moodle. Please try again later. ({$a})';
$string['errorlangnotrecognized'] = 'The provided language code is unknown by Moodle. Please contact {$a}';
$string['forceunregister'] = 'Yes, clean registration data';
$string['forceunregisterconfirmation'] = 'Your site cannot reach {$a}. This hub could be temporarily down. Unless you are sure you want to continue to remove registration locally, please cancel and try again later.';
$string['hub'] = 'Hub';
$string['information'] = 'Information';
$string['moodleorg'] = 'Moodle';
$string['nocheckstatusfromunreghub'] = 'The site is not registered on the hub so the status can not be checked.';
$string['nohubselected'] = 'No hub selected';
$string['none'] = 'None';
$string['nosearch'] = 'Don\'t publish hub or courses';
$string['notregisteredonmoodleorg'] = 'Your administrator needs to register this site with moodle.org.';
$string['orenterprivatehub'] = 'Alternatively, enter a private hub URL:';
$string['prioritise'] = 'Prioritise';
$string['privacy'] = 'Privacy';
$string['privacy_help'] = 'The hub may want to display a list of registered sites. If it does then you can choose whether or not you want to appear on that list.';
$string['private'] = 'Private';
$string['privatehuburl'] = 'Private hub URL';
$string['publichub'] = 'Public hub';
$string['publishon'] = 'Share on';
$string['publishonspecifichub'] = 'Publish on another Hub';
$string['registeredmoodleorg'] = 'Moodle ({$a})';
$string['registeredon'] = 'Where your site is registered';
$string['registerwith'] = 'Register with a hub';
$string['registrationupdated'] = 'Registration has been updated.';
$string['registrationupdatedfailed'] = 'Registration update failed.';
$string['selecthub'] = 'Select hub';
$string['selecthubinfo'] = 'A community hub is a server that lists courses. You can only share your courses on hubs that this Moodle site is registered with. If the hub you want is not listed below, please contact your site administrator.';
$string['selecthubforadvertise'] = 'Select hub for advertising';
$string['selecthubforsharing'] = 'Select hub for uploading';
$string['settings'] = 'Settings';
$string['settingsupdated'] = 'Settings have been updated.';
$string['shareonhub'] = 'Upload this course to a hub';
$string['sitecreated'] = 'Site created';
$string['siteregconfcomment'] = 'Your site needs a final confirmation on {$a} (in order to avoid spam on {$a})';
$string['siteupdatedcron'] = 'Site registration updated on "{$a}"';
$string['siteupdatesend'] = 'Finished registration update on hubs.';
$string['siteupdatesstart'] = 'Starting registration update on hubs...';
$string['specifichubregistrationdetail'] = 'You can also register your site with other community hubs.';
$string['statistics'] = 'Statistics privacy';
$string['trustme'] = 'Trust';
$string['unknownstatus'] = 'Unknown';
$string['unlistedurl'] = 'Unlisted hub URL';
$string['unprioritise'] = 'Unprioritise';
$string['unregisterconfirmation'] = 'You are about to unregister this site from the hub {$a}. Once you disconnect from it, you will not be able to manage any courses you left there. Are you sure you want to unregister?';
$string['untrustme'] = 'Not trusted';
$string['uploaded'] = 'Uploaded';
$string['url'] = 'hub URL';
$string['warning'] = 'WARNING';
$string['wrongurlformat'] = 'Bad URL format';
$string['xmlrpcdisabledcommunity'] = 'The XML-RPC extension is not enabled on the server. You can not search and download courses.';
$string['xmlrpcdisabledpublish'] = 'The XML-RPC extension is not enabled on the server, so it is not possible to share courses or manage shared courses.';
$string['xmlrpcdisabledregistration'] = 'The XML-RPC extension is not enabled on the server. You will not be able to unregister or update your registration until you enable it.';

1
lang/en/install.php
View File

@ -247,4 +247,3 @@ $string['welcomep60'] = 'The following pages will lead you through some easy to
$string['welcomep70'] = 'Click the "Next" button below to continue with the set up of <strong>Moodle</strong>.';
$string['wwwroot'] = 'Web address';
$string['wwwrooterror'] = 'The \'Web Address\' does not appear to be valid - this Moodle installation doesn\'t appear to be there. The value below has been reset.';
// Deprecated since 3.4.

5
lang/en/moodle.php
View File

@ -2197,11 +2197,6 @@ $string['yourwordforx'] = 'Your word for \'{$a}\'';
$string['zippingbackup'] = 'Zipping backup';
$string['deprecatedeventname'] = '{$a} (no longer in use)';
// Deprecated since Moodle 3.4.
$string['publish'] = 'Publish';
$string['extendenrol'] = 'Extend enrolment (individual)';
$string['groupextendenrol'] = 'Extend enrolment (common)';
// Deprecated since Moodle 3.6.
$string['addedrecip'] = 'Added {$a} new recipient';
$string['addedrecips'] = 'Added {$a} new recipients';

4
lang/en/notes.php
View File

@ -74,7 +74,3 @@ $string['publishstate_help'] = 'A note\'s context determines who can see the not
$string['site'] = 'site';
$string['sitenotes'] = 'Site notes';
$string['unknown'] = 'unknown';
// Deprecated since Moodle 3.4
$string['groupaddnewnote'] = 'Add a common note';
$string['selectnotestate'] = "Select note state";

8
lib/tests/string_manager_standard_test.php
View File

@ -75,11 +75,11 @@ class core_string_manager_standard_testcase extends advanced_testcase {
$this->assertFalse($stringman->string_deprecated('hidden', 'grades'));
// Check deprecated string.
$this->assertTrue($stringman->string_deprecated('groupextendenrol', 'core'));
$this->assertTrue($stringman->string_exists('groupextendenrol', 'core'));
$this->assertTrue($stringman->string_deprecated('purgedefinitionsuccess', 'core_cache'));
$this->assertTrue($stringman->string_exists('purgedefinitionsuccess', 'core_cache'));
$this->assertDebuggingNotCalled();
$this->assertEquals('Extend enrolment (common)', get_string('groupextendenrol', 'core'));
$this->assertDebuggingCalled('String [groupextendenrol,core] is deprecated. '.
$this->assertEquals('Successfully purged the requested definition.', get_string('purgedefinitionsuccess', 'core_cache'));
$this->assertDebuggingCalled('String [purgedefinitionsuccess,core_cache] 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');
}

4
mod/assign/submission/file/lang/en/assignsubmission_file.php
View File

@ -46,7 +46,3 @@ $string['pluginname'] = 'File submissions';
$string['privacy:metadata:filepurpose'] = 'The files loaded for this assignment submission';
$string['siteuploadlimit'] = 'Site upload limit';
$string['submissionfilearea'] = 'Uploaded submission files';
// Deprecated since Moodle 3.4.
$string['filesofthesetypes'] = 'Files of these types may be added to the submission:';
$string['filetypewithexts'] = '{$a->name} &mdash; {$a->extlist}';
$string['nonexistentfiletypes'] = 'The following file types were not recognised: {$a}';

3
mod/assign/submission/file/lang/en/deprecated.txt
View File

@ -1,3 +0,0 @@
filesofthesetypes,assignsubmission_file
filetypewithexts,assignsubmission_file
nonexistentfiletypes,assignsubmission_file

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

@ -1,2 +0,0 @@
err_unknownfileextension,mod_workshop
err_wrongfileextension,mod_workshop

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

@ -421,7 +421,3 @@ $string['workshop:viewreviewernames'] = 'View reviewer names';
$string['yourassessmentfor'] = 'Your assessment for {$a}';
$string['yourgrades'] = 'Your grades';
$string['yoursubmission'] = 'Your submission';
// Deprecated since Moodle 3.4.
$string['err_unknownfileextension'] = 'Unknown file extension: {$a}';
$string['err_wrongfileextension'] = 'Some files ({$a->wrongfiles}) cannot be uploaded. Only file types {$a->whitelist} are allowed.';