From 5857d0972d9d0b8f7a72c63ea638a74fd764a728 Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Sun, 27 Apr 2014 17:18:52 -0300 Subject: [PATCH] Bug 12017 - 7 - Remove function getFrameworkLanguages [ Note: From now on dependence on language descriptions in database is about to be removed, also some code cleaning.] This must be an old relic, not used anymore. To test: 1. Check use of getFrameworkLanguages egrep -Rl getFrameworkLanguages * No result save for definition file 2. Apply the patch 3. check again, no results Reason for removing this function is that it's not used and tries to send languages descriptions from database --- C4/Languages.pm | 43 +------------------------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/C4/Languages.pm b/C4/Languages.pm index ffa818b..8590164 100644 --- a/C4/Languages.pm +++ b/C4/Languages.pm @@ -31,7 +31,6 @@ eval { import Memoize::Memcached qw(memoize_memcached); memoize_memcached('getTranslatedLanguages', memcached => C4::Context->memcached); - memoize_memcached('getFrameworkLanguages' , memcached => C4::Context->memcached); memoize_memcached('getAllLanguages', memcached => C4::Context->memcached); } }; @@ -41,12 +40,11 @@ BEGIN { require Exporter; @ISA = qw(Exporter); @EXPORT = qw( - &getFrameworkLanguages &getTranslatedLanguages &getLanguages &getAllLanguages ); - @EXPORT_OK = qw(getSearchLanguages getLanguages_iso getFrameworkLanguages getTranslatedLanguages getAllLanguages getLanguages get_bidi regex_lang_subtags language_get_description accept_language); + @EXPORT_OK = qw(getSearchLanguages getLanguages_iso getTranslatedLanguages getAllLanguages getLanguages get_bidi regex_lang_subtags language_get_description accept_language); $DEBUG = 0; } @@ -64,45 +62,6 @@ use C4::Languages; =head1 FUNCTIONS -=head2 getFrameworkLanguages - -Returns a reference to an array of hashes: - - my $languages = getFrameworkLanguages(); - for my $language(@$languages) { - print "$language->{language_code}\n"; # language code in iso 639-2 - print "$language->{language_name}\n"; # language name in native script - print "$language->{language_locale_name}\n"; # language name in current locale - } - -=cut - -sub getFrameworkLanguages { - # get a hash with all language codes, names, and locale names - my $all_languages = getAllLanguages(); - my @languages; - - # find the available directory names - my $dir=C4::Context->config('intranetdir')."/installer/data/"; - opendir (MYDIR,$dir); - my @listdir= grep { !/^\.|CVS/ && -d "$dir/$_"} readdir(MYDIR); - closedir MYDIR; - - # pull out all data for the dir names that exist - for my $dirname (@listdir) { - for my $language_set (@$all_languages) { - - if ($dirname eq $language_set->{language_code}) { - push @languages, { - 'language_code'=>$dirname, - 'language_description'=>$language_set->{language_description}, - 'native_descrition'=>$language_set->{language_native_description} } - } - } - } - return \@languages; -} - =head2 getSearchLanguages Get selection of languages codes and iso639_2. -- 1.7.9.5