mirror of
https://github.com/moodle/moodle.git
synced 2025-08-07 18:06:51 +02:00
Merge branch 'MDL-27196-hardcodedstrings' of git://github.com/mudrd8mz/moodle
This commit is contained in:
commit
aad4048bd7
4 changed files with 12 additions and 6 deletions
|
@ -44,5 +44,10 @@ $string['numperauthor'] = 'per submission';
|
|||
$string['numperreviewer'] = 'per reviewer';
|
||||
$string['pluginname'] = 'Random allocation';
|
||||
$string['randomallocationdone'] = 'Random allocation done';
|
||||
$string['resultnomorepeers'] = 'No more peers available';
|
||||
$string['resultnomorepeersingroup'] = 'No more peers available in this separate group';
|
||||
$string['resultnotenoughpeers'] = 'Not enough peers available';
|
||||
$string['resultnumperauthor'] = 'Trying to allocate {$a} review(s) per author';
|
||||
$string['resultnumperreviewer'] = 'Trying to allocate {$a} review(s) per reviewer';
|
||||
$string['removecurrentallocations'] = 'Remove current allocations';
|
||||
$string['stats'] = 'Current allocation statistics';
|
||||
|
|
|
@ -449,14 +449,14 @@ class workshop_random_allocator implements workshop_allocator {
|
|||
|
||||
if (self::USERTYPE_AUTHOR == $numper) {
|
||||
// circles are authors, squares are reviewers
|
||||
$o[] = 'info::Trying to allocate ' . $numofreviews . ' review(s) per author'; // todo translate
|
||||
$o[] = 'info::'.get_string('resultnumperauthor', 'workshopallocation_random', $numofreviews);
|
||||
$allcircles = $authors;
|
||||
$allsquares = $reviewers;
|
||||
// get current workload
|
||||
list($circlelinks, $squarelinks) = $this->convert_assessments_to_links($assessments);
|
||||
} elseif (self::USERTYPE_REVIEWER == $numper) {
|
||||
// circles are reviewers, squares are authors
|
||||
$o[] = 'info::trying to allocate ' . $numofreviews . ' review(s) per reviewer'; // todo translate
|
||||
$o[] = 'info::'.get_string('resultnumperreviewer', 'workshopallocation_random', $numofreviews);
|
||||
$allcircles = $reviewers;
|
||||
$allsquares = $authors;
|
||||
// get current workload
|
||||
|
@ -536,14 +536,14 @@ class workshop_random_allocator implements workshop_allocator {
|
|||
if (NOGROUPS == $gmode) {
|
||||
if (in_array(0, $failedgroups)) {
|
||||
$keeptrying = false;
|
||||
$o[] = 'error::indent::No more peers available'; // todo translate
|
||||
$o[] = 'error::indent::'.get_string('resultnomorepeers', 'workshopallocation_random');
|
||||
break;
|
||||
}
|
||||
$targetgroup = 0;
|
||||
} elseif (SEPARATEGROUPS == $gmode) {
|
||||
if (in_array($circlegroupid, $failedgroups)) {
|
||||
$keeptrying = false;
|
||||
$o[] = 'error::indent::No more peers available in this separate group'; // todo translate
|
||||
$o[] = 'error::indent::'.get_string('resultnomorepeersingroup', 'workshopallocation_random');
|
||||
break;
|
||||
}
|
||||
$targetgroup = $circlegroupid;
|
||||
|
@ -564,7 +564,7 @@ class workshop_random_allocator implements workshop_allocator {
|
|||
}
|
||||
if ($targetgroup === false) {
|
||||
$keeptrying = false;
|
||||
$o[] = 'error::indent::Not enough peers available'; // todo translate
|
||||
$o[] = 'error::indent::'.get_string('resultnotenoughpeers', 'workshopallocation_random');
|
||||
break;
|
||||
}
|
||||
$o[] = 'debug::indent::next square should be from group id ' . $targetgroup;
|
||||
|
|
|
@ -71,7 +71,7 @@ class workshop_numerrors_assessment_form extends workshop_assessment_form {
|
|||
|
||||
// evaluation of the assertion
|
||||
$label = get_string('dimensiongrade', 'workshopform_numerrors');
|
||||
$mform->addElement('radio', 'grade__idx_' . $i, 'Your assessment', $fields->{'grade0__idx_'.$i}, 0); // todo localize
|
||||
$mform->addElement('radio', 'grade__idx_' . $i, get_string('yourassessment', 'workshop'), $fields->{'grade0__idx_'.$i}, 0);
|
||||
$mform->addElement('radio', 'grade__idx_' . $i, '', $fields->{'grade1__idx_'.$i}, 1);
|
||||
$mform->setDefault('grade__idx_' . $i, 0);
|
||||
|
||||
|
|
|
@ -266,4 +266,5 @@ $string['workshop:viewauthornames'] = 'View author names';
|
|||
$string['workshop:viewauthorpublished'] = 'View authors of published submissions';
|
||||
$string['workshop:viewpublishedsubmissions'] = 'View published submissions';
|
||||
$string['workshop:viewreviewernames'] = 'View reviewer names';
|
||||
$string['yourassessment'] = 'Your assessment';
|
||||
$string['yoursubmission'] = 'Your submission';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue