Permalink
Browse files

MDL-57293 lang/email: Improve emailvia string

* Strip the https? part of url for existing strings
* Switch the string to (via shortname)
  • Loading branch information...
danpoltawski committed Dec 13, 2016
1 parent 5100c48 commit d0e61e86552d11abc2760a0801d5c83edeed3305
Showing with 5 additions and 3 deletions.
  1. +1 −1 lang/en/moodle.php
  2. +4 −2 lib/moodlelib.php
View
@@ -705,7 +705,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['emailvia'] = '{$a->name} via {$a->url}';
$string['emailvia'] = '{$a->name} (via {$a->siteshortname})';
$string['emptydragdropregion'] = 'empty region';
$string['enable'] = 'Enable';
$string['encryptedcode'] = 'Encrypted code';
View
@@ -5796,7 +5796,8 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml = '',
$mail->From = $from->email;
$fromdetails = new stdClass();
$fromdetails->name = fullname($from);
$fromdetails->url = $CFG->wwwroot;
$fromdetails->url = preg_replace('#^https?://#', '', $CFG->wwwroot);
$fromdetails->siteshortname = format_string($SITE->shortname);
$fromstring = $fromdetails->name;
if ($CFG->emailfromvia == EMAIL_VIA_ALWAYS) {
$fromstring = get_string('emailvia', 'core', $fromdetails);
@@ -5809,7 +5810,8 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml = '',
$mail->From = $noreplyaddress;
$fromdetails = new stdClass();
$fromdetails->name = fullname($from);
$fromdetails->url = $CFG->wwwroot;
$fromdetails->url = preg_replace('#^https?://#', '', $CFG->wwwroot);
$fromdetails->siteshortname = format_string($SITE->shortname);
$fromstring = $fromdetails->name;
if ($CFG->emailfromvia != EMAIL_VIA_NEVER) {
$fromstring = get_string('emailvia', 'core', $fromdetails);

0 comments on commit d0e61e8

Please sign in to comment.