Merge branch 'MDL-47875_master' of https://github.com/crazyserver/moodle

This commit is contained in:
Sam Hemelryk 2014-10-31 11:15:12 +13:00
commit 323ed3bbf0
2 changed files with 2 additions and 1 deletions

View 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';

View 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);