Merge branch 'MDL-48772-28' of git://github.com/xow/moodle into MOODLE_28_STABLE

enrol/manual/lib.php

@@ -263,8 +263,10 @@ class enrol_manual_plugin extends enrol_plugin {
             'enrol',
             'enrolmentoptions',
             'enrolusers',
+            'enrolxusers',
             'errajaxfailedenrol',
             'errajaxsearch',
+            'foundxcohorts',
             'none',
             'usersearch',
             'unlimitedduration',

enrol/manual/yui/quickenrolment/quickenrolment.js

@@ -451,13 +451,13 @@ YUI.add('moodle-enrol_manual-quickenrolment', function(Y) {
                     .append(create('<div class="'+CSS.DETAILS+'"></div>')
                         .append(create('<div class="'+CSS.COHORTNAME+'">'+cohort.name+'</div>')))
                     .append(create('<div class="'+CSS.OPTIONS+'"></div>')
-                        .append(create('<input type="button" class="'+CSS.ENROL+'" value="'+'Enrol '+cohort.cnt+' users'+'" />'))) // TODO string
+                        .append(create('<input type="button" class="' + CSS.ENROL + '" value="' + M.util.get_string('enrolxusers', 'enrol', cohort.cnt) + '" />')))
                 );
             }
             this.set(UEP.COHORTCOUNT, count);
             if (!args.append) {
                 //var usersstr = (result.response.totalusers == '1')?M.str.enrol.ajaxoneuserfound:M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
-                var cohortsstr = 'Found '+result.response.totalcohorts+' cohorts'; // TODO
+                var cohortsstr = M.util.get_string('foundxcohorts', 'enrol', result.response.totalcohorts);
                 var content = create('<div class="'+CSS.SEARCHRESULTS+'"></div>')
                     .append(create('<div class="'+CSS.TOTALCOHORTS+'">'+cohortsstr+'</div>'))
                     .append(cohorts);

enrol/renderer.php

@@ -759,8 +759,10 @@ class course_enrolment_other_users_table extends course_enrolment_table {
                     'enrol',
                     'enrolmentoptions',
                     'enrolusers',
+                    'enrolxusers',
                     'errajaxfailedenrol',
                     'errajaxsearch',
+                    'foundxcohorts',
                     'none',
                     'usersearch',
                     'unlimitedduration',

lang/en/enrol.php

@@ -61,6 +61,7 @@ $string['enrolnotpermitted'] = 'You do not have permission or are not allowed to
 $string['enrolperiod'] = 'Enrolment duration';
 $string['enrolusage'] = 'Instances / enrolments';
 $string['enrolusers'] = 'Enrol users';
+$string['enrolxusers'] = 'Enrol {$a} users';
 $string['enroltimecreated'] = 'Enrolment created';
 $string['enroltimeend'] = 'Enrolment ends';
 $string['enroltimestart'] = 'Enrolment starts';
@@ -82,6 +83,7 @@ $string['expirynotifyhour'] = 'Hour to send enrolment expiry notifications';
 $string['expirythreshold'] = 'Notification threshold';
 $string['expirythreshold_help'] = 'How long before enrolment expiry should users be notified?';
 $string['finishenrollingusers'] = 'Finish enrolling users';
+$string['foundxcohorts'] = 'Found {$a} cohorts';
 $string['instanceeditselfwarning'] = 'Warning:';
 $string['instanceeditselfwarningtext'] = 'You are enrolled into this course through this enrolment method, changes may affect your access to this course.';
 $string['invalidenrolinstance'] = 'Invalid enrolment instance';