MDL-54838 workshop: Differentiate labels for each comment field.

In a Workshop activity, comment fields on Assessment forms do not properly link to the corresponding Aspect.
So screen reader users may find it difficult to complete the Assessment forms.
There should be a hidden label text for each comment field.

mod/workshop/form/accumulative/assessment_form.php

@@ -75,14 +75,14 @@ class workshop_accumulative_assessment_form extends workshop_assessment_form {
             $mform->addElement('html', $desc);
 
             // grade for this aspect
-            $label = get_string('dimensiongrade', 'workshopform_accumulative');
+            $label = get_string('dimensiongradefor', 'workshopform_accumulative', $dimtitle);
             $options = make_grades_menu($fields->{'grade__idx_' . $i});
             $options = array('-1' => get_string('choosedots')) + $options;
             $mform->addElement('select', 'grade__idx_' . $i, $label, $options);
             $mform->addRule(array('grade__idx_' . $i, 'minusone') , get_string('mustchoosegrade', 'workshopform_accumulative'), 'compare', 'gt');
 
             // comment
-            $label = get_string('dimensioncomment', 'workshopform_accumulative');
+            $label = get_string('dimensioncommentfor', 'workshopform_accumulative', $dimtitle);
             //$mform->addElement('editor', 'peercomment__idx_' . $i, $label, null, array('maxfiles' => 0));
             $mform->addElement('textarea', 'peercomment__idx_' . $i, $label, array('cols' => 60, 'rows' => 5));
         }

mod/workshop/form/accumulative/lang/en/workshopform_accumulative.php

@@ -27,8 +27,10 @@ $string['absent'] = 'Absent';
 $string['addmoredimensions'] = 'Blanks for {$a} more aspects';
 $string['correct'] = 'Correct';
 $string['dimensioncomment'] = 'Comment';
+$string['dimensioncommentfor'] = 'Comment for {$a}';
 $string['dimensiondescription'] = 'Description';
 $string['dimensiongrade'] = 'Grade';
+$string['dimensiongradefor'] = 'Grade for {$a}';
 $string['dimensionmaxgrade'] = 'Best possible grade / Scale to use';
 $string['dimensionnumber'] = 'Aspect {$a}';
 $string['dimensionweight'] = 'Weight';

mod/workshop/form/comments/assessment_form.php

@@ -69,7 +69,7 @@ class workshop_comments_assessment_form extends workshop_assessment_form {
             $mform->addElement('html', $desc);
 
             // comment
-            $label = get_string('dimensioncomment', 'workshopform_comments');
+            $label = get_string('dimensioncommentfor', 'workshopform_comments', $dimtitle);
             //$mform->addElement('editor', 'peercomment__idx_' . $i, $label, null, array('maxfiles' => 0));
             $mform->addElement('textarea', 'peercomment__idx_' . $i, $label, array('cols' => 60, 'rows' => 10));
             $mform->addRule('peercomment__idx_' . $i, null, 'required', null, 'client');

mod/workshop/form/comments/lang/en/workshopform_comments.php

@@ -25,6 +25,7 @@
 
 $string['addmoredimensions'] = 'Blanks for {$a} more aspects';
 $string['dimensioncomment'] = 'Comment';
+$string['dimensioncommentfor'] = 'Comment for {$a}';
 $string['dimensiondescription'] = 'Description';
 $string['dimensionnumber'] = 'Aspect {$a}';
 $string['pluginname'] = 'Comments';

mod/workshop/form/numerrors/assessment_form.php

@@ -73,11 +73,11 @@ class workshop_numerrors_assessment_form extends workshop_assessment_form {
             $mform->addGroup(array(
                 $mform->createElement('radio', 'grade__idx_' . $i, '', $fields->{'grade0__idx_'.$i}, -1),
                 $mform->createElement('radio', 'grade__idx_' . $i, '', $fields->{'grade1__idx_'.$i}, 1),
-            ), 'group_grade__idx_' . $i, get_string('yourassessment', 'workshop'), '<br />', false);
+            ), 'group_grade__idx_' . $i, get_string('yourassessmentfor', 'workshop', $dimtitle), '<br />', false);
             $mform->addRule('group_grade__idx_' . $i, get_string('required'), 'required');
 
             // comment
-            $label = get_string('dimensioncomment', 'workshopform_numerrors');
+            $label = get_string('dimensioncommentfor', 'workshopform_numerrors', $dimtitle);
             $mform->addElement('textarea', 'peercomment__idx_' . $i, $label, array('cols' => 60, 'rows' => 5));
         }
         $this->set_data($current);

mod/workshop/form/numerrors/lang/en/workshopform_numerrors.php

@@ -27,6 +27,7 @@ $string['addmoredimensions'] = 'Blanks for {$a} more assertions';
 $string['configgrade0'] = 'The default word describing the negative assessment of an assertion.';
 $string['configgrade1'] = 'The default word describing the positive assessment of an assertion.';
 $string['dimensioncomment'] = 'Comment';
+$string['dimensioncommentfor'] = 'Comment for {$a}';
 $string['dimensiondescription'] = 'Description';
 $string['dimensiongrade'] = 'Grade';
 $string['dimensionnumber'] = 'Assertion {$a}';

mod/workshop/lang/en/workshop.php

@@ -334,5 +334,6 @@ $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['yourassessmentfor'] = 'Your assessment for {$a}';
 $string['yourgrades'] = 'Your grades';
 $string['yoursubmission'] = 'Your submission';