L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-47494 ddmarker: NOBUG improvement in wording of messages for the user

Browse Source
This commit is contained in:
Jamie Pratt
2012-03-31 18:13:22 +07:00
parent 864e786019
commit c3efffdb72
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/ddmarker/imagetargetconverter.php
+1 -1
View File
@@ -128,7 +128,7 @@ if (!$confirm) {
$cancelurl = new moodle_url($PAGE->url);
echo $OUTPUT->confirm(get_string('confirmimagetargetconversion', 'qtype_ddmarker'), $cofirmedurl, $cancelurl);
} else {
echo $contextlist->render('listitem', true, $top);
echo $contextlist->render('listitemlist', true, $top);
}
} else if (confirm_sesskey()) {
$questionlist->prepare_for_processing($top);
question/type/ddmarker/lang/en/qtype_ddmarker.php
+9 -5
View File
@@ -56,11 +56,15 @@ $string['formerror_unrecognisedwidthheightpart'] = 'We do not recognise the widt
$string['formerror_unrecognisedxypart'] = 'We do not recognise the x,y coordinates you have specified. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.';
$string['imagetargetconverter'] = 'Convert image target questions to drag and drop marker';
$string['infinite'] = 'Infinite';
$string['listitemactioncategory'] = 'Convert all imagetarget questions in category "{$a->name}" (contains {$a->qcount} imagetarget questions)';
$string['listitemactioncontext'] = 'Convert all imagetarget questions in context "{$a->name}" (contains {$a->qcount} imagetarget questions)';
$string['listitemcategory'] = 'Questions in category "{$a->name}" (contains {$a->qcount} imagetarget questions)';
$string['listitemcontext'] = 'Questions in context "{$a->name}" (contains {$a->qcount} imagetarget questions)';
$string['listitemquestion'] = 'Question "{$a->name}"';
$string['listitemactioncategory'] = 'About to convert all imagetarget questions in category "{$a->name}" (contains {$a->qcount} imagetarget questions)';
$string['listitemactioncontext'] = 'About to convert all imagetarget questions in context "{$a->name}" (contains {$a->qcount} imagetarget questions)';
$string['listitemactionquestion'] = 'About to convert question "{$a->name}"';
$string['listitemlistcategory'] = 'Select all imagetarget questions in category "{$a->name}" (contains {$a->qcount} imagetarget questions)';
$string['listitemlistcontext'] = 'Select all imagetarget questions in context "{$a->name}" (contains {$a->qcount} imagetarget questions)';
$string['listitemlistquestion'] = 'Select question "{$a->name}"';
$string['listitemprocessingcategory'] = 'Converting all imagetarget questions in category "{$a->name}" (contains {$a->qcount} imagetarget questions)';
$string['listitemprocessingcontext'] = 'Converting all imagetarget questions in context "{$a->name}" (contains {$a->qcount} imagetarget questions)';
$string['listitemprocessingquestion'] = 'Converted question "{$a->name}"';
$string['marker'] = 'Marker';
$string['marker_n'] = 'Marker {no}';
$string['markers'] = 'Markers';
question/type/ddmarker/questionlists.php
+2 -2
View File
@@ -61,7 +61,7 @@ abstract class qtype_ddmarker_list_item {
if (null === $progresstrace) {
$progresstrace = new html_list_progress_trace();
}
$progresstrace->output((string)$this, $depth);
$progresstrace->output($this->render('listitemprocessing', false), $depth);
$this->process_children($progresstrace, $depth);
}
@@ -143,7 +143,7 @@ class qtype_ddmarker_question_list_item extends qtype_ddmarker_list_item {
global $PAGE;
$a = new stdClass();
$a->name = $this->record->name;
$thisitem = get_string('listitemquestion', 'qtype_ddmarker', $a);
$thisitem = get_string($stringidentifier.'question', 'qtype_ddmarker', $a);
if ($link) {
$actionurl = new moodle_url($PAGE->url, array('questionid'=> $this->record->id));
$thisitem = html_writer::tag('a', $thisitem, array('href' => $actionurl));