From d141109dc28dc478e272ef5ad6507d6e5f18d7d4 Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Fri, 28 Nov 2014 15:31:10 +0530 Subject: [PATCH] MDL-48227 forum: Update the message shown in emails AMOS BEGIN CPY [deleteoriginalonreply,mod_forum],[replytopostbyemail,mod_forum] AMOS END --- mod/forum/lang/en/forum.php | 1 + mod/forum/lib.php | 12 ++---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index 38770ae9405..36d7496bced 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -409,6 +409,7 @@ $string['repliesone'] = '{$a} reply so far'; $string['reply'] = 'Reply'; $string['replyforum'] = 'Reply to forum'; $string['replytoforumpost'] = 'You can reply to this forum post by email.'; +$string['replytopostbyemail'] = 'If you reply to this via email, don\'t include a quoted copy of this post. '; $string['replytouser'] = 'Use email address in reply'; $string['reply_handler'] = 'Reply to forum posts via email'; $string['reply_handler_name'] = 'Reply to forum posts'; diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 36d24e6bb6d..e544de62fcb 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -1186,10 +1186,6 @@ function forum_make_mail_text($course, $cm, $forum, $discussion, $post, $userfro $posttext = ''; - if ($replyaddress) { - $posttext .= "--" . get_string('deleteoriginalonreply', 'mod_forum') . "--\n"; - } - if (!$bare) { $shortname = format_string($course->shortname, true, array('context' => context_course::instance($course->id))); $posttext .= "$shortname -> $strforums -> ".format_string($forum->name,true); @@ -1241,7 +1237,7 @@ function forum_make_mail_text($course, $cm, $forum, $discussion, $post, $userfro $posttext .= ": {$CFG->wwwroot}/mod/forum/index.php?id={$forum->course}\n"; if ($replyaddress) { - $posttext .= "\n\n" . get_string('replytoforumpost', 'mod_forum'); + $posttext .= "\n\n" . get_string('replytopostbyemail', 'mod_forum'); } return $posttext; @@ -1286,10 +1282,6 @@ function forum_make_mail_html($course, $cm, $forum, $discussion, $post, $userfro $posthtml .= ''; $posthtml .= "\n\n\n"; - if ($replyaddress) { - $posthtml .= "

--" . get_string('deleteoriginalonreply', 'mod_forum') . "--

"; - } - $posthtml .= '
'. ''.$shortname.' » '. ''.$strforums.' » '. @@ -1303,7 +1295,7 @@ function forum_make_mail_html($course, $cm, $forum, $discussion, $post, $userfro $posthtml .= forum_make_mail_post($course, $cm, $forum, $discussion, $post, $userfrom, $userto, false, $canreply, true, false); if ($replyaddress) { - $posthtml .= html_writer::tag('p', get_string('replytoforumpost', 'mod_forum')); + $posthtml .= html_writer::tag('p', get_string('replytopostbyemail', 'mod_forum')); } $footerlinks = array();