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

admin/tool/generator/classes/course_backend.php

@@ -374,8 +374,9 @@ class tool_generator_course_backend extends tool_generator_backend {
     private function create_user_accounts($first, $last) {
         global $CFG;
 
-        $this->log('createaccounts', (object)array('from' => $first, 'to' => $last), true);
         $count = $last - $first + 1;
+        $this->log('createusers', $count, true);
+
         $done = 0;
         for ($number = $first; $number <= $last; $number++, $done++) {
             // Work out username with 6-digit number.

admin/tool/generator/lang/en/deprecated.txt

@@ -0,0 +1 @@
+progress_createaccounts,tool_generator

admin/tool/generator/lang/en/tool_generator.php

@@ -71,13 +71,13 @@ $string['notenoughusers'] = 'The selected course does not have enough users';
 $string['pluginname'] = 'Development data generator';
 $string['progress_checkaccounts'] = 'Checking user accounts ({$a})';
 $string['progress_coursecompleted'] = 'Course completed ({$a}s)';
-$string['progress_createaccounts'] = 'Creating user accounts ({$a->from} - {$a->to})';
 $string['progress_createassignments'] = 'Creating assignments ({$a})';
 $string['progress_createbigfiles'] = 'Creating big files ({$a})';
 $string['progress_createcourse'] = 'Creating course {$a}';
 $string['progress_createforum'] = 'Creating forum ({$a} posts)';
 $string['progress_createpages'] = 'Creating pages ({$a})';
 $string['progress_createsmallfiles'] = 'Creating small files ({$a})';
+$string['progress_createusers'] = 'Creating user accounts ({$a})';
 $string['progress_enrol'] = 'Enrolling users into course ({$a})';
 $string['progress_sitecompleted'] = 'Site completed ({$a}s)';
 $string['shortsize_0'] = 'XS';
@@ -137,3 +137,6 @@ $string['testplansize_5'] = 'XXL ({$a->users} users, {$a->loops} loops and {$a->
 $string['updateuserspassword'] = 'Update course users password';
 $string['updateuserspassword_help'] = 'JMeter needs to login as the course users, you can set the users password using $CFG->tool_generator_users_password in config.php; this setting updates the course user\'s password according to $CFG->tool_generator_users_password. It can be useful in case you are using a course not generated by tool_generator or $CFG->tool_generator_users_password was not set when you created the test courses.';
 $string['privacy:metadata'] = 'The Development data generator plugin does not store any personal data.';
+
+// Deprecated since Moodle 4.5.
+$string['progress_createaccounts'] = 'Creating user accounts ({$a->from} - {$a->to})';