From 04336c3ae160cc450623f4ba05457a9eef80d2a5 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 1 Jun 2021 00:40:59 +0100 Subject: [PATCH] [4.0] Point to J4 translations list (#34302) * Point to J4 translations list * Combine with previous sql script and use correct where clause Co-authored-by: Richard Fath --- administrator/components/com_admin/script.php | 2 ++ .../mysql/{4.0.0-2021-05-21.sql => 4.0.0-2021-05-30.sql} | 5 +++++ .../{4.0.0-2021-05-21.sql => 4.0.0-2021-05-30.sql} | 5 +++++ administrator/manifests/packages/pkg_en-GB.xml | 2 +- installation/sql/mysql/base.sql | 2 +- installation/sql/postgresql/base.sql | 2 +- 6 files changed, 15 insertions(+), 3 deletions(-) rename administrator/components/com_admin/sql/updates/mysql/{4.0.0-2021-05-21.sql => 4.0.0-2021-05-30.sql} (85%) rename administrator/components/com_admin/sql/updates/postgresql/{4.0.0-2021-05-21.sql => 4.0.0-2021-05-30.sql} (85%) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 79d6f90e94c..2fd5ac07e8c 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -5304,6 +5304,7 @@ class JoomlaInstallerScript '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-04.sql', '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-07.sql', '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-10.sql', + '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-21.sql', '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-07-03.sql', '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-09-22.sql', '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-09-28.sql', @@ -5363,6 +5364,7 @@ class JoomlaInstallerScript '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-04.sql', '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-07.sql', '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-10.sql', + '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-21.sql', '/administrator/components/com_admin/src/Controller/ProfileController.php', '/administrator/components/com_admin/src/Model/ProfileModel.php', '/administrator/components/com_admin/src/View/Profile/HtmlView.php', diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-21.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-30.sql similarity index 85% rename from administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-21.sql rename to administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-30.sql index d429e145978..44f1ed73a71 100644 --- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-21.sql +++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-30.sql @@ -24,3 +24,8 @@ UPDATE `#__modules` AND `module` = 'mod_menu' AND `position` = 'menu' AND `params` LIKE '{%"layout":"cassiopeia:dropdown-metismenu"%}'; + +-- From 4.0.0-2021-05-30.sql +UPDATE `#__update_sites` + SET `location` = 'https://update.joomla.org/language/translationlist_4.xml' + WHERE `location` = 'https://update.joomla.org/language/translationlist_3.xml'; diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-21.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-30.sql similarity index 85% rename from administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-21.sql rename to administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-30.sql index 26aa6565410..05029036df5 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-21.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-30.sql @@ -24,3 +24,8 @@ UPDATE "#__modules" AND "module" = 'mod_menu' AND "position" = 'menu' AND "params" LIKE '{%"layout":"cassiopeia:dropdown-metismenu"%}'; + +-- From 4.0.0-2021-05-30.sql +UPDATE "#__update_sites" + SET "location" = 'https://update.joomla.org/language/translationlist_4.xml' + WHERE "location" = 'https://update.joomla.org/language/translationlist_3.xml'; diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 60b46c4eb79..80ee5adaee1 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -21,7 +21,7 @@ - https://update.joomla.org/language/translationlist_3.xml + https://update.joomla.org/language/translationlist_4.xml diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql index ce94a76d49d..69b89959afd 100644 --- a/installation/sql/mysql/base.sql +++ b/installation/sql/mysql/base.sql @@ -852,7 +852,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', 'collection', 'https://update.joomla.org/core/list.xml', 1, 0), -(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_3.xml', 1, 0), +(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_4.xml', 1, 0), (3, 'Joomla! Update Component Update Site', '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 index 0626d992cbd..fb20fe4c5bc 100644 --- a/installation/sql/postgresql/base.sql +++ b/installation/sql/postgresql/base.sql @@ -869,7 +869,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', 'collection', 'https://update.joomla.org/core/list.xml', 1, 0), -(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_3.xml', 1, 0), +(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_4.xml', 1, 0), (3, 'Joomla! Update Component Update Site', 'extension', 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0); SELECT setval('#__update_sites_update_site_id_seq', 4, false);