Merge branch '6.0-dev' into 60-admin-menuitem-filter-featured

richard67 · web-flow · commit 3a4d7d16abad · 2025-10-10T13:17:00.000+02:00
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-23.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-23.sql
@@ -0,0 +1,3 @@
+UPDATE `#__update_sites`
+   SET `location` = 'https://update.joomla.org/language/translationlist_6.xml'
+ WHERE `location` = 'https://update.joomla.org/language/translationlist_5.xml';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-23.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-23.sql
@@ -0,0 +1,3 @@
+UPDATE "#__update_sites"
+   SET "location" = 'https://update.joomla.org/language/translationlist_6.xml'
+ WHERE "location" = 'https://update.joomla.org/language/translationlist_5.xml';
diff --git a/administrator/components/com_installer/src/Model/LanguagesModel.php b/administrator/components/com_installer/src/Model/LanguagesModel.php
@@ -131,7 +131,7 @@ protected function getLanguages()
         if (empty($updateSite)) {
             Factory::getApplication()->enqueueMessage(Text::_('COM_INSTALLER_MSG_WARNING_NO_LANGUAGES_UPDATESERVER'), 'warning');
 
-            return;
+            return [];
         }
 
         try {
@@ -143,15 +143,15 @@ protected function getLanguages()
         if ($response === null || $response->getStatusCode() !== 200) {
             Factory::getApplication()->enqueueMessage(Text::sprintf('COM_INSTALLER_MSG_ERROR_CANT_CONNECT_TO_UPDATESERVER', $updateSite), 'error');
 
-            return;
+            return [];
         }
 
         $updateSiteXML = simplexml_load_string((string) $response->getBody());
 
         if (!$updateSiteXML) {
             Factory::getApplication()->enqueueMessage(Text::sprintf('COM_INSTALLER_MSG_ERROR_CANT_RETRIEVE_XML', $updateSite), 'error');
 
-            return;
+            return [];
         }
 
         $languages     = [];
diff --git a/administrator/language/en-GB/com_cpanel.ini b/administrator/language/en-GB/com_cpanel.ini
@@ -30,6 +30,6 @@ COM_CPANEL_MSG_TEXTFILTER3919_TITLE="Updated Text Filter Recommendations"
 COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel"
 COM_CPANEL_UNPUBLISH_MODULE_ERROR="Error unpublishing the module"
 COM_CPANEL_UNPUBLISH_MODULE_SUCCESS="Module unpublished"
-COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users.</p><ul><li><a href=\"https://docs.joomla.org/Special:MyLanguage/Portal:Beginners\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla! Beginners Guide</a></li><li><a href=\"https://forum.joomla.org/viewforum.php?f=834\" target=\"_blank\" rel=\"noopener noreferrer\">New to Joomla! Forum</a></li></ul>"
+COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users.</p><ul><li><a href=\"https://docs.joomla.org/Special:MyLanguage/Portal:Beginners\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla! Beginners Guide</a></li><li><a href=\"https://forum.joomla.org/viewforum.php?f=860\" target=\"_blank\" rel=\"noopener noreferrer\">New to Joomla! Forum</a></li></ul>"
 COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!"
 COM_CPANEL_XML_DESCRIPTION="Home Dashboard component"
diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>6.0.0</version>
-	<creationDate>2025-09</creationDate>
+	<creationDate>2025-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="administrator">
 	<name>English (en-GB)</name>
 	<version>6.0.0</version>
-	<creationDate>2025-09</creationDate>
+	<creationDate>2025-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>6.0.0-rc2-dev</version>
-	<creationDate>2025-09</creationDate>
+	<version>6.0.0-rc4-dev</version>
+	<creationDate>2025-10</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>6.0.0.1</version>
-	<creationDate>2025-09</creationDate>
+	<creationDate>2025-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -21,7 +21,7 @@
 	</files>
 	<updateservers>
 		<server type="collection" priority="1" name="Accredited Joomla! Translations">
-			https://update.joomla.org/language/translationlist_5.xml
+			https://update.joomla.org/language/translationlist_6.xml
 		</server>
 	</updateservers>
 </extension>
diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>6.0.0</version>
-	<creationDate>2025-09</creationDate>
+	<creationDate>2025-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="api">
 	<name>English (en-GB)</name>
 	<version>6.0.0</version>
-	<creationDate>2025-09</creationDate>
+	<creationDate>2025-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/build/media_source/com_guidedtours/images/6_0/cassiopeiacolors.jpg b/build/media_source/com_guidedtours/images/6_0/cassiopeiacolors.jpg
diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
 	<version>6.0.0</version>
-	<creationDate>2025-09</creationDate>
+	<creationDate>2025-10</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql
@@ -925,7 +925,7 @@ CREATE TABLE IF NOT EXISTS `#__update_sites` (
 
 INSERT INTO `#__update_sites` (`update_site_id`, `name`, `type`, `location`, `enabled`, `last_check_timestamp`) VALUES
 (1, 'Joomla! Core', 'tuf', 'https://update.joomla.org/cms/', 1, 0),
-(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_5.xml', 1, 0),
+(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_6.xml', 1, 0),
 (3, 'Joomla! Update Component', 'extension', 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0);
 
 -- --------------------------------------------------------
diff --git a/installation/sql/postgresql/base.sql b/installation/sql/postgresql/base.sql
@@ -943,7 +943,7 @@ COMMENT ON TABLE "#__update_sites" IS 'Update Sites';
 
 INSERT INTO "#__update_sites" ("update_site_id", "name", "type", "location", "enabled", "last_check_timestamp") VALUES
 (1, 'Joomla! Core', 'tuf', 'https://update.joomla.org/cms/', 1, 0),
-(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_5.xml', 1, 0),
+(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_6.xml', 1, 0),
 (3, 'Joomla! Update Component', 'extension', 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0);
 
 SELECT setval('#__update_sites_update_site_id_seq', 4, false);
diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>6.0.0</version>
-	<creationDate>2025-09</creationDate>
+	<creationDate>2025-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="site">
 	<name>English (en-GB)</name>
 	<version>6.0.0</version>
-	<creationDate>2025-09</creationDate>
+	<creationDate>2025-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -66,7 +66,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'rc2-dev';
+    public const EXTRA_VERSION = 'rc4-dev';
 
     /**
      * Development status.
@@ -90,7 +90,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '30-September-2025';
+    public const RELDATE = '9-October-2025';
 
     /**
      * Release time.
@@ -99,7 +99,7 @@ final class Version
      * @since  3.5
      */
 
-    public const RELTIME = '16:23';
+    public const RELTIME = '16:21';
 
     /**
      * Release timezone.
diff --git a/tests/System/integration/administrator/components/com_installer/Languages.cy.js b/tests/System/integration/administrator/components/com_installer/Languages.cy.js
@@ -9,8 +9,15 @@ describe('Test in backend that the Installer', () => {
   });
 
   it('has Afrikaans Language installable', () => {
-    cy.get('tr.row0').should('contain.text', 'Afrikaans').then(() => {
-      cy.get('input.btn.btn-primary.btn-sm').should('exist');
+    cy.get('body').then((body) => {
+      if (body.find('#installer-languages table').length === 0) {
+        cy.get('#installer-languages .alert.alert-info').should('contain.text', 'No Matching Results');
+        cy.checkForSystemMessage(`Can't connect to https://update.joomla.org/language/translationlist`);
+      } else {
+        cy.get('tr.row0').should('contain.text', 'Afrikaans').then(() => {
+          cy.get('input.btn.btn-primary.btn-sm').should('exist');
+        });
+      }
     });
   });
 });
diff --git a/tests/System/integration/api/com_languages/Languages.cy.js b/tests/System/integration/api/com_languages/Languages.cy.js
@@ -1,7 +1,12 @@
 describe('Test that languages API endpoint', () => {
   it('can deliver a list of languages', () => {
-    cy.api_get('/languages')
-      .then((response) => cy.wrap(response).its('body').its('data.0').its('type')
-        .should('include', 'languages'));
+    cy.api_get('/languages').then((response) => {
+      if (response?.body?.data.length === 0) {
+        cy.wrap(response).its('body.data').should('have.length', 0);
+        cy.wrap(response).its('body.links.self').should('include', '/api/index.php/v1/languages');
+      } else {
+        cy.wrap(response).its('body.data.0.type').should('include', 'languages');
+      }
+    });
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+UPDATE `#__update_sites`
	`2`	+ SET `location` = 'https://update.joomla.org/language/translationlist_6.xml'
	`3`	+ WHERE `location` = 'https://update.joomla.org/language/translationlist_5.xml';
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+UPDATE "#__update_sites"`
	`2`	`+ SET "location" = 'https://update.joomla.org/language/translationlist_6.xml'`
	`3`	`+ WHERE "location" = 'https://update.joomla.org/language/translationlist_5.xml';`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ protected function getLanguages()`
`131`	`131`	`if (empty($updateSite)) {`
`132`	`132`	`Factory::getApplication()->enqueueMessage(Text::_('COM_INSTALLER_MSG_WARNING_NO_LANGUAGES_UPDATESERVER'), 'warning');`
`133`	`133`
`134`		`- return;`
	`134`	`+ return [];`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`try {`
`@@ -143,15 +143,15 @@ protected function getLanguages()`
`143`	`143`	`if ($response === null \|\| $response->getStatusCode() !== 200) {`
`144`	`144`	`Factory::getApplication()->enqueueMessage(Text::sprintf('COM_INSTALLER_MSG_ERROR_CANT_CONNECT_TO_UPDATESERVER', $updateSite), 'error');`
`145`	`145`
`146`		`- return;`
	`146`	`+ return [];`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`$updateSiteXML = simplexml_load_string((string) $response->getBody());`
`150`	`150`
`151`	`151`	`if (!$updateSiteXML) {`
`152`	`152`	`Factory::getApplication()->enqueueMessage(Text::sprintf('COM_INSTALLER_MSG_ERROR_CANT_RETRIEVE_XML', $updateSite), 'error');`
`153`	`153`
`154`		`- return;`
	`154`	`+ return [];`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`$languages = [];`