View | Details | Raw Unified | Return to bug 38630
Collapse All | Expand All

(-)a/C4/Languages.pm (+2 lines)
Lines 113-118 Returns a reference to an array of hashes: Link Here
113
113
114
sub getTranslatedLanguages {
114
sub getTranslatedLanguages {
115
    my ($interface, $theme, $current_language) = @_;
115
    my ($interface, $theme, $current_language) = @_;
116
    $interface //= q{};
117
    $theme     //= q{};
116
    my @languages;
118
    my @languages;
117
119
118
    my @enabled_languages;
120
    my @enabled_languages;
(-)a/admin/itemtypes.pl (-1 / +1 lines)
Lines 60-66 if ( $op eq 'add_form' ) { Link Here
60
    my $parent_types   = Koha::ItemTypes->search( { parent_type => undef, itemtype => { '!=' => $itemtype_code } } );
60
    my $parent_types   = Koha::ItemTypes->search( { parent_type => undef, itemtype => { '!=' => $itemtype_code } } );
61
    my $imagesets      = C4::Koha::getImageSets( checked => ( $itemtype ? $itemtype->imageurl : undef ) );
61
    my $imagesets      = C4::Koha::getImageSets( checked => ( $itemtype ? $itemtype->imageurl : undef ) );
62
    my $searchcategory = GetAuthorisedValues("ITEMTYPECAT");
62
    my $searchcategory = GetAuthorisedValues("ITEMTYPECAT");
63
    my $translated_languages = C4::Languages::getTranslatedLanguages( "both", C4::Context->preference('template') );
63
    my $translated_languages = C4::Languages::getTranslatedLanguages();
64
    $template->param(
64
    $template->param(
65
        itemtype          => $itemtype,
65
        itemtype          => $itemtype,
66
        parent_type       => $parent_type,
66
        parent_type       => $parent_type,
(-)a/admin/preferences.pl (-1 / +1 lines)
Lines 93-99 sub _get_chunk { Link Here
93
            $interface = 'intranet';
93
            $interface = 'intranet';
94
            $theme     = C4::Context->preference('template');
94
            $theme     = C4::Context->preference('template');
95
        }
95
        }
96
        $chunk->{'languages'} = getTranslatedLanguages( $interface, $theme, undef, $current_languages );
96
        $chunk->{'languages'} = getTranslatedLanguages( $interface, $theme );
97
        $chunk->{'type'} = 'languages';
97
        $chunk->{'type'} = 'languages';
98
    } elsif ( $options{ 'choices' } ) {
98
    } elsif ( $options{ 'choices' } ) {
99
        my $add_blank;
99
        my $add_blank;
(-)a/admin/systempreferences.pl (-1 / +1 lines)
Lines 186-192 sub GetPrefParams { Link Here
186
            $interface = 'intranet';
186
            $interface = 'intranet';
187
            $theme     = C4::Context->preference('template');
187
            $theme     = C4::Context->preference('template');
188
        }
188
        }
189
        my $languages_loop = getTranslatedLanguages( $interface, $theme, $lang, $currently_selected_languages );
189
        my $languages_loop = getTranslatedLanguages( $interface, $theme, $lang );
190
190
191
        $params->{'languages_loop'}    = $languages_loop;
191
        $params->{'languages_loop'}    = $languages_loop;
192
        $params->{'type_langselector'} = 1;
192
        $params->{'type_langselector'} = 1;
(-)a/t/db_dependent/Languages.t (-2 / +2 lines)
Lines 50-56 $languages = C4::Languages::getLanguages('eng', 1); Link Here
50
is(scalar(@$languages), 2, 'getLanguages() filtering using AdvancedSearchLanguages works');
50
is(scalar(@$languages), 2, 'getLanguages() filtering using AdvancedSearchLanguages works');
51
51
52
my $translatedlanguages1;
52
my $translatedlanguages1;
53
warnings_are { $translatedlanguages1 = C4::Languages::getTranslatedLanguages('opac','prog',undef,'') }
53
warnings_are { $translatedlanguages1 = C4::Languages::getTranslatedLanguages( 'opac', 'prog' ) }
54
             [],
54
             [],
55
             'no warnings for calling getTranslatedLanguages';
55
             'no warnings for calling getTranslatedLanguages';
56
my @currentcheck1 = map { $_->{current} } @$translatedlanguages1;
56
my @currentcheck1 = map { $_->{current} } @$translatedlanguages1;
Lines 58-64 my $onlyzeros = first { $_ != 0 } @currentcheck1; Link Here
58
ok(! $onlyzeros, "Everything was zeros.\n");
58
ok(! $onlyzeros, "Everything was zeros.\n");
59
59
60
my $translatedlanguages2;
60
my $translatedlanguages2;
61
warnings_are { $translatedlanguages2 = C4::Languages::getTranslatedLanguages('opac','prog','en','') }
61
warnings_are { $translatedlanguages2 = C4::Languages::getTranslatedLanguages( 'opac', 'prog', 'en' ) }
62
             [],
62
             [],
63
             'no warnings for calling getTranslatedLanguages';
63
             'no warnings for calling getTranslatedLanguages';
64
my @currentcheck2 = map { $_->{current} } @$translatedlanguages2;
64
my @currentcheck2 = map { $_->{current} } @$translatedlanguages2;
(-)a/tools/additional-contents.pl (-2 / +1 lines)
Lines 226-232 if ( $op eq 'list' ) { Link Here
226
    $template->param( additional_contents => $additional_contents );
226
    $template->param( additional_contents => $additional_contents );
227
}
227
}
228
228
229
my $translated_languages = C4::Languages::getTranslatedLanguages;
229
my $translated_languages = C4::Languages::getTranslatedLanguages();
230
my @languages;
230
my @languages;
231
for my $language (@$translated_languages) {
231
for my $language (@$translated_languages) {
232
    for my $sublanguage ( @{ $language->{sublanguages_loop} } ) {
232
    for my $sublanguage ( @{ $language->{sublanguages_loop} } ) {
233
- 

Return to bug 38630