From 645e80d58783aed46f368e36156ea69e2a34779e Mon Sep 17 00:00:00 2001 From: Sonia LEMAIRE Date: Wed, 3 Jul 2013 15:53:49 +0200 Subject: [PATCH] Bug 9519: fix code for Italian language search limiter 'ind' rather than 'ita' was set as the ISO639-2 language code for Italian in the fr-FR, it-IT, pl-PL, ru-RU, and uk-UA installation SQL. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer I checked nb-NO and de-DE - language code there had already been corrected. Signed-off-by: Galen Charlton (cherry picked from commit 707733ed2992a5d612d22510174301d65d3d7c05) Conflicts: installer/data/mysql/updatedatabase.pl Trivial merge conflict in the usual suspect, updatedatabase.pl Signed-off-by: Tomas Cohen Arazi --- .../data/mysql/fr-FR/1-Obligatoire/subtag_registry.sql | 2 +- installer/data/mysql/it-IT/necessari/subtag_registry.sql | 2 +- installer/data/mysql/pl-PL/mandatory/subtag_registry.sql | 2 +- installer/data/mysql/ru-RU/mandatory/subtag_registry.sql | 2 +- installer/data/mysql/uk-UA/mandatory/subtag_registry.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/subtag_registry.sql b/installer/data/mysql/fr-FR/1-Obligatoire/subtag_registry.sql index 0d0f2cfa44..59db6bb80f 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/subtag_registry.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/subtag_registry.sql @@ -273,7 +273,7 @@ INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'it', 'language', 'Italian','2005-10-16' ); INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) -VALUES( 'it','ind'); +VALUES( 'it','ita'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'it', 'language', 'it', 'Italiano'); diff --git a/installer/data/mysql/it-IT/necessari/subtag_registry.sql b/installer/data/mysql/it-IT/necessari/subtag_registry.sql index db92311de0..43e5a14499 100644 --- a/installer/data/mysql/it-IT/necessari/subtag_registry.sql +++ b/installer/data/mysql/it-IT/necessari/subtag_registry.sql @@ -314,7 +314,7 @@ INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'it', 'language', 'Italian','2005-10-16' ); INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) -VALUES( 'it','ind'); +VALUES( 'it','ita'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'it', 'language', 'it', 'Italiano'); diff --git a/installer/data/mysql/pl-PL/mandatory/subtag_registry.sql b/installer/data/mysql/pl-PL/mandatory/subtag_registry.sql index d27be70432..09561a928e 100644 --- a/installer/data/mysql/pl-PL/mandatory/subtag_registry.sql +++ b/installer/data/mysql/pl-PL/mandatory/subtag_registry.sql @@ -312,7 +312,7 @@ INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'it', 'language', 'Italian','2005-10-16' ); INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) -VALUES( 'it','ind'); +VALUES( 'it','ita'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'it', 'language', 'it', 'Italiano'); diff --git a/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql b/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql index f494babaee..3403d0fc77 100644 --- a/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql +++ b/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql @@ -312,7 +312,7 @@ INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'it', 'language', 'Italian','2005-10-16' ); INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) -VALUES( 'it','ind'); +VALUES( 'it','ita'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'it', 'language', 'it', 'Italiano'); diff --git a/installer/data/mysql/uk-UA/mandatory/subtag_registry.sql b/installer/data/mysql/uk-UA/mandatory/subtag_registry.sql index f494babaee..3403d0fc77 100644 --- a/installer/data/mysql/uk-UA/mandatory/subtag_registry.sql +++ b/installer/data/mysql/uk-UA/mandatory/subtag_registry.sql @@ -312,7 +312,7 @@ INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'it', 'language', 'Italian','2005-10-16' ); INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) -VALUES( 'it','ind'); +VALUES( 'it','ita'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'it', 'language', 'it', 'Italiano'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 1ddbe11da0..f4d78f4895 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -6878,6 +6878,13 @@ CREATE TABLE IF NOT EXISTS borrower_files ( SetVersion($DBversion); } +$DBversion = "3.12.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("UPDATE language_rfc4646_to_iso639 SET iso639_2_code='ita' WHERE rfc4646_subtag='it'"); + print "Upgrade to $DBversion done (Bug 9519: Wrong language code for Italian in the advanced search language limitations)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) -- 2.20.1