From a2dc1e4ecaadb0676b4da54745c6bc7e53cc68d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Sun, 27 Jul 2014 08:03:23 +0200 Subject: [PATCH] Bug 12705 - News not possible for one sublanguage if two sublanguages are installed To test: - Install two language variants (e.g. de-DE and de-CH) - Create OPAC news for each of them - Verify that they are displayed in OPAC as appropriate Signed-off-by: Bernardo Gonzalez Kriegel Works Ok, no koha-qa errors Signed-off-by: Katrin Fischer Works ok, all installed languages now show up in the pull downs and display for the selected language in the OPAC. Passes tests and QA script. Signed-off-by: Mason James --- tools/koha-news.pl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/koha-news.pl b/tools/koha-news.pl index aec9486c51..954d0309d0 100755 --- a/tools/koha-news.pl +++ b/tools/koha-news.pl @@ -65,12 +65,15 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( # get lang list my @lang_list; my $tlangs = getTranslatedLanguages() ; + foreach my $language ( @$tlangs ) { - push @lang_list, - { - language => $language->{'rfc4646_subtag'}, - selected => ( $new_detail->{lang} eq $language->{'rfc4646_subtag'} ? 1 : 0 ), - }; + foreach my $sublanguage ( @{$language->{'sublanguages_loop'}} ) { + push @lang_list, + { + language => $sublanguage->{'rfc4646_subtag'}, + selected => ( $new_detail->{lang} eq $sublanguage->{'rfc4646_subtag'} ? 1 : 0 ), + }; + } } my $branches = GetBranches; -- 2.39.5