moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-51214 mod_forum: Update News forum => Announcements

Browse source
This commit is contained in:
Andrew Nicols 2016-02-09 14:45:30 +08:00
parent 2f45a11ac4
commit 265a9bf769
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
blocks/news_items/tests/behat/display_news.feature
View file

@ -18,13 +18,13 @@ Feature: Latest news block displays the course latest news
And I log out And I log out
And I log in as "teacher1" And I log in as "teacher1"
And I follow "Course 1" And I follow "Course 1"
When I add a new topic to "News forum" forum with: When I add a new topic to "Announcements" forum with:
| Subject | Discussion One | | Subject | Discussion One |
| Message | Not important | | Message | Not important |
And I add a new topic to "News forum" forum with: And I add a new topic to "Announcements" forum with:
| Subject | Discussion Two | | Subject | Discussion Two |
| Message | Not important | | Message | Not important |
And I add a new topic to "News forum" forum with: And I add a new topic to "Announcements" forum with:
| Subject | Discussion Three | | Subject | Discussion Three |
| Message | Not important | | Message | Not important |
And I follow "Course 1" And I follow "Course 1"

2
course/format/singleactivity/lang/en/format_singleactivity.php
View file

@ -31,4 +31,4 @@ $string['orphaned'] = 'Orphaned';
$string['orphanedwarning'] = 'These activities are unreachable by users!'; $string['orphanedwarning'] = 'These activities are unreachable by users!';
$string['pluginname'] = 'Single activity format'; $string['pluginname'] = 'Single activity format';
$string['sectionname'] = ''; $string['sectionname'] = '';
$string['warningchangeformat'] = 'When changing the existing course format to "Single activity" make sure that you removed all extra activities from the course including the "News forum". Note that sections structure may be modified.'; $string['warningchangeformat'] = 'When changing the existing course format to "Single activity" make sure that you removed all extra activities from the course including "Announcements". Note that sections structure may be modified.';

4
course/tests/behat/course_creation.feature
View file

@ -20,13 +20,13 @@ Feature: Managers can create courses
When I log in as "teacher1" When I log in as "teacher1"
And I follow "Course 1" And I follow "Course 1"
Then "Latest news" "block" should exist Then "Latest news" "block" should exist
And I follow "News forum" And I follow "Announcements"
And "Add a new topic" "button" should exist And "Add a new topic" "button" should exist
And "Forced subscription" "link" should not exist And "Forced subscription" "link" should not exist
And I log out And I log out
And I log in as "student1" And I log in as "student1"
And I follow "Course 1" And I follow "Course 1"
And I follow "News forum" And I follow "Announcements"
And "Add a new topic" "button" should not exist And "Add a new topic" "button" should not exist
And I should see "Forced subscription" in the "Administration" "block" And I should see "Forced subscription" in the "Administration" "block"

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

@ -336,8 +336,8 @@ $string['mustprovidediscussionorpost'] = 'You must provide either a discussion i
$string['myprofileownpost'] = 'My forum posts'; $string['myprofileownpost'] = 'My forum posts';
$string['myprofileowndis'] = 'My forum discussions'; $string['myprofileowndis'] = 'My forum discussions';
$string['myprofileotherdis'] = 'Forum discussions'; $string['myprofileotherdis'] = 'Forum discussions';
$string['namenews'] = 'News forum'; $string['namenews'] = 'Announcements';
$string['namenews_help'] = 'The news forum is a special forum for announcements that is automatically created when a course is created. A course can have only one news forum. Only teachers and administrators can post in the news forum. The "Latest news" block will display recent discussions from the news forum.'; $string['namenews_help'] = 'The course announcements forum is a special forum for announcements and is automatically created when a course is created. A course can have only one announcements forum. Only teachers and administrators can post announcements. The "Latest news" block will display recent announcements.';
$string['namesocial'] = 'Social forum'; $string['namesocial'] = 'Social forum';
$string['nameteacher'] = 'Teacher forum'; $string['nameteacher'] = 'Teacher forum';
$string['nextdiscussiona'] = 'Next discussion: {$a}'; $string['nextdiscussiona'] = 'Next discussion: {$a}';

2
mod/forum/tests/behat/behat_mod_forum.php
View file

@ -40,7 +40,7 @@ use Behat\Behat\Context\Step\Given as Given,
class behat_mod_forum extends behat_base { class behat_mod_forum extends behat_base {
/** /**
* Adds a topic to the forum specified by it's name. Useful for the News forum and blog-style forums. * Adds a topic to the forum specified by it's name. Useful for the Announcements and blog-style forums.
* *
* @Given /^I add a new topic to "(?P<forum_name_string>(?:[^"]|\\")*)" forum with:$/ * @Given /^I add a new topic to "(?P<forum_name_string>(?:[^"]|\\")*)" forum with:$/
* @param string $forumname * @param string $forumname