Merge branch 'MDL-47875_master' of https://github.com/crazyserver/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 30 Oct 2014 22:15:12 +0000 (11:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 30 Oct 2014 22:15:12 +0000 (11:15 +1300)
mod/choice/lang/en/choice.php
mod/choice/mod_form.php

index cb92597..66524e1 100644 (file)
@@ -58,6 +58,7 @@ $string['choice:readresponses'] = 'Read responses';
 $string['choicesaved'] = 'Your choice has been saved';
 $string['choicetext'] = 'Choice text';
 $string['chooseaction'] = 'Choose an action ...';
+$string['description'] = 'Description';
 $string['limit'] = 'Limit';
 $string['limitno'] = 'Limit {no}';
 $string['limitanswers'] = 'Limit the number of responses allowed';
index a97c7eb..480daa5 100644 (file)
@@ -24,7 +24,7 @@ class mod_choice_mod_form extends moodleform_mod {
         $mform->addRule('name', null, 'required', null, 'client');
         $mform->addRule('name', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
 
-        $this->add_intro_editor(true, get_string('chatintro', 'chat'));
+        $this->add_intro_editor(true, get_string('description', 'choice'));
 
         $mform->addElement('select', 'display', get_string("displaymode","choice"), $CHOICE_DISPLAY);