Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

en-GB language pack package correction (fix inconsistency) #29

Closed
wants to merge 30 commits into from
Closed

en-GB language pack package correction (fix inconsistency) #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
61277f4
mysql update sql to add the missing package
andrepereiradasilva Apr 7, 2016
b599212
add the new extension in the installation (mysql)
andrepereiradasilva Apr 7, 2016
fce0dc2
Change from language to package in the administrator com_installer model
andrepereiradasilva Apr 7, 2016
677c705
Change from language to package in the installation languages model
andrepereiradasilva Apr 7, 2016
19d5e95
Update 3.5.2-2016-04-08.sql
andrepereiradasilva Apr 7, 2016
6061823
add the package to com_admin update script
andrepereiradasilva Apr 7, 2016
3a3b597
add the new extension in the installation (sqlazure)
andrepereiradasilva Apr 7, 2016
3c673e0
add the new extension in the installation (postgresql)
andrepereiradasilva Apr 7, 2016
21027f4
update sql to add the missing en-GB package (sqlazure)
andrepereiradasilva Apr 7, 2016
edf2362
update sql to add the missing en-GB package (postgresql)
andrepereiradasilva Apr 7, 2016
49ddfd9
"pkg_en-GB", not "en-GB" (1)
andrepereiradasilva Apr 7, 2016
63422be
"pkg_en-GB", not "en-GB" (2)
andrepereiradasilva Apr 7, 2016
9ecb2a6
"pkg_en-GB", not "en-GB" (3)
andrepereiradasilva Apr 7, 2016
c31ae08
"pkg_en-GB", not "en-GB" (4)
andrepereiradasilva Apr 7, 2016
2f69702
"pkg_en-GB", not "en-GB" (5)
andrepereiradasilva Apr 7, 2016
ce3e06a
"pkg_en-GB", not "en-GB" (6)
andrepereiradasilva Apr 7, 2016
7adee95
"pkg_en-GB", not "en-GB" (7)
andrepereiradasilva Apr 7, 2016
4dabb97
"pkg_en-GB", not "en-GB" (8)
andrepereiradasilva Apr 7, 2016
227c51b
"pkg_en-GB", not "en-GB" (9)
andrepereiradasilva Apr 7, 2016
174798a
pkg manifest should be 3.5.2
andrepereiradasilva Apr 7, 2016
4341969
use the same version as other language packs
andrepereiradasilva Apr 8, 2016
4399c46
remove ".0"
andrepereiradasilva Apr 8, 2016
296cc0e
Add ".1" to language pack xml file
andrepereiradasilva Apr 8, 2016
09ae0b1
use 650 id instead of 602
andrepereiradasilva Apr 10, 2016
a4bd981
use 650 id instead of 602
andrepereiradasilva Apr 10, 2016
e0e7582
use 650 id instead of 602
andrepereiradasilva Apr 10, 2016
9e00b68
use 650 id instead of 602
andrepereiradasilva Apr 10, 2016
09f4fbd
use 650 id instead of 602
andrepereiradasilva Apr 10, 2016
189feb2
650...
andrepereiradasilva Apr 10, 2016
e0d07d2
use 650 id instead of 602
andrepereiradasilva Apr 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/components/com_admin/script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ protected function updateManifestCaches()
array('file', 'joomla', '', 0),

// Packages
// None in core at this time
array('package', 'pkg_en-GB', '', 0),
);

// Attempt to refresh manifest caches
Expand Down
6 changes: 6 additions & 0 deletions administrator/components/com_admin/sql/updates/mysql/3.5.2-2016-04-08.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
-- Insert the missing en-GB package extension.
INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`)
VALUES (650, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);

-- Change update site extension id to the new extension.
UPDATE `#__update_sites_extensions` SET `extension_id` = 650 WHERE `update_site_id` = 3 AND `extension_id` = 600;
4 changes: 4 additions & 0 deletions administrator/components/com_admin/sql/updates/postgresql/3.5.2-2016-04-08.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
(650, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);

UPDATE "#__update_sites_extensions" SET "extension_id" = 650 WHERE "update_site_id" = 3 AND "extension_id" = 600;
8 changes: 8 additions & 0 deletions administrator/components/com_admin/sql/updates/sqlazure/3.5.2-2016-04-08.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
SET IDENTITY_INSERT [#__extensions] ON;

INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
SELECT 650, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;

SET IDENTITY_INSERT [#__extensions] OFF;

UPDATE [#__update_sites_extensions] SET [extension_id] = 650 WHERE [update_site_id] = 8 AND [extension_id] = 600;
6 changes: 2 additions & 4 deletions administrator/components/com_installer/models/languages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,11 @@ public function __construct($config = array())
// Get the extension_id of the en-GB package.
$db = $this->getDbo();
$extQuery = $db->getQuery(true);
$extType = 'language';
$extElem = 'en-GB';

$extQuery->select($db->quoteName('extension_id'))
->from($db->quoteName('#__extensions'))
->where($db->quoteName('type') . ' = ' . $db->quote($extType))
->where($db->quoteName('element') . ' = ' . $db->quote($extElem))
->where($db->quoteName('type') . ' = ' . $db->quote('package'))
->where($db->quoteName('element') . ' = ' . $db->quote('pkg_en-GB'))
->where($db->quoteName('client_id') . ' = 0');

$db->setQuery($extQuery);
Expand Down
2 changes: 1 addition & 1 deletion administrator/manifests/packages/pkg_en-GB.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<extension type="package" version="3.5" method="upgrade">
<name>English (en-GB) Language Pack</name>
<packagename>en-GB</packagename>
<version>3.5.0.1</version>
<version>3.5.2.1</version>
<creationDate>2013-03-07</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
Expand Down
4 changes: 2 additions & 2 deletions installation/model/languages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ public function getItems()

$extQuery->select($db->qn('extension_id'))
->from($db->qn('#__extensions'))
->where($db->qn('type') . ' = ' . $db->q('language'))
->where($db->qn('element') . ' = ' . $db->q('en-GB'))
->where($db->qn('type') . ' = ' . $db->q('package'))
->where($db->qn('element') . ' = ' . $db->q('pkg_en-GB'))
->where($db->qn('client_id') . ' = 0');

$db->setQuery($extQuery);
Expand Down
3 changes: 2 additions & 1 deletion installation/sql/mysql/joomla.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
(507, 'isis', 'template', 'isis', '', 1, 1, 1, 0, '', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(650, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);

-- --------------------------------------------------------
Expand Down Expand Up @@ -1808,7 +1809,7 @@ CREATE TABLE IF NOT EXISTS `#__update_sites_extensions` (
INSERT INTO `#__update_sites_extensions` (`update_site_id`, `extension_id`) VALUES
(1, 700),
(2, 700),
(3, 600),
(3, 650),
(4, 28);

-- --------------------------------------------------------
Expand Down
6 changes: 5 additions & 1 deletion installation/sql/postgresql/joomla.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,10 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder"
(600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
(601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);

-- Packages
INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
(650, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);

-- Files Extensions
INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
(700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
Expand Down Expand Up @@ -1732,7 +1736,7 @@ COMMENT ON TABLE "#__update_sites_extensions" IS 'Links extensions to update sit
INSERT INTO "#__update_sites_extensions" ("update_site_id", "extension_id") VALUES
(1, 700),
(2, 700),
(3, 600),
(3, 650),
(4, 28);

--
Expand Down
5 changes: 4 additions & 1 deletion installation/sql/sqlazure/joomla.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,9 @@ SELECT 600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '',
UNION ALL
SELECT 601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;

INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
SELECT 650, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;

INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
SELECT 700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;

Expand Down Expand Up @@ -2739,7 +2742,7 @@ SELECT 1, 700
UNION ALL
SELECT 2, 700
UNION ALL
SELECT 3, 600
SELECT 3, 650
UNION ALL
SELECT 4, 28;

Expand Down