Skip to content
Permalink
Browse files

Merge branch 'MDL-54742-master' of git://github.com/mihailges/moodle

  • Loading branch information...
andrewnicols committed Jul 23, 2018
2 parents 653c307 + 10bd37f commit a6034c9611514418d39983ac6520504f581794dd
@@ -46,6 +46,3 @@
$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.2.
$string['display_un'] = 'Display name';
@@ -1 +0,0 @@
display_un,block_myprofile
@@ -1301,8 +1301,7 @@
$string['cachesessionhelp'] = 'User specific cache that expires when the user\'s session ends. Designed to alleviate session bloat/strain.';
$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.2.
$string['mobile'] = 'Mobile';
// Deprecated since Moodle 3.3.
$string['loginpasswordautocomplete'] = 'Prevent password autocompletion on login form';
$string['loginpasswordautocomplete_help'] = 'If enabled, users are not allowed to save their account password in their browser.';
@@ -266,9 +266,6 @@
$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.2.
$string['for'] = 'for';
// Deprecated since Moodle 3.4.
$string['quickdownloadcalendar'] = 'Quick download / subscribe to calendar';
$string['ical'] = 'iCal';
@@ -200,6 +200,3 @@
$string['usercompetencystatus_inreview'] = 'In review';
$string['usercompetencystatus_waitingforreview'] = 'Waiting for review';
$string['userplans'] = 'Learning plans';
// Deprecated since Moodle 3.2.
$string['invalidpersistent'] = 'Invalid persistent';
@@ -5,34 +5,7 @@ myfilesmanage,core
mypreferences,core_grades
myprofile,core
viewallmyentries,core_blog
modchooserenable,core
modchooserdisable,core
invalidpersistent,core_competency
revealpassword,core_form
mediasettings,core_media
legacyheading,core_media
legacyheading_desc,core_media
mobile,core_admin
for,core_calendar
context,core_message
discussion,core_message
emptysearchstring,core_message
formorethan,core_message
keywords,core_message
messagehistory,core_message
newsearch,core_message
nosearchresults,core_message
onlymycourses,core_message
pagerefreshes,core_message
page-message-x,core_message
recent,core_message
savemysettings,core_message
search,core_message
settingssaved,core_message
strftimedaydatetime,core_message
timenosee,core_message
timesent,core_message
userssearchresults,core_message
loginpasswordautocomplete,core_admin
loginpasswordautocomplete_help,core_admin
deletecomment,core
@@ -36,8 +36,3 @@
$string['privacy:metadata'] = 'Media embedding does not store any personal data.';
$string['supports'] = 'Supports';
$string['videoextensions'] = 'Video: {$a}';
// Deprecated since Moodle 3.2.
$string['mediasettings'] = 'Media embedding';
$string['legacyheading'] = 'Legacy media players';
$string['legacyheading_desc'] = 'These players are not frequently used on the Web and require browser plugins that are less widely installed.';
@@ -76,7 +76,6 @@
$string['newonlymsg'] = 'Show only new';
$string['newmessage'] = 'New message';
$string['newmessagesearch'] = 'Select or search for a contact to send a new message.';
$string['newsearch'] = 'New search';
$string['noframesjs'] = 'Use more accessible interface';
$string['nocontacts'] = 'No contacts';
$string['nomessages'] = 'No messages';
@@ -180,24 +179,3 @@
$string['viewunreadmessageswith'] = 'View unread messages with {$a}';
$string['writeamessage'] = 'Write a message...';
$string['you'] = 'You:';
// Deprecated since Moodle 3.2.
$string['context'] = 'context';
$string['discussion'] = 'Discussion';
$string['emptysearchstring'] = 'You must search for something';
$string['formorethan'] = 'For more than';
$string['keywords'] = 'Keywords';
$string['messagehistory'] = 'Message history';
$string['newsearch'] = 'New search';
$string['nosearchresults'] = 'There were no results from your search';
$string['onlymycourses'] = 'Only in my courses';
$string['pagerefreshes'] = 'This page refreshes automatically every {$a} seconds';
$string['page-message-x'] = 'Any message pages';
$string['recent'] = 'Recent';
$string['savemysettings'] = 'Save my settings';
$string['search'] = 'Search';
$string['settingssaved'] = 'Your settings have been saved';
$string['strftimedaydatetime'] = '%A, %d %B %Y, %I:%M %p';
$string['timenosee'] = 'Minutes since I was last seen online';
$string['timesent'] = 'Time sent';
$string['userssearchresults'] = 'Users found: {$a}';
@@ -2205,10 +2205,6 @@
$string['zippingbackup'] = 'Zipping backup';
$string['deprecatedeventname'] = '{$a} (no longer in use)';
// Deprecated since Moodle 3.2.
$string['modchooserenable'] = 'Activity chooser on';
$string['modchooserdisable'] = 'Activity chooser off';
// Deprecated since Moodle 3.3.
$string['deletecomment'] = 'Delete this comment';
$string['sectionusedefaultname'] = 'Use default section name';
@@ -75,11 +75,11 @@ public function test_deprecated_strings() {
$this->assertFalse($stringman->string_deprecated('hidden', 'grades'));
// Check deprecated string.
$this->assertTrue($stringman->string_deprecated('modchooserenable', 'core'));
$this->assertTrue($stringman->string_exists('modchooserenable', 'core'));
$this->assertTrue($stringman->string_deprecated('groupextendenrol', 'core'));
$this->assertTrue($stringman->string_exists('groupextendenrol', 'core'));
$this->assertDebuggingNotCalled();
$this->assertEquals('Activity chooser on', get_string('modchooserenable', 'core'));
$this->assertDebuggingCalled('String [modchooserenable,core] is deprecated. '.
$this->assertEquals('Extend enrolment (common)', get_string('groupextendenrol', 'core'));
$this->assertDebuggingCalled('String [groupextendenrol,core] 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');
}
@@ -585,6 +585,3 @@
$string['viewrevealidentitiesconfirm'] = 'View reveal student identities confirmation page.';
$string['workflowfilter'] = 'Workflow filter';
$string['xofy'] = '{$a->x} of {$a->y}';
// Deprecated since Moodle 3.2.
$string['changegradewarning'] = 'This assignment has graded submissions and changing the grade will not automatically re-calculate existing submission grades. You must re-grade all existing submissions, if you wish to change the grade.';
@@ -1 +0,0 @@
changegradewarning,mod_assign
@@ -400,17 +400,3 @@
$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.2.
$string['namedate'] = 'Date field';
$string['namefile'] = 'File field';
$string['namecheckbox'] = 'Checkbox field';
$string['namelatlong'] = 'Latitude/longitude field';
$string['namemenu'] = 'Menu field';
$string['namemultimenu'] = 'Multiple-selection menu field';
$string['namenumber'] = 'Number field';
$string['namepicture'] = 'Picture field';
$string['nameradiobutton'] = 'Radio button field';
$string['nametext'] = 'Text field';
$string['nametextarea'] = 'Textarea field';
$string['nameurl'] = 'URL field';
@@ -1,12 +0,0 @@
namedate,mod_data
namefile,mod_data
namecheckbox,mod_data
namelatlong,mod_data
namemenu,mod_data
namemultimenu,mod_data
namenumber,mod_data
namepicture,mod_data
nameradiobutton,mod_data
nametext,mod_data
nametextarea,mod_data
nameurl,mod_data
@@ -1,2 +0,0 @@
start,mod_feedback
stop,mod_feedback
@@ -284,6 +284,3 @@
$string['use_this_template'] = 'Use this template';
$string['using_templates'] = 'Use a template';
$string['vertical'] = 'Vertical';
// Deprecated since Moodle 3.2.
$string['start'] = 'Start';
$string['stop'] = 'End';

0 comments on commit a6034c9

Please sign in to comment.
You can’t perform that action at this time.