- localedrake, drakx-finish-install:

  o fix proposing Belgium when lang is "nl" and locales-fr is not installed
    (same for Canada with lang "fr" and locales-en not installed) (#36413)

nb:
- removed restricting countries to installed locales in list_countries(),
  since c2locale is wrong for countries like CA or BE which have more than one
  lang
- country_to_locales() is replaced with countries_to_locales() to avoid
  redoing the same computation all the time

1 files changed, 4 insertions, 3 deletions

diff --git a/perl-install/any.pm b/perl-install/any.pm
index fa8d3c158..b0da2a94a 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1034,11 +1034,12 @@ sub selectCountry {
     my ($in, $locale) = @_;
 
     my $country = $locale->{country};
-    my @countries = lang::list_countries(exclude_non_installed => !$::isInstall);
+    my $country2locales = lang::countries_to_locales(exclude_non_installed => !$::isInstall);
+    my @countries = keys %$country2locales;
     my @best = grep {
 	find { 
-	    lang::locale_to_main_locale($_) eq lang::locale_to_main_locale($locale->{lang});
-	} lang::country_to_locales($_);
+	    $_->{main} eq lang::locale_to_main_locale($locale->{lang});
+	} @{$country2locales->{$_}};
     } @countries;
     @best == 1 and @best = ();