Skip to content

Commit 38f9a7b

Browse files
author
David Monllao
committed
Merge branch 'MDL-42764_34' of git://github.com/markn86/moodle into MOODLE_34_STABLE
2 parents ab121de + 4c86ca6 commit 38f9a7b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

lang/en/moodle.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,7 @@
710710
If you continue to have difficulty, contact the site administrator.';
711711
$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}';
712712
$string['emailtoprivatefilesdenied'] = 'Your administrator has disabled the option to upload your own private files.';
713+
$string['emailuserhasnone'] = 'There is no email address for the user.';
713714
$string['emailvia'] = '{$a->name} (via {$a->siteshortname})';
714715
$string['emptydragdropregion'] = 'empty region';
715716
$string['enable'] = 'Enable';

user/message.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
echo '<td>'.$user->email.'</td><td>';
4343
}
4444
if (empty($user->email)) {
45-
$error = get_string('emailempty');
45+
$error = get_string('emailuserhasnone');
4646
}
4747
if (!empty($error)) {
4848
echo $OUTPUT->pix_icon('t/emailno', $error);

0 commit comments

Comments
 (0)