This patch removes some sources of warning messages thrown by
C4::Languages, particular getTranslatedLanguages() when running
Koha's web installer.
TEST PLAN
---------
1) Apply first patch
2) prove -v t/db_dependent/Languages.t
-- There will be uninitialized string messages, etc.
3) Apply second patch (this one)
4) prove -v t/db_dependent/Languages.t
-- Only one carp message will remain.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Test pass, no warnings, no koha-qa errors
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
my $interface = shift;
my $htdocs;
my @themes;
my $interface = shift;
my $htdocs;
my @themes;
- if ( $interface eq 'intranet' ) {
+ if ( $interface && $interface eq 'intranet' ) {
$htdocs = C4::Context->config('intrahtdocs');
}
else {
$htdocs = C4::Context->config('intrahtdocs');
}
else {
sub _get_language_dirs {
my ($htdocs,$theme) = @_;
sub _get_language_dirs {
my ($htdocs,$theme) = @_;
+ $htdocs //= '';
+ $theme //= '';
my @lang_strings;
opendir D, "$htdocs/$theme";
for my $lang_string ( readdir D ) {
my @lang_strings;
opendir D, "$htdocs/$theme";
for my $lang_string ( readdir D ) {
sub _build_languages_arrayref {
my ($translated_languages,$current_language,$enabled_languages) = @_;
sub _build_languages_arrayref {
my ($translated_languages,$current_language,$enabled_languages) = @_;
+ $current_language //= '';
my @translated_languages = @$translated_languages;
my @languages_loop; # the final reference to an array of hashrefs
my @enabled_languages = @$enabled_languages;
my @translated_languages = @$translated_languages;
my @languages_loop; # the final reference to an array of hashrefs
my @enabled_languages = @$enabled_languages;
my $enabled;
for my $enabled_language (@enabled_languages) {
my $regex_enabled_language = regex_lang_subtags($enabled_language);
my $enabled;
for my $enabled_language (@enabled_languages) {
my $regex_enabled_language = regex_lang_subtags($enabled_language);
- $enabled = 1 if $key eq $regex_enabled_language->{language};
+ $enabled = 1 if $key eq ($regex_enabled_language->{language} // '');
}
push @languages_loop, {
# this is only use if there is one
}
push @languages_loop, {
# this is only use if there is one
language => $key,
sublanguages_loop => $value,
plural => $track_language_groups->{$key} >1 ? 1 : 0,
language => $key,
sublanguages_loop => $value,
plural => $track_language_groups->{$key} >1 ? 1 : 0,
- current => $current_language_regex->{language} eq $key ? 1 : 0,
+ current => ($current_language_regex->{language} // '') eq $key ? 1 : 0,
group_enabled => $enabled,
};
}
group_enabled => $enabled,
};
}