[open-ils-commits] r17760 - branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher (miker)

svn at svn.open-ils.org svn at svn.open-ils.org
Fri Sep 17 09:42:23 EDT 2010


Author: miker
Date: 2010-09-17 09:42:21 -0400 (Fri, 17 Sep 2010)
New Revision: 17760

Modified:
   branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
Log:
Backport r17759 from trunk: normalize all locales used in locale-lang mapping for QueryParser

Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm	2010-09-17 13:41:54 UTC (rev 17759)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm	2010-09-17 13:42:21 UTC (rev 17760)
@@ -2359,7 +2359,7 @@
 
         my @locales = config::i18n_locale->search_where({ code => { '<>' => '' } });
         for my $locale ( @locales ) {
-            $locale_map{$locale->code} = $locale->marc_code;
+            $locale_map{lc($locale->code)} = $locale->marc_code;
         }
         $locale_map{COMPLETE} = 1;
 
@@ -2405,7 +2405,7 @@
     if (!defined($args{preferred_language})) {
 		my $ses_locale = $client->session ? $client->session->session_locale : $default_preferred_language;
         $args{preferred_language} =
-            $locale_map{ $ses_locale } || 'eng';
+            $locale_map{ lc($ses_locale) } || 'eng';
     }
 
     if (!defined($args{preferred_language_weight})) {
@@ -2817,7 +2817,7 @@
 
         my @locales = config::i18n_locale->search_where({ code => { '<>' => '' } });
         for my $locale ( @locales ) {
-            $locale_map{$locale->code} = $locale->marc_code;
+            $locale_map{lc($locale->code)} = $locale->marc_code;
         }
         $locale_map{COMPLETE} = 1;
 
@@ -2846,7 +2846,7 @@
         $parser->default_preferred_language( $args{preferred_language} );
         if (!$parser->default_preferred_language) {
 		    my $ses_locale = $client->session ? $client->session->session_locale : '';
-            $parser->default_preferred_language( $locale_map{ $ses_locale } );
+            $parser->default_preferred_language( $locale_map{ lc($ses_locale) } );
         }
         $parser->default_preferred_language(
             OpenSRF::Utils::SettingsClient->new->config_value(
@@ -3098,7 +3098,7 @@
 
         my @locales = config::i18n_locale->search_where({ code => { '<>' => '' } });
         for my $locale ( @locales ) {
-            $locale_map{$locale->code} = $locale->marc_code;
+            $locale_map{lc($locale->code)} = $locale->marc_code;
         }
         $locale_map{COMPLETE} = 1;
 



More information about the open-ils-commits mailing list