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

(-)a/C4/Languages.pm (-4 / +6 lines)
Lines 269-275 sub _get_themes { Link Here
269
    my $interface = shift;
269
    my $interface = shift;
270
    my $htdocs;
270
    my $htdocs;
271
    my @themes;
271
    my @themes;
272
    if ( $interface eq 'intranet' ) {
272
    if ( $interface && $interface eq 'intranet' ) {
273
        $htdocs = C4::Context->config('intrahtdocs');
273
        $htdocs = C4::Context->config('intrahtdocs');
274
    }
274
    }
275
    else {
275
    else {
Lines 292-297 Internal function, returns an array of directory names, excluding non-language d Link Here
292
292
293
sub _get_language_dirs {
293
sub _get_language_dirs {
294
    my ($htdocs,$theme) = @_;
294
    my ($htdocs,$theme) = @_;
295
    $htdocs //= '';
296
    $theme //= '';
295
    my @lang_strings;
297
    my @lang_strings;
296
    opendir D, "$htdocs/$theme";
298
    opendir D, "$htdocs/$theme";
297
    for my $lang_string ( readdir D ) {
299
    for my $lang_string ( readdir D ) {
Lines 318-323 FIXME: this could be rewritten and simplified using map Link Here
318
320
319
sub _build_languages_arrayref {
321
sub _build_languages_arrayref {
320
        my ($translated_languages,$current_language,$enabled_languages) = @_;
322
        my ($translated_languages,$current_language,$enabled_languages) = @_;
323
        $current_language //= '';
321
        my @translated_languages = @$translated_languages;
324
        my @translated_languages = @$translated_languages;
322
        my @languages_loop; # the final reference to an array of hashrefs
325
        my @languages_loop; # the final reference to an array of hashrefs
323
        my @enabled_languages = @$enabled_languages;
326
        my @enabled_languages = @$enabled_languages;
Lines 355-361 sub _build_languages_arrayref { Link Here
355
            my $enabled;
358
            my $enabled;
356
            for my $enabled_language (@enabled_languages) {
359
            for my $enabled_language (@enabled_languages) {
357
                my $regex_enabled_language = regex_lang_subtags($enabled_language);
360
                my $regex_enabled_language = regex_lang_subtags($enabled_language);
358
                $enabled = 1 if $key eq $regex_enabled_language->{language};
361
                $enabled = 1 if $key eq ($regex_enabled_language->{language} // '');
359
            }
362
            }
360
            push @languages_loop,  {
363
            push @languages_loop,  {
361
                            # this is only use if there is one
364
                            # this is only use if there is one
Lines 364-370 sub _build_languages_arrayref { Link Here
364
                            language => $key,
367
                            language => $key,
365
                            sublanguages_loop => $value,
368
                            sublanguages_loop => $value,
366
                            plural => $track_language_groups->{$key} >1 ? 1 : 0,
369
                            plural => $track_language_groups->{$key} >1 ? 1 : 0,
367
                            current => $current_language_regex->{language} eq $key ? 1 : 0,
370
                            current => ($current_language_regex->{language} // '') eq $key ? 1 : 0,
368
                            group_enabled => $enabled,
371
                            group_enabled => $enabled,
369
                           };
372
                           };
370
        }
373
        }
371
- 

Return to bug 7841