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

Merge branch 'MDL-41847-34' of git://github.com/sarjona/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2018-07-31 23:51:04 +02:00
parent 389a43143e 6e09d47fc5
commit 5aa54cc598
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+1 -1
View File
@@ -6127,7 +6127,7 @@ function setnew_password_and_mail($user, $fasthash = false) {
$a->sitename = format_string($site->fullname);
$a->username = $user->username;
$a->newpassword = $newpassword;
$a->link = $CFG->wwwroot .'/login/';
$a->link = $CFG->wwwroot .'/login/?lang='.$lang;
$a->signoff = generate_email_signoff();
$message = (string)new lang_string('newusernewpasswordtext', '', $a, $lang);
user/editlib.php
+6
View File
@@ -326,6 +326,12 @@ function useredit_shared_definition(&$mform, $editoroptions, $filemanageroptions
$mform->addElement('select', 'timezone', get_string('timezone'), $choices);
}
if ($user->id < 0) {
$mform->addElement('select', 'lang', get_string('preferredlanguage'), get_string_manager()->get_list_of_translations());
$lang = empty($user->lang) ? $CFG->lang : $user->lang;
$mform->setDefault('lang', $lang);
}
if (!empty($CFG->allowuserthemes)) {
$choices = array();
$choices[''] = get_string('default');
user/tests/behat/addnewuser.feature
+22
View File
@@ -0,0 +1,22 @@
@core @core_user
Feature: Create manually an user.
In order create a user properly
As an admin
I need to be able to add new users and edit their fields.
@javascript
Scenario: Change default language for a new user
Given I log in as "admin"
When I navigate to "Add a new user" node in "Site administration > Users > Accounts"
Then I should see "Preferred language"
@javascript
Scenario: Language not displayed when editing an existing user
Given the following "users" exist:
| username | firstname | lastname | email |
| student1 | Student | 1 | student1@example.com |
When I log in as "admin"
And I navigate to "Browse list of users" node in "Site administration > Users > Accounts"
And I follow "Student 1"
And I follow "Edit profile"
Then I should not see "Preferred language"