joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-25 14:53:01 +00:00
Code Packages Releases Activity

[4.0] Point to J4 translations list (#34302)

Browse Source 
* Point to J4 translations list

* Combine with previous sql script and use correct where clause

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
This commit is contained in:
George Wilson 2021-06-01 00:40:59 +01:00 committed by GitHub
parent b36496053f
commit 04336c3ae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
administrator/components/com_admin/script.php
View File

@ -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',

5
administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-21.sql → administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-30.sql
View File

@ -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';

5
administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-21.sql → administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-30.sql
View File

@ -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';

2
administrator/manifests/packages/pkg_en-GB.xml
View File

@ -21,7 +21,7 @@
</files>
<updateservers>
<server type="collection" priority="1" name="Accredited Joomla! Translations">
https://update.joomla.org/language/translationlist_3.xml
https://update.joomla.org/language/translationlist_4.xml
</server>
</updateservers>
</extension>

2
installation/sql/mysql/base.sql
View File

@ -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);
-- --------------------------------------------------------

2
installation/sql/postgresql/base.sql
View File

@ -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);