diff options
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/keyboard.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index a0c9c9083..62e40599c 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -897,7 +897,7 @@ sub summary { clicked => sub { any::selectCountry($o, $o->{locale}) or return; - my $pkg_locale = locale_to_main_locale(lang::getlocale_for_country($o->{locale}{lang}, $o->{locale}{country})); + my $pkg_locale = lang::locale_to_main_locale(lang::getlocale_for_country($o->{locale}{lang}, $o->{locale}{country})); my @pkgs = pkgs::packagesProviding($o->{packages}, "locales-$pkg_locale"); $o->pkg_install(map { $_->name } @pkgs) if @pkgs; diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index a851ab9c8..9fda913fb 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -367,7 +367,7 @@ sub lang2keyboards { my @li = sort { $b->[1] <=> $a->[1] } map { @$_ } map { my $h = lang::analyse_locale_name($_); #- example: pt_BR and pt - my @l = if_($h->{country}, $h->{main} . '_' . $h->{country}), $h->{main}; + my @l = (if_($h->{country}, $h->{main} . '_' . $h->{country}), $h->{main}); my $k = find { $_ } map { $lang2keyboard{$_} } @l; unpack_keyboards($k) || [ [ ($keyboards{$_} ? $_ : "us") => 100 ] ]; } @_; |