Skip to content

Commit

Permalink
Merge branch 'MDL-42764_master' of git://github.com/markn86/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
David Monllao committed Feb 5, 2018
2 parents ad1ba7f + b022950 commit 1cc7963
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions lang/en/moodle.php
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,7 @@
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';
Expand Down
2 changes: 1 addition & 1 deletion user/message.html
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 1cc7963

Please sign in to comment.