gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 1f6e409871)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Marcel de Rooy 2025-01-16 08:46:36 +00:00 committed by Fridolin Somers
parent 49dfd3899a
commit 6c7bed9109
No known key found for this signature in database
GPG Key ID: 9A8E73E2A8B96537
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/Languages.pm
View File

@ -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;

2
admin/itemtypes.pl
View File

@ -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,

2
admin/preferences.pl
View File

@ -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;

2
admin/systempreferences.pl
View File

@ -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;

4
t/db_dependent/Languages.t
View File

@ -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;

2
tools/additional-contents.pl
View File

@ -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} } ) {