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

Merge branch 'MDL-42764_master' of git://github.com/markn86/moodle

Browse Source
This commit is contained in:
David Monllao 2018-02-05 11:18:34 +01:00
commit 1cc79637c7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en/moodle.php
View File

@ -710,6 +710,7 @@ $string['emailresetconfirmsent'] = 'An email has been sent to your address at <b
If you continue to have difficulty, contact the site administrator.';
$string['emailtoprivatefiles'] = 'You can also e-mail files as attachments straight to your private files space. Simply attach your files to an e-mail and send it to {$a}';
$string['emailtoprivatefilesdenied'] = 'Your administrator has disabled the option to upload your own private files.';
$string['emailuserhasnone'] = 'There is no email address for the user.';
$string['emailvia'] = '{$a->name} (via {$a->siteshortname})';
$string['emptydragdropregion'] = 'empty region';
$string['enable'] = 'Enable';

2
user/message.html
View File

@ -42,7 +42,7 @@
echo '<td>'.$user->email.'</td><td>';
}
if (empty($user->email)) {
$error = get_string('emailempty');
$error = get_string('emailuserhasnone');
}
if (!empty($error)) {
echo $OUTPUT->pix_icon('t/emailno', $error);