moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 19:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-38005-master' of git://github.com/FMCorz/moodle

Browse source
This commit is contained in:
Damyon Wiese 2013-03-18 13:45:41 +08:00
commit 7c211f565a
17 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mod/assign/feedback/file/batchuploadfilesform.php
View file

@ -44,7 +44,8 @@ class assignfeedback_file_batch_upload_files_form extends moodleform {
$mform = $this->_form;
$params = $this->_customdata;
$mform->addElement('header', '', get_string('batchuploadfilesforusers', 'assignfeedback_file', count($params['users'])));
$mform->addElement('header', 'batchuploadfilesforusers', get_string('batchuploadfilesforusers', 'assignfeedback_file',
count($params['users'])));
$mform->addElement('static', 'userslist', get_string('selectedusers', 'assignfeedback_file'), $params['usershtml']);
$data = new stdClass();

2
mod/assign/feedback/file/uploadzipform.php
View file

@ -43,7 +43,7 @@ class assignfeedback_file_upload_zip_form extends moodleform {
$mform = $this->_form;
$params = $this->_customdata;
$mform->addElement('header', '', get_string('uploadzip', 'assignfeedback_file'));
$mform->addElement('header', 'uploadzip', get_string('uploadzip', 'assignfeedback_file'));
$fileoptions = array('subdirs'=>0,
'maxbytes'=>$COURSE->maxbytes,

2
mod/assign/feedback/offline/uploadgradesform.php
View file

@ -43,7 +43,7 @@ class assignfeedback_offline_upload_grades_form extends moodleform {
$mform = $this->_form;
$params = $this->_customdata;
$mform->addElement('header', '', get_string('uploadgrades', 'assignfeedback_offline'));
$mform->addElement('header', 'uploadgrades', get_string('uploadgrades', 'assignfeedback_offline'));
$fileoptions = array('subdirs'=>0,
'maxbytes'=>$COURSE->maxbytes,

4
mod/feedback/edit_form.php
View file

@ -83,7 +83,7 @@ class feedback_edit_use_template_form extends moodleform {
$elementgroup = array();
//headline
$mform->addElement('header', '', get_string('using_templates', 'feedback'));
$mform->addElement('header', 'using_templates', get_string('using_templates', 'feedback'));
// hidden elements
$mform->addElement('hidden', 'id');
$mform->setType('id', PARAM_INT);
@ -164,7 +164,7 @@ class feedback_edit_create_template_form extends moodleform {
$mform->setType('savetemplate', PARAM_INT);
//headline
$mform->addElement('header', '', get_string('creating_templates', 'feedback'));
$mform->addElement('header', 'creating_templates', get_string('creating_templates', 'feedback'));
// visible elements
$elementgroup = array();

4
mod/forum/mod_form.php
View file

@ -88,7 +88,7 @@ class mod_forum_mod_form extends moodleform_mod {
if ($CFG->enablerssfeeds && isset($CFG->forum_enablerssfeeds) && $CFG->forum_enablerssfeeds) {
//-------------------------------------------------------------------------------
$mform->addElement('header', '', get_string('rss'));
$mform->addElement('header', 'rssheader', get_string('rss'));
$choices = array();
$choices[0] = get_string('none');
$choices[1] = get_string('discussions', 'forum');
@ -116,7 +116,7 @@ class mod_forum_mod_form extends moodleform_mod {
}
//-------------------------------------------------------------------------------
$mform->addElement('header', '', get_string('blockafter', 'forum'));
$mform->addElement('header', 'blockafterheader', get_string('blockafter', 'forum'));
$options = array();
$options[0] = get_string('blockperioddisabled','forum');
$options[60*60*24] = '1 '.get_string('day');

2
mod/forum/post_form.php
View file

@ -119,7 +119,7 @@ class mod_forum_post_form extends moodleform {
}
if (!empty($CFG->forum_enabletimedposts) && !$post->parent && has_capability('mod/forum:viewhiddentimedposts', $coursecontext)) { // hack alert
$mform->addElement('header', '', get_string('displayperiod', 'forum'));
$mform->addElement('header', 'displayperiod', get_string('displayperiod', 'forum'));
$mform->addElement('date_selector', 'timestart', get_string('displaystart', 'forum'), array('optional'=>true));
$mform->addHelpButton('timestart', 'displaystart', 'forum');

2
mod/glossary/mod_form.php
View file

@ -103,7 +103,7 @@ class mod_glossary_mod_form extends moodleform_mod {
if ($CFG->enablerssfeeds && isset($CFG->glossary_enablerssfeeds) && $CFG->glossary_enablerssfeeds) {
//-------------------------------------------------------------------------------
$mform->addElement('header', '', get_string('rss'));
$mform->addElement('header', 'rssheader', get_string('rss'));
$choices = array();
$choices[0] = get_string('none');
$choices[1] = get_string('withauthor', 'glossary');