From 9cb1caa88937dacf96c9dfc509482bbca5d6520e Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Sun, 27 Apr 2014 21:17:14 -0300 Subject: [PATCH] Bug 12017: 9 - Remove use of language_get_description function This patch removes every use of language_get_description function. This function retrieves lang names from database To test: 1. Functionality removed by this patch do not affect anything, because previous patches are only using rfc4646_subtag value, not values stored in database. 2. Removed import from Templates.pm, not used there Signed-off-by: Julian FIOL --- C4/Languages.pm | 5 ----- C4/Templates.pm | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/C4/Languages.pm b/C4/Languages.pm index 8649999..91eb6ef 100644 --- a/C4/Languages.pm +++ b/C4/Languages.pm @@ -436,10 +436,6 @@ sub _build_languages_arrayref { # group this language, key by langtag $language_subtags_hashref->{'sublanguage_current'} = 1 if $translated_language eq $current_language; $language_subtags_hashref->{'rfc4646_subtag'} = $translated_language; - $language_subtags_hashref->{'native_description'} = language_get_description($language_subtags_hashref->{language},$language_subtags_hashref->{language},'language'); - $language_subtags_hashref->{'script_description'} = language_get_description($language_subtags_hashref->{script},$language_subtags_hashref->{'language'},'script'); - $language_subtags_hashref->{'region_description'} = language_get_description($language_subtags_hashref->{region},$language_subtags_hashref->{'language'},'region'); - $language_subtags_hashref->{'variant_description'} = language_get_description($language_subtags_hashref->{variant},$language_subtags_hashref->{'language'},'variant'); $track_language_groups->{$language_subtags_hashref->{'language'}}++; push ( @{ $language_groups->{$language_subtags_hashref->{language}} }, $language_subtags_hashref ); } @@ -455,7 +451,6 @@ sub _build_languages_arrayref { push @languages_loop, { # this is only use if there is one rfc4646_subtag => @$value[0]->{rfc4646_subtag}, - native_description => language_get_description($key,$key,'language'), language => $key, sublanguages_loop => $value, plural => $track_language_groups->{$key} >1 ? 1 : 0, diff --git a/C4/Templates.pm b/C4/Templates.pm index b7f770d..eef48bd 100644 --- a/C4/Templates.pm +++ b/C4/Templates.pm @@ -32,7 +32,7 @@ use List::MoreUtils qw/ any uniq /; use base qw(Class::Accessor); use Template; use Template::Constants qw( :debug ); -use C4::Languages qw(getTranslatedLanguages get_bidi regex_lang_subtags language_get_description accept_language ); +use C4::Languages qw(getTranslatedLanguages get_bidi regex_lang_subtags accept_language ); use C4::Context; -- 1.7.9.5