From 4870b363b02e3f12f2b952c4da8813b0ed2ddce3 Mon Sep 17 00:00:00 2001
From: Adrian Greeve <adrian@moodle.com>
Date: Wed, 22 Dec 2021 09:58:46 +0800
Subject: [PATCH] MDL-73366 navigation: Changed the first tab of site
 administration.

It now reads "General" instead of "Site administration"
---
 badges/tests/behat/badge_navigation.feature   | 6 +++---
 lib/classes/navigation/views/secondary.php    | 2 +-
 lib/tests/navigation/views/secondary_test.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/badges/tests/behat/badge_navigation.feature b/badges/tests/behat/badge_navigation.feature
index f88a49692b6..446919fe463 100644
--- a/badges/tests/behat/badge_navigation.feature
+++ b/badges/tests/behat/badge_navigation.feature
@@ -97,12 +97,12 @@ Feature: Test tertiary navigation as various users
     When I navigate to "Badges > Manage badges" in site administration
     Then "Manage badges" "button" should not exist
     And "Add a new badge" "button" should exist
-    And I should see "Site administration" is active in secondary navigation
+    And I should see "General" is active in secondary navigation
     And I click on "Testing site badge" "link"
     And "Manage badges" "button" should not exist
     And "Add a new badge" "button" should not exist
     And "Back" "button" should exist
-    And I should see "Site administration" is active in secondary navigation
+    And I should see "General" is active in secondary navigation
     And I click on "Back" "button"
     And "Back" "button" should not exist
     And "Manage badges" "button" should not exist
@@ -113,7 +113,7 @@ Feature: Test tertiary navigation as various users
     And I navigate to "Badges > Manage badges" in site administration
     And I click on "Testing site badge" "link"
     When I select "<option>" from the "jump" singleselect
-    Then I should see "Site administration" is active in secondary navigation
+    Then I should see "General" is active in secondary navigation
 
     Examples:
       | option             |
diff --git a/lib/classes/navigation/views/secondary.php b/lib/classes/navigation/views/secondary.php
index eb12a835b7b..4c685e26099 100644
--- a/lib/classes/navigation/views/secondary.php
+++ b/lib/classes/navigation/views/secondary.php
@@ -586,7 +586,7 @@ class secondary extends view {
         // tab. Note this value refers to being present on the page itself, before a search has been performed.
         $isadminsearchpage = $PAGE->url->compare(new \moodle_url('/admin/search.php', ['query' => '']), URL_MATCH_PARAMS);
         if ($node) {
-            $siteadminnode = $this->add($node->text, "#link$node->key", null, null, 'siteadminnode');
+            $siteadminnode = $this->add(get_string('general'), "#link$node->key", null, null, 'siteadminnode');
             if ($isadminsearchpage) {
                 $siteadminnode->action = false;
                 $siteadminnode->tab = "#link$node->key";
diff --git a/lib/tests/navigation/views/secondary_test.php b/lib/tests/navigation/views/secondary_test.php
index 7ce4d1ede78..0dbd80add1f 100644
--- a/lib/tests/navigation/views/secondary_test.php
+++ b/lib/tests/navigation/views/secondary_test.php
@@ -138,7 +138,7 @@ class secondary_test extends \advanced_testcase {
         return [
             'Testing in a course context' => ['course', 'coursehome', 'courseheader', 'Course'],
             'Testing in a module context' => ['module', 'modulepage', 'activityheader', 'Assignment'],
-            'Testing in a site admin' => ['system', 'siteadminnode', 'homeheader', 'Site administration'],
+            'Testing in a site admin' => ['system', 'siteadminnode', 'homeheader', 'General'],
         ];
     }