Merge branch 'MDL-69855-master' of git://github.com/junpataleta/moodle

mod/forum/lang/en/deprecated.txt

@@ -2,3 +2,4 @@ cannotdeletediscussioninsinglediscussion,mod_forum
 inpagereplysubject,mod_forum
 overviewnumpostssince,mod_forum
 overviewnumunread,mod_forum
+postmailinfolink,mod_forum

mod/forum/lang/en/forum.php

@@ -514,10 +514,9 @@ $string['postbymailsuccess'] = 'Your reply "{$a->subject}" was successfully post
 $string['postbymailsuccess_html'] = 'Your reply <a href="{$a->discussionurl}">{$a->subject}</a> was successfully posted.';
 $string['postbyuser'] = '{$a->post} by {$a->user}';
 $string['postincontext'] = 'See this post in context';
-$string['postmailinfolink'] = 'This is a copy of a message posted in {$a->coursename}.
-
-To reply click on this link: {$a->replylink}';
+$string['postmailinfo'] = 'This is a copy of a message posted in {$a}.';
 $string['postmailnow'] = '<p>This post will be mailed out immediately to all forum subscribers.</p>';
+$string['postmailreply'] = 'To reply click on this link: {$a}';
 $string['postmailsubject'] = '{$a->courseshortname}: {$a->subject}';
 $string['postrating1'] = 'Mostly separate knowing';
 $string['postrating2'] = 'Separate and connected';
@@ -777,6 +776,11 @@ $string['showmoreusers'] = 'Show more users';
 $string['viewconversation'] = 'View discussion';
 $string['viewgrades'] = 'View grades';
 
+// Deprecated since Moodle 4.0.
+$string['postmailinfolink'] = 'This is a copy of a message posted in {$a->coursename}.
+
+To reply click on this link: {$a->replylink}';
+
 // Deprecated since Moodle 3.8.
 $string['cannotdeletediscussioninsinglediscussion'] = 'You cannot delete the first post in a single discussion';
 $string['inpagereplysubject'] = 'Re: {$a}';

mod/forum/templates/forum_post_email_htmlemail_body.mustache

@@ -123,13 +123,17 @@
                         {{# str }} parent, forum {{/ str }}
                     </a>
                     {{# canreply }}
+                        {{^ isprivatereply }}
                         |
+                        {{/ isprivatereply }}
                     {{/ canreply }}
                 {{/ firstpost }}
                 {{# canreply }}
+                    {{^ isprivatereply }}
                     <a target="_blank" href="{{{ replylink }}}">
                         {{# str }} reply, forum {{/ str }}
                     </a>
+                    {{/ isprivatereply }}
                 {{/ canreply }}
             </div>
 

mod/forum/templates/forum_post_email_textemail.mustache

@@ -58,11 +58,12 @@
 
 {{{ attachments }}}
 ---------------------------------------------------------------------
+{{# str }} postmailinfo, forum, {{{ coursename }}} {{/ str }}
+
 {{# canreply }}
-{{# str }} postmailinfolink, forum, {
-        "coursename": {{# quote }}{{{ coursename }}}{{/ quote }},
-        "replylink": {{# quote }}{{ replylink }}{{/ quote }}
-    } {{/ str }}
+    {{^ isprivatereply }}
+        {{# str }} postmailreply, forum, {{{ replylink }}} {{/ str }}
+    {{/ isprivatereply }}
 {{/ canreply }}
 {{# unsubscribeforumlink }}
 {{# str }} unsubscribelink, forum, {{{ unsubscribeforumlink }}} {{/ str }}