Permalink
Browse files

Merge branch 'MDL-42764_34' of git://github.com/markn86/moodle into M…

…OODLE_34_STABLE
  • Loading branch information...
dmonllao committed Feb 5, 2018
2 parents ab121de + 4c86ca6 commit 38f9a7b1c8e10eec5130ec009d2d94ff2d11ec78
Showing with 2 additions and 1 deletion.
  1. +1 −0 lang/en/moodle.php
  2. +1 −1 user/message.html
@@ -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';
@@ -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);

0 comments on commit 38f9a7b

Please sign in to comment.