moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2021-09-08 23:23:20 +02:00
commit 633c2fcc5d
4 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mod/forum/lang/en/deprecated.txt
View file

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

10
mod/forum/lang/en/forum.php
View file

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

4
mod/forum/templates/forum_post_email_htmlemail_body.mustache
View file

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

9
mod/forum/templates/forum_post_email_textemail.mustache
View file

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