Followup Bug 9381 - Add Catalan language

This followup adds Catalan language into languages
other than english.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Rebased to master

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

diff --git a/installer/data/mysql/de-DE/mandatory/subtag_registry.sql b/installer/data/mysql/de-DE/mandatory/subtag_registry.sql
index 4121a59..f494bab 100644 (file)
--- a/installer/data/mysql/de-DE/mandatory/subtag_registry.sql
+++ b/installer/data/mysql/de-DE/mandatory/subtag_registry.sql
@@ -529,6 +529,28 @@ VALUES( 'es', 'language', 'en', 'Spanish');
 INSERT INTO language_descriptions(subtag, type, lang, description)
 VALUES( 'es', 'language', 'fr', 'Espagnol');
 
+-- Spanish, Catalan
+INSERT INTO language_subtag_registry( subtag, type, description, added)
+VALUES ( 'ca', 'language', 'Catalan','2013-01-12' );
+
+INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code)
+VALUES( 'ca','cat');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'es', 'Catalán');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'en', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'fr', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'ca', 'Català');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'de', 'Katalanisch');
+
 -- Swedish
 INSERT INTO language_subtag_registry( subtag, type, description, added)
 VALUES ( 'sv', 'language', 'Swedish','2005-10-16' );

diff --git a/installer/data/mysql/es-ES/mandatory/subtag_registry.sql b/installer/data/mysql/es-ES/mandatory/subtag_registry.sql
index 90a3bed..49ad7ab 100644 (file)
--- a/installer/data/mysql/es-ES/mandatory/subtag_registry.sql
+++ b/installer/data/mysql/es-ES/mandatory/subtag_registry.sql
@@ -535,6 +535,28 @@ VALUES( 'es', 'language', 'en', 'Spanish');
 INSERT INTO language_descriptions(subtag, type, lang, description)
 VALUES( 'es', 'language', 'fr', 'Espagnol');
 
+-- Spanish, Catalan
+INSERT INTO language_subtag_registry( subtag, type, description, added)
+VALUES ( 'ca', 'language', 'Catalan','2013-01-12' );
+
+INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code)
+VALUES( 'ca','cat');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'es', 'Catalán');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'en', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'fr', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'ca', 'Català');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'de', 'Katalanisch');
+
 -- Swedish
 INSERT INTO language_subtag_registry( subtag, type, description, added)
 VALUES ( 'sv', 'language', 'Swedish','2005-10-16' );

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 caa354b..0d0f2cf 100644 (file)
--- a/installer/data/mysql/fr-FR/1-Obligatoire/subtag_registry.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/subtag_registry.sql
@@ -466,6 +466,28 @@ VALUES( 'es', 'language', 'en', 'Spanish');
 INSERT INTO language_descriptions(subtag, type, lang, description)
 VALUES( 'es', 'language', 'fr', 'Espagnol');
 
+-- Spanish, Catalan
+INSERT INTO language_subtag_registry( subtag, type, description, added)
+VALUES ( 'ca', 'language', 'Catalan','2013-01-12' );
+
+INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code)
+VALUES( 'ca','cat');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'es', 'Catalán');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'en', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'fr', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'ca', 'Català');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'de', 'Katalanisch');
+
 -- Swedish
 INSERT INTO language_subtag_registry( subtag, type, description, added)
 VALUES ( 'sv', 'language', 'Swedish','2005-10-16' );

diff --git a/installer/data/mysql/it-IT/necessari/subtag_registry.sql b/installer/data/mysql/it-IT/necessari/subtag_registry.sql
index a8029d5..db92311 100644 (file)
--- a/installer/data/mysql/it-IT/necessari/subtag_registry.sql
+++ b/installer/data/mysql/it-IT/necessari/subtag_registry.sql
@@ -531,6 +531,28 @@ VALUES( 'es', 'language', 'en', 'Spanish');
 INSERT INTO language_descriptions(subtag, type, lang, description)
 VALUES( 'es', 'language', 'fr', 'Espagnol');
 
+-- Spanish, Catalan
+INSERT INTO language_subtag_registry( subtag, type, description, added)
+VALUES ( 'ca', 'language', 'Catalan','2013-01-12' );
+
+INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code)
+VALUES( 'ca','cat');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'es', 'Catalán');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'en', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'fr', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'ca', 'Català');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'de', 'Katalanisch');
+
 -- Swedish
 INSERT INTO language_subtag_registry( subtag, type, description, added)
 VALUES ( 'sv', 'language', 'Swedish','2005-10-16' );

diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/subtag_registry.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/subtag_registry.sql
index dd04af4..f4d5409 100644 (file)
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/subtag_registry.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/subtag_registry.sql
@@ -556,6 +556,28 @@ VALUES( 'es', 'language', 'en', 'Spanish');
 INSERT INTO language_descriptions(subtag, type, lang, description)
 VALUES( 'es', 'language', 'fr', 'Espagnol');
 
+-- Spanish, Catalan
+INSERT INTO language_subtag_registry( subtag, type, description, added)
+VALUES ( 'ca', 'language', 'Catalan','2013-01-12' );
+
+INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code)
+VALUES( 'ca','cat');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'es', 'Catalán');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'en', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'fr', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'ca', 'Català');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'de', 'Katalanisch');
+
 -- Swedish
 INSERT INTO language_subtag_registry( subtag, type, description, added)
 VALUES ( 'sv', 'language', 'Swedish','2005-10-16' );

diff --git a/installer/data/mysql/pl-PL/mandatory/subtag_registry.sql b/installer/data/mysql/pl-PL/mandatory/subtag_registry.sql
index b246a7c..d27be70 100644 (file)
--- a/installer/data/mysql/pl-PL/mandatory/subtag_registry.sql
+++ b/installer/data/mysql/pl-PL/mandatory/subtag_registry.sql
@@ -529,6 +529,28 @@ VALUES( 'es', 'language', 'en', 'Spanish');
 INSERT INTO language_descriptions(subtag, type, lang, description)
 VALUES( 'es', 'language', 'fr', 'Espagnol');
 
+-- Spanish, Catalan
+INSERT INTO language_subtag_registry( subtag, type, description, added)
+VALUES ( 'ca', 'language', 'Catalan','2013-01-12' );
+
+INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code)
+VALUES( 'ca','cat');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'es', 'Catalán');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'en', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'fr', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'ca', 'Català');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'de', 'Katalanisch');
+
 -- Swedish
 INSERT INTO language_subtag_registry( subtag, type, description, added)
 VALUES ( 'sv', 'language', 'Swedish','2005-10-16' );

diff --git a/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql b/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql
index 4121a59..f494bab 100644 (file)
--- a/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql
+++ b/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql
@@ -529,6 +529,28 @@ VALUES( 'es', 'language', 'en', 'Spanish');
 INSERT INTO language_descriptions(subtag, type, lang, description)
 VALUES( 'es', 'language', 'fr', 'Espagnol');
 
+-- Spanish, Catalan
+INSERT INTO language_subtag_registry( subtag, type, description, added)
+VALUES ( 'ca', 'language', 'Catalan','2013-01-12' );
+
+INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code)
+VALUES( 'ca','cat');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'es', 'Catalán');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'en', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'fr', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'ca', 'Català');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'de', 'Katalanisch');
+
 -- Swedish
 INSERT INTO language_subtag_registry( subtag, type, description, added)
 VALUES ( 'sv', 'language', 'Swedish','2005-10-16' );

diff --git a/installer/data/mysql/uk-UA/mandatory/subtag_registry.sql b/installer/data/mysql/uk-UA/mandatory/subtag_registry.sql
index 4121a59..f494bab 100644 (file)
--- a/installer/data/mysql/uk-UA/mandatory/subtag_registry.sql
+++ b/installer/data/mysql/uk-UA/mandatory/subtag_registry.sql
@@ -529,6 +529,28 @@ VALUES( 'es', 'language', 'en', 'Spanish');
 INSERT INTO language_descriptions(subtag, type, lang, description)
 VALUES( 'es', 'language', 'fr', 'Espagnol');
 
+-- Spanish, Catalan
+INSERT INTO language_subtag_registry( subtag, type, description, added)
+VALUES ( 'ca', 'language', 'Catalan','2013-01-12' );
+
+INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code)
+VALUES( 'ca','cat');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'es', 'Catalán');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'en', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'fr', 'Catalan');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'ca', 'Català');
+
+INSERT INTO language_descriptions(subtag, type, lang, description)
+VALUES( 'ca', 'language', 'de', 'Katalanisch');
+
 -- Swedish
 INSERT INTO language_subtag_registry( subtag, type, description, added)
 VALUES ( 'sv', 'language', 'Swedish','2005-10-16' );

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 4cf26f2..8ff1d88 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -6766,10 +6766,12 @@ if ( CheckVersion($DBversion) ) {
    $dbh->do("INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'ca', 'language', 'en', 'Catalan')");
    $dbh->do("INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'ca', 'language', 'fr', 'Catalan')");
    $dbh->do("INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'ca', 'language', 'ca', 'Català')");
+   $dbh->do("INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'ca', 'language', 'de', 'Katalanisch')");
    print "Upgrade to $DBversion done (Bug 9381: Add Catalan laguage)\n";
    SetVersion ($DBversion);
 }
 
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)