L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-65987-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2020-01-13 18:28:35 +01:00
parent c8ba91cb12 4870144cb2
commit 41fed86e18
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en/moodle.php
+1
View File
@@ -1842,6 +1842,7 @@ $string['shortnameuser'] = 'User short name';
$string['shortsitename'] = 'Short name for site (eg single word)';
$string['show'] = 'Show';
$string['showactions'] = 'Show actions';
$string['showadvancededitor'] = 'Advanced';
$string['showadvancedsettings'] = 'Show advanced settings';
$string['showall'] = 'Show all {$a}';
$string['showallcourses'] = 'Show all courses';
mod/forum/classes/post_form.php
+1 -1
View File
@@ -291,7 +291,7 @@ class mod_forum_post_form extends moodleform {
// Additional attribs to handle collapsible div.
['data-toggle' => 'collapse', 'data-target' => "#collapseAddForm"]);
$buttonarray[] = &$mform->createElement('submit', 'advancedadddiscussion',
get_string('advanced'), null, null, ['customclassoverride' => 'btn-link']);
get_string('showadvancededitor'), null, null, ['customclassoverride' => 'btn-link']);
$mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
$mform->closeHeaderBefore('buttonar');
mod/forum/tests/behat/behat_mod_forum.php
+1 -1
View File
@@ -435,7 +435,7 @@ class behat_mod_forum extends behat_base {
// Navigate to forum.
$this->execute('behat_general::click_link', $this->escape($forumname));
$this->execute('behat_general::click_link', $buttonstr);
$this->execute('behat_forms::press_button', get_string('advanced'));
$this->execute('behat_forms::press_button', get_string('showadvancededitor'));
$this->fill_new_discussion_form($table);
}