From d1a06829f60ba5371e649239488fdfa838883de4 Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Mon, 7 Feb 2011 17:16:00 +0000 Subject: [PATCH] Bug 2742 Correct language names in install Correct native versions of Danish and Dutch Signed-off-by: Chris Cormack --- installer/data/mysql/de-DE/mandatory/subtag_registry.sql | 4 ++-- installer/data/mysql/en/mandatory/subtag_registry.sql | 4 ++-- .../data/mysql/fr-FR/1-Obligatoire/subtag_registry.sql | 4 ++-- installer/data/mysql/it-IT/necessari/subtag_registry.sql | 6 +++--- installer/data/mysql/pl-PL/mandatory/subtag_registry.sql | 4 ++-- installer/data/mysql/ru-RU/mandatory/subtag_registry.sql | 4 ++-- installer/data/mysql/uk-UA/mandatory/subtag_registry.sql | 4 ++-- installer/data/mysql/updatedatabase.pl | 8 ++++++++ 8 files changed, 23 insertions(+), 15 deletions(-) diff --git a/installer/data/mysql/de-DE/mandatory/subtag_registry.sql b/installer/data/mysql/de-DE/mandatory/subtag_registry.sql index f2e064836f..63c76d463a 100644 --- a/installer/data/mysql/de-DE/mandatory/subtag_registry.sql +++ b/installer/data/mysql/de-DE/mandatory/subtag_registry.sql @@ -135,7 +135,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'da','dan'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'da', 'language', 'da', 'Dænsk'); +VALUES ( 'da', 'language', 'da', 'Dansk'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'da', 'language', 'en', 'Danish'); @@ -151,7 +151,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'nl','dut'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'nl', 'language', 'nl', 'nedərlɑns'); +VALUES ( 'nl', 'language', 'nl', 'Nederlands'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'nl', 'language', 'en', 'Dutch'); diff --git a/installer/data/mysql/en/mandatory/subtag_registry.sql b/installer/data/mysql/en/mandatory/subtag_registry.sql index 852805d738..94b48f2f83 100644 --- a/installer/data/mysql/en/mandatory/subtag_registry.sql +++ b/installer/data/mysql/en/mandatory/subtag_registry.sql @@ -135,7 +135,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'da','dan'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'da', 'language', 'da', 'Dænsk'); +VALUES ( 'da', 'language', 'da', 'Dansk'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'da', 'language', 'en', 'Danish'); @@ -151,7 +151,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'nl','dut'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'nl', 'language', 'nl', 'nedərlɑns'); +VALUES ( 'nl', 'language', 'nl', 'Nederlands'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'nl', 'language', 'en', 'Dutch'); 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 0f298c3154..5254c35d10 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/subtag_registry.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/subtag_registry.sql @@ -119,7 +119,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'da','dan'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'da', 'language', 'da', 'Dænsk'); +VALUES ( 'da', 'language', 'da', 'Dansk'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'da', 'language', 'en', 'Danish'); @@ -135,7 +135,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'nl','dut'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'nl', 'language', 'nl', 'nedərlɑns'); +VALUES ( 'nl', 'language', 'nl', 'Nederlands'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'nl', 'language', 'en', 'Dutch'); diff --git a/installer/data/mysql/it-IT/necessari/subtag_registry.sql b/installer/data/mysql/it-IT/necessari/subtag_registry.sql index b19af909dd..48f4f6b825 100644 --- a/installer/data/mysql/it-IT/necessari/subtag_registry.sql +++ b/installer/data/mysql/it-IT/necessari/subtag_registry.sql @@ -137,7 +137,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'da','dan'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'da', 'language', 'da', 'Dænsk'); +VALUES ( 'da', 'language', 'da', 'Dansk'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'da', 'language', 'en', 'Danish'); @@ -153,7 +153,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'nl','dut'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'nl', 'language', 'nl', 'nedərlɑns'); +VALUES ( 'nl', 'language', 'nl', 'Nederlands'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'nl', 'language', 'en', 'Dutch'); @@ -723,4 +723,4 @@ VALUES ( 'US', 'region', 'United States','2005-10-16'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'US', 'region', 'en', 'United States'); -SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS=1; diff --git a/installer/data/mysql/pl-PL/mandatory/subtag_registry.sql b/installer/data/mysql/pl-PL/mandatory/subtag_registry.sql index 3b63cd9726..665fee04b6 100644 --- a/installer/data/mysql/pl-PL/mandatory/subtag_registry.sql +++ b/installer/data/mysql/pl-PL/mandatory/subtag_registry.sql @@ -135,7 +135,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'da','dan'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'da', 'language', 'da', 'Dænsk'); +VALUES ( 'da', 'language', 'da', 'Dansk'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'da', 'language', 'en', 'Danish'); @@ -151,7 +151,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'nl','dut'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'nl', 'language', 'nl', 'nedərlɑns'); +VALUES ( 'nl', 'language', 'nl', 'Nederlands'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'nl', 'language', 'en', 'Dutch'); diff --git a/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql b/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql index f2e064836f..63c76d463a 100644 --- a/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql +++ b/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql @@ -135,7 +135,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'da','dan'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'da', 'language', 'da', 'Dænsk'); +VALUES ( 'da', 'language', 'da', 'Dansk'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'da', 'language', 'en', 'Danish'); @@ -151,7 +151,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'nl','dut'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'nl', 'language', 'nl', 'nedərlɑns'); +VALUES ( 'nl', 'language', 'nl', 'Nederlands'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'nl', 'language', 'en', 'Dutch'); diff --git a/installer/data/mysql/uk-UA/mandatory/subtag_registry.sql b/installer/data/mysql/uk-UA/mandatory/subtag_registry.sql index f2e064836f..63c76d463a 100644 --- a/installer/data/mysql/uk-UA/mandatory/subtag_registry.sql +++ b/installer/data/mysql/uk-UA/mandatory/subtag_registry.sql @@ -135,7 +135,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'da','dan'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'da', 'language', 'da', 'Dænsk'); +VALUES ( 'da', 'language', 'da', 'Dansk'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'da', 'language', 'en', 'Danish'); @@ -151,7 +151,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'nl','dut'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'nl', 'language', 'nl', 'nedərlɑns'); +VALUES ( 'nl', 'language', 'nl', 'Nederlands'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'nl', 'language', 'en', 'Dutch'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 4618636236..7e815a2fc0 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3987,6 +3987,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = '3.03.00.XXX'; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do( q|update language_descriptions set description = 'Nederlands' where lang = 'nl' and subtag = 'nl'|); + $dbh->do( q|update language_descriptions set description = 'Dansk' where lang = 'da' and subtag = 'da'|); + print "Upgrade to $DBversion done (Correct lnaguage descriptions)\n"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS =head2 DropAllForeignKeys($table) -- 2.39.5