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

Bug 38903: Fix theme in some getTranslatedLanguages calls 

Combining opac with pref template is wrong. This pref should
actually be renamed to something like intranetTheme(s) or so.

Replacing the obsolete prog theme in Languages.t by undef. This
achieves the same: getting all themes for that interface.

Test plan:
Add some languages for opac and intranet. Do not enable exactly
the same set.
Enable TranslateNotices.
Verify that you have all OPAC languages on memberentry and
opac-messaging. And all languages on additional contents.
Run t/db_dependent/Languages.t

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested with:
OPAC  languages: en, nl-NL, de-DE
Staff languages: en, de-DE, fr-FR
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit baea457996)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Marcel de Rooy 2025-01-16 09:26:40 +00:00 committed by Fridolin Somers
parent 6c7bed9109
commit cfe71bde53
No known key found for this signature in database
GPG Key ID: 9A8E73E2A8B96537
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Koha/Notice/Template.pm
View File

@ -44,10 +44,8 @@ sub get_default {
my $self = shift;
my $lang = $self->lang;
if ( $lang eq 'default' ) {
my $translated_languages = C4::Languages::getTranslatedLanguages(
'opac',
C4::Context->preference('template')
);
my $translated_languages =
C4::Languages::getTranslatedLanguages( 'opac', C4::Context->preference('opacthemes') );
$lang = @{ @{$translated_languages}[0]->{sublanguages_loop} }[0]->{rfc4646_subtag};
}

2
members/memberentry.pl
View File

@ -908,7 +908,7 @@ if ( defined $min ) {
}
if ( C4::Context->preference('TranslateNotices') ) {
my $translated_languages = C4::Languages::getTranslatedLanguages( 'opac', C4::Context->preference('template') );
my $translated_languages = C4::Languages::getTranslatedLanguages( 'opac', C4::Context->preference('opacthemes') );
$template->param( languages => $translated_languages );
}

2
opac/opac-memberentry.pl
View File

@ -100,7 +100,7 @@ if ( defined $min ) {
);
}
my $translated_languages = C4::Languages::getTranslatedLanguages( 'opac', C4::Context->preference('template') );
my $translated_languages = C4::Languages::getTranslatedLanguages( 'opac', C4::Context->preference('opacthemes') );
$template->param(
op => $op,

2
opac/opac-messaging.pl
View File

@ -90,7 +90,7 @@ if( $opac_messaging && C4::Context->preference("SMSSendDriver") eq 'Email' ) {
my $new_session_id = $query->cookie('CGISESSID');
if ( C4::Context->preference('TranslateNotices') ) {
my $translated_languages = C4::Languages::getTranslatedLanguages( 'opac', C4::Context->preference('template') );
my $translated_languages = C4::Languages::getTranslatedLanguages( 'opac', C4::Context->preference('opacthemes') );
$template->param(
languages => $translated_languages,
patron_lang => $patron->lang,

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' ) }
warnings_are { $translatedlanguages1 = C4::Languages::getTranslatedLanguages( 'opac' ) }
[],
'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', undef, 'en' ) }
[],
'no warnings for calling getTranslatedLanguages';
my @currentcheck2 = map { $_->{current} } @$translatedlanguages2;