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

Merge branch 'MDL-67532-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2020-02-11 23:08:07 +01:00
parent 95ecaf2d1e 103c623b83
commit 5df69d28ad
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
badges/classes/form/badge.php
+12 -2
View File
@@ -49,7 +49,6 @@ class badge extends moodleform {
$mform = $this->_form;
$badge = (isset($this->_customdata['badge'])) ? $this->_customdata['badge'] : false;
$action = $this->_customdata['action'];
$languages = get_string_manager()->get_list_of_languages();
$mform->addElement('header', 'badgedetails', get_string('badgedetails', 'badges'));
$mform->addElement('text', 'name', get_string('name'), array('size' => '70'));
@@ -61,6 +60,8 @@ class badge extends moodleform {
$mform->addElement('text', 'version', get_string('version', 'badges'), array('size' => '70'));
$mform->setType('version', PARAM_TEXT);
$mform->addHelpButton('version', 'version', 'badges');
$languages = get_string_manager()->get_list_of_languages();
$mform->addElement('select', 'language', get_string('language'), $languages);
$mform->addHelpButton('language', 'language', 'badges');
@@ -157,7 +158,16 @@ class badge extends moodleform {
$mform->setType('action', PARAM_TEXT);
if ($action == 'new') {
$mform->setDefault('language', $CFG->lang);
// Try to set default badge language to that of current language, or it's parent.
$language = current_language();
if (isset($languages[$language])) {
$defaultlanguage = $language;
} else {
// Calling get_parent_language returns an empty string instead of 'en'.
$defaultlanguage = get_parent_language($language) ?: 'en';
}
$mform->setDefault('language', $defaultlanguage);
$this->add_action_buttons(true, get_string('createbutton', 'badges'));
} else {
// Add hidden fields.