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-65279-master' of https://github.com/tkorner/moodle

Browse source
This commit is contained in:
Jun Pataleta 2019-04-29 17:09:38 +08:00 • committed by Eloy Lafuente (stronk7)
commit 8f7bb541ad
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
course/classes/management/helper.php
View file

@ -764,7 +764,7 @@ class helper {
*/ */
public static function get_management_viewmodes() { public static function get_management_viewmodes() {
return array( return array(
'combined' => new \lang_string('categoriesandcoures'), 'combined' => new \lang_string('categoriesandcourses'),
'categories' => new \lang_string('categories'), 'categories' => new \lang_string('categories'),
'courses' => new \lang_string('courses') 'courses' => new \lang_string('courses')
); );

2
course/tests/behat/behat_course.php
View file

@ -83,7 +83,7 @@ class behat_course extends behat_base {
// Select Miscellaneous category. // Select Miscellaneous category.
$this->i_click_on_category_in_the_management_interface(get_string('miscellaneous')); $this->i_click_on_category_in_the_management_interface(get_string('miscellaneous'));
$this->execute("behat_course::i_should_see_the_courses_management_page", get_string('categoriesandcoures')); $this->execute("behat_course::i_should_see_the_courses_management_page", get_string('categoriesandcourses'));
// Click create new course. // Click create new course.
$this->execute('behat_general::i_click_on_in_the', $this->execute('behat_general::i_click_on_in_the',

2
lang/en/moodle.php
View file

@ -225,7 +225,7 @@ $string['cachecontrols'] = 'Cache controls';
$string['cancel'] = 'Cancel'; $string['cancel'] = 'Cancel';
$string['cancelled'] = 'Cancelled'; $string['cancelled'] = 'Cancelled';
$string['categories'] = 'Course categories'; $string['categories'] = 'Course categories';
$string['categoriesandcoures'] = 'Course categories and courses'; $string['categoriesandcourses'] = 'Course categories and courses';
$string['category'] = 'Category'; $string['category'] = 'Category';
$string['categoryadded'] = 'The category \'{$a}\' was added'; $string['categoryadded'] = 'The category \'{$a}\' was added';
$string['categorybulkaction'] = 'Bulk actions for selected categories'; $string['categorybulkaction'] = 'Bulk actions for selected categories';