From dda357502d6d83900b75ccee63c0cdc6b3e73ea9 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 16 Jan 2025 08:46:36 +0000 Subject: [PATCH] Bug 38630: (QA follow-up) Fixing few calls of getTranslatedLanguages The fourth parameter is now removed and was never used. Also replacing the 'both' interface by passing no interface to make it consistent with call in additional-contents. Resolving warn for empty interface or theme on Languages.pm L128. Test plan: Run t/db_dependent/Languages.t Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi --- C4/Languages.pm | 2 ++ admin/itemtypes.pl | 2 +- admin/preferences.pl | 2 +- admin/systempreferences.pl | 2 +- t/db_dependent/Languages.t | 4 ++-- tools/additional-contents.pl | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/C4/Languages.pm b/C4/Languages.pm index bd340138878..cb8567e909d 100644 --- a/C4/Languages.pm +++ b/C4/Languages.pm @@ -113,6 +113,8 @@ Returns a reference to an array of hashes: sub getTranslatedLanguages { my ($interface, $theme, $current_language) = @_; + $interface //= q{}; + $theme //= q{}; my @languages; my @enabled_languages; diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl index 7eceef6b1af..58258c62fa5 100755 --- a/admin/itemtypes.pl +++ b/admin/itemtypes.pl @@ -60,7 +60,7 @@ if ( $op eq 'add_form' ) { my $parent_types = Koha::ItemTypes->search( { parent_type => undef, itemtype => { '!=' => $itemtype_code } } ); my $imagesets = C4::Koha::getImageSets( checked => ( $itemtype ? $itemtype->imageurl : undef ) ); my $searchcategory = GetAuthorisedValues("ITEMTYPECAT"); - my $translated_languages = C4::Languages::getTranslatedLanguages( "both", C4::Context->preference('template') ); + my $translated_languages = C4::Languages::getTranslatedLanguages(); $template->param( itemtype => $itemtype, parent_type => $parent_type, diff --git a/admin/preferences.pl b/admin/preferences.pl index d00672b1ae3..e3688874d73 100755 --- a/admin/preferences.pl +++ b/admin/preferences.pl @@ -93,7 +93,7 @@ sub _get_chunk { $interface = 'intranet'; $theme = C4::Context->preference('template'); } - $chunk->{'languages'} = getTranslatedLanguages( $interface, $theme, undef, $current_languages ); + $chunk->{'languages'} = getTranslatedLanguages( $interface, $theme ); $chunk->{'type'} = 'languages'; } elsif ( $options{ 'choices' } ) { my $add_blank; diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index 8031d1a4904..2e567fe76e5 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -186,7 +186,7 @@ sub GetPrefParams { $interface = 'intranet'; $theme = C4::Context->preference('template'); } - my $languages_loop = getTranslatedLanguages( $interface, $theme, $lang, $currently_selected_languages ); + my $languages_loop = getTranslatedLanguages( $interface, $theme, $lang ); $params->{'languages_loop'} = $languages_loop; $params->{'type_langselector'} = 1; diff --git a/t/db_dependent/Languages.t b/t/db_dependent/Languages.t index 1d8e1e2296d..3a5967ee7df 100755 --- a/t/db_dependent/Languages.t +++ b/t/db_dependent/Languages.t @@ -50,7 +50,7 @@ $languages = C4::Languages::getLanguages('eng', 1); is(scalar(@$languages), 2, 'getLanguages() filtering using AdvancedSearchLanguages works'); my $translatedlanguages1; -warnings_are { $translatedlanguages1 = C4::Languages::getTranslatedLanguages('opac','prog',undef,'') } +warnings_are { $translatedlanguages1 = C4::Languages::getTranslatedLanguages( 'opac', 'prog' ) } [], 'no warnings for calling getTranslatedLanguages'; my @currentcheck1 = map { $_->{current} } @$translatedlanguages1; @@ -58,7 +58,7 @@ my $onlyzeros = first { $_ != 0 } @currentcheck1; ok(! $onlyzeros, "Everything was zeros.\n"); my $translatedlanguages2; -warnings_are { $translatedlanguages2 = C4::Languages::getTranslatedLanguages('opac','prog','en','') } +warnings_are { $translatedlanguages2 = C4::Languages::getTranslatedLanguages( 'opac', 'prog', 'en' ) } [], 'no warnings for calling getTranslatedLanguages'; my @currentcheck2 = map { $_->{current} } @$translatedlanguages2; diff --git a/tools/additional-contents.pl b/tools/additional-contents.pl index 8cfdd34ab54..e9f5ee0269b 100755 --- a/tools/additional-contents.pl +++ b/tools/additional-contents.pl @@ -226,7 +226,7 @@ if ( $op eq 'list' ) { $template->param( additional_contents => $additional_contents ); } -my $translated_languages = C4::Languages::getTranslatedLanguages; +my $translated_languages = C4::Languages::getTranslatedLanguages(); my @languages; for my $language (@$translated_languages) { for my $sublanguage ( @{ $language->{sublanguages_loop} } ) { -- 2.48.1