moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +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

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