From b41e6ca1b697f1dc85a64c9043c9257dbe22dc47 Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Thu, 20 Mar 2014 08:45:14 -0300 Subject: [PATCH] Bug 11973 - Fix Armenian language description MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch fix Armenian language description To test: 1) Do a fake translation to Armenian, mkdir koha-tmpl/intranet-tmpl/prog/hy-Armn 2) Go to Administration > System preferences > I18N/L10N 3) Armenian description looks like the second string in Bug description 4) Apply the patch 5) Run updatedatabase.pl 6) Reload page, now description look as first string in Bug description (it's the sixth letter, similar to 't') Ammended patch, wrong column. Signed-off-by: Holger Meißner Signed-off-by: Katrin Fischer Patch fixes the English sample file for translations and includes a database update to correct the string in existing installations. Passes all tests and QA script. Signed-off-by: Galen Charlton (cherry picked from commit 8f8ce37e88e87b3286275f07f54832f82b9fce9e) Signed-off-by: Fridolin Somers --- installer/data/mysql/en/mandatory/subtag_registry.sql | 2 +- installer/data/mysql/updatedatabase.pl | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/installer/data/mysql/en/mandatory/subtag_registry.sql b/installer/data/mysql/en/mandatory/subtag_registry.sql index b91aba97b3..64bcc1be79 100755 --- a/installer/data/mysql/en/mandatory/subtag_registry.sql +++ b/installer/data/mysql/en/mandatory/subtag_registry.sql @@ -83,7 +83,7 @@ INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'hy','arm'); INSERT INTO language_descriptions(subtag, type, lang, description) -VALUES ( 'hy', 'language', 'hy', 'Հայերէն'); +VALUES ( 'hy', 'language', 'hy', 'Հայերեն'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'hy', 'language', 'en', 'Armenian'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 3abb5e006c..89245856bf 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8016,6 +8016,15 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.15.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + UPDATE language_descriptions SET description = 'Հայերեն' WHERE subtag = 'hy' AND lang = 'hy'; + }); + print "Upgrade to $DBversion done (Bug 11973 - Fix Armenian language description)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) -- 2.39.5