From 9f840c140d7c40625ece635a643d926cdced7f8f Mon Sep 17 00:00:00 2001 From: Amaia Anabitarte Date: Tue, 21 Feb 2023 13:18:29 +0100 Subject: [PATCH] MDL-77135 block_myoverview: Remove duplicated strings AMOS BEGIN CPY [zero_nopermission_title,block_myoverview],[zero_default_title,block_myoverview] AMOS END --- blocks/myoverview/classes/output/main.php | 38 ++++++++++++++----- .../myoverview/lang/en/block_myoverview.php | 4 +- .../behat/block_myoverview_pagination.feature | 2 +- .../behat/block_myoverview_search.feature | 2 +- .../behat/block_myoverview_zerostate.feature | 6 +-- 5 files changed, 35 insertions(+), 17 deletions(-) diff --git a/blocks/myoverview/classes/output/main.php b/blocks/myoverview/classes/output/main.php index 3bc8ed73b0220..b35f9939e212d 100644 --- a/blocks/myoverview/classes/output/main.php +++ b/blocks/myoverview/classes/output/main.php @@ -504,7 +504,11 @@ public function export_for_zero_state_template(renderer_base $output) { 'post', \single_button::BUTTON_PRIMARY ); - return $this->generate_zero_state_data($nocoursesimg, [$button], 'request'); + return $this->generate_zero_state_data( + $nocoursesimg, + [$button], + ['title' => 'zero_request_title', 'intro' => 'zero_request_intro'] + ); } $totalcourses = $DB->count_records_select('course', 'category > 0'); @@ -526,7 +530,11 @@ public function export_for_zero_state_template(renderer_base $output) { \single_button::BUTTON_PRIMARY ); $buttons[] = $createbutton->export_for_template($output); - return $this->generate_zero_state_data($nocoursesimg, $buttons, 'nocourses'); + return $this->generate_zero_state_data( + $nocoursesimg, + $buttons, + ['title' => 'zero_nocourses_title', 'intro' => 'zero_nocourses_intro'] + ); } if ($categorytocreate = \core_course_category::get_nearest_editable_subcategory($coursecat, ['create'])) { @@ -544,13 +552,25 @@ public function export_for_zero_state_template(renderer_base $output) { get_string('managecourses') ); $buttons[] = $managebutton->export_for_template($output); - return $this->generate_zero_state_data($nocoursesimg, array_reverse($buttons), 'createcourses'); + return $this->generate_zero_state_data( + $nocoursesimg, + array_reverse($buttons), + ['title' => 'zero_default_title', 'intro' => 'zero_createcourses_intro'] + ); } - return $this->generate_zero_state_data($nocoursesimg, $buttons, 'nomanagecourses'); + return $this->generate_zero_state_data( + $nocoursesimg, + $buttons, + ['title' => 'zero_default_title', 'intro' => 'zero_nomanagecourses_intro'] + ); } } - return $this->generate_zero_state_data($nocoursesimg, [], 'nopermission'); + return $this->generate_zero_state_data( + $nocoursesimg, + [], + ['title' => 'zero_default_title', 'intro' => 'zero_nopermission_intro'] + ); } /** @@ -558,10 +578,10 @@ public function export_for_zero_state_template(renderer_base $output) { * * @param \moodle_url $imageurl The URL to the image to show * @param \single_button[] $buttons - * @param string $scenario the scenario name (used to get title and intro strings) + * @param array $strings Title and intro strings for the zero state if needed. * @return array Context variables for the template */ - private function generate_zero_state_data(\moodle_url $imageurl, array $buttons, string $scenario) { + private function generate_zero_state_data(\moodle_url $imageurl, array $buttons, array $strings) { global $CFG; // Documentation data. $dochref = new \moodle_url($CFG->docroot, ['lang' => current_language()]); @@ -576,8 +596,8 @@ private function generate_zero_state_data(\moodle_url $imageurl, array $buttons, ]; return [ 'nocoursesimg' => $imageurl->out(), - 'title' => get_string("zero_{$scenario}_title", 'block_myoverview'), - 'intro' => get_string("zero_{$scenario}_intro", 'block_myoverview', $docparams), + 'title' => ($strings['title']) ? get_string($strings['title'], 'block_myoverview') : '', + 'intro' => ($strings['intro']) ? get_string($strings['intro'], 'block_myoverview', $docparams) : '', 'buttons' => $buttons, ]; } diff --git a/blocks/myoverview/lang/en/block_myoverview.php b/blocks/myoverview/lang/en/block_myoverview.php index 5629d150a6512..ae52453e2f3ac 100644 --- a/blocks/myoverview/lang/en/block_myoverview.php +++ b/blocks/myoverview/lang/en/block_myoverview.php @@ -88,15 +88,13 @@ $string['sortbyshortname'] = 'Sort by short name'; $string['privacy:request:preference:set'] = 'The value of the setting \'{$a->name}\' was \'{$a->value}\''; $string['viewquickstart'] = 'View Quickstart guide'; -$string['zero_nopermission_title'] = 'You\'re not enroled in any course'; +$string['zero_default_title'] = 'You\'re not enrolled in any course'; $string['zero_nopermission_intro'] = 'Once you enrol in a course, it will appear here.'; $string['zero_request_title'] = 'Request your first course'; $string['zero_request_intro'] = 'Need help getting started? Check out the Moodle documentation or take your first steps with our Quickstart guide.'; $string['zero_nocourses_title'] = 'Create your first course'; $string['zero_nocourses_intro'] = 'Need help getting started? Check out the Moodle documentation or take your first steps with our Quickstart guide.'; -$string['zero_createcourses_title'] = 'You\'re not enroled in any course'; $string['zero_createcourses_intro'] = 'Once you enrol in a course, it will appear here. To view all courses on this site, go to Manage courses.'; -$string['zero_nomanagecourses_title'] = 'You\'re not enroled in any course'; $string['zero_nomanagecourses_intro'] = 'Once you enrol in a course, it will appear here.'; // Deprecated since Moodle 4.0. diff --git a/blocks/myoverview/tests/behat/block_myoverview_pagination.feature b/blocks/myoverview/tests/behat/block_myoverview_pagination.feature index 4b3ee4e4ece49..61bfbf6b763ab 100644 --- a/blocks/myoverview/tests/behat/block_myoverview_pagination.feature +++ b/blocks/myoverview/tests/behat/block_myoverview_pagination.feature @@ -35,7 +35,7 @@ Feature: My overview block pagination Scenario: The pagination controls should be hidden if I am not enrolled in any courses When I am on the "My courses" page logged in as "student1" - Then I should see "You're not enroled in any course" in the "Course overview" "block" + Then I should see "You're not enrolled in any course" in the "Course overview" "block" And I should not see "Show" in the "Course overview" "block" And ".block_myoverview .dropdown-menu.show" "css_element" should not be visible And ".block_myoverview [data-control='next']" "css_element" should not be visible diff --git a/blocks/myoverview/tests/behat/block_myoverview_search.feature b/blocks/myoverview/tests/behat/block_myoverview_search.feature index dc640706c2066..8a0754d7d2ce0 100644 --- a/blocks/myoverview/tests/behat/block_myoverview_search.feature +++ b/blocks/myoverview/tests/behat/block_myoverview_search.feature @@ -40,7 +40,7 @@ Feature: My overview block searching Scenario: There is no search if I am not enrolled in any course When I am on the "My courses" page logged in as "student2" - Then I should see "You're not enroled in any course" in the "Course overview" "block" + Then I should see "You're not enrolled in any course" in the "Course overview" "block" And "Search courses" "field" should not exist in the "Course overview" "block" And I log out diff --git a/blocks/myoverview/tests/behat/block_myoverview_zerostate.feature b/blocks/myoverview/tests/behat/block_myoverview_zerostate.feature index 119f10afe831d..82bbcb16cd82a 100644 --- a/blocks/myoverview/tests/behat/block_myoverview_zerostate.feature +++ b/blocks/myoverview/tests/behat/block_myoverview_zerostate.feature @@ -15,7 +15,7 @@ Feature: Zero state on my overview block Scenario: Users with no permissions don't see any CTA Given I am on the "My courses" page logged in as "user" - When I should see "You're not enroled in any course" + When I should see "You're not enrolled in any course" Then I should see "Once you enrol in a course, it will appear here" And I should not see "Create course" And I should not see "Request a course" @@ -46,7 +46,7 @@ Feature: Zero state on my overview block | fullname | Course 1 | | shortname | C1 | When I am on the "My courses" page logged in as "manager" - Then I should see "You're not enroled in any course" + Then I should see "You're not enrolled in any course" Then I should see "To view all courses on this site, go to Manage courses." And "Manage courses" "button" should exist And "Create course" "button" should exist @@ -64,7 +64,7 @@ Feature: Zero state on my overview block | fullname | Course 1 | | shortname | C1 | When I am on the "My courses" page logged in as "manager" - Then I should see "You're not enroled in any course" + Then I should see "You're not enrolled in any course" Then I should not see "To view all courses on this sie, go to Manage courses" And "Manage courses" "button" should not exist And "Create course" "button" should exist