mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 08:22:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-50142_master' of https://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2015-10-07 12:19:13 +01:00
commit 4a06e40908
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lang/en/moodle.php
View File

@ -1826,6 +1826,11 @@ $string['teacheronly'] = 'for the {$a} only';
$string['teacherroles'] = '{$a} roles';
$string['teachers'] = 'Teachers';
$string['textediting'] = 'Text editor';
$string['textediting_help'] = 'If an HTML editor such as Atto or TinyMCE is selected, text input areas will have a toolbar with buttons for easily adding content.
If \'plain text area\' is selected, a format for text input areas such as HTML or Markdown can be chosen.
The list of available text editors is determined by the site administrator.';
$string['texteditor'] = 'Use standard web forms';
$string['textformat'] = 'Plain text format';
$string['thanks'] = 'Thanks';

1
user/editor_form.php
View File

@ -55,6 +55,7 @@ class user_edit_editor_form extends moodleform {
$choices[$editor] = get_string('pluginname', 'editor_' . $editor);
}
$mform->addElement('select', 'preference_htmleditor', get_string('textediting'), $choices);
$mform->addHelpButton('preference_htmleditor', 'textediting');
$mform->setDefault('preference_htmleditor', '');
} else {
// Empty string means use the first chosen text editor.