L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-52315-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2016-01-12 13:31:40 +00:00
parent 149ba5c227 5732322ee9
commit 07f4e11100
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/lang/en/deprecated.txt
+1
View File
@@ -1 +1,2 @@
subscribersto,mod_forum
postmailinfo,mod_forum
mod/forum/lang/en/forum.php
+5 -3
View File
@@ -390,9 +390,6 @@ $string['postbymailsuccess'] = 'Congratulations, your forum post with subject "{
$string['postbymailsuccess_html'] = 'Congratulations, your <a href="{$a->discussionurl}">forum post</a> with subject "{$a->subject}" was successfully posted.';
$string['postbyuser'] = '{$a->post} by {$a->user}';
$string['postincontext'] = 'See this post in context';
$string['postmailinfo'] = 'This is a copy of a message posted on the {$a} website.
To reply click on this link:';
$string['postmailinfolink'] = 'This is a copy of a message posted in {$a->coursename}.
To reply click on this link: {$a->replylink}';
@@ -529,3 +526,8 @@ $string['yourreply'] = 'Your reply';
// Deprecated since Moodle 3.0.
$string['subscribersto'] = 'Subscribers to "{$a->name}"';
// Deprecated since Moodle 3.1.
$string['postmailinfo'] = 'This is a copy of a message posted on the {$a} website.
To reply click on this link:';