load_mo: first perform a lookup on mo's for all possible langs,

will prevent from downloading each time another time the mo file
(fr_FR comes first, is not here, everything including fr gets
removed, fr_FR is non-existent, and then fr is downloaded again)

1 files changed, 10 insertions, 9 deletions

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 4288530c3..45dbf5e78 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1048,17 +1048,18 @@ sub load_mo {
 
     $lang ||= $ENV{LANGUAGE} || $ENV{LC_ALL} || $ENV{LC_MESSAGES} || $ENV{LANG};
 
-    foreach (split ':', $lang) {
-	my $f = "$localedir/$_/$suffix";
-	-s $f and return $_;
+    my @possible_langs = map { { name => $_, mofile => "$localedir/$_/$suffix" } } split ':', $lang;
 
-	if ($::isInstall && common::usingRamdisk()) {
-	    #- cleanup
-	    eval { rm_rf($localedir) };
-	    eval { mkdir_p(dirname("$localedir/$_/$suffix")) };
-	    install_any::getAndSaveFile("$localedir/$_/$suffix");
+    -s $_->{mofile} and return $_->{name} foreach @possible_langs;
 
-	    -s $f and return $_;
+    if ($::isInstall && common::usingRamdisk()) {
+        foreach (@possible_langs) {
+            #- cleanup
+            eval { rm_rf($localedir) };
+            eval { mkdir_p(dirname($_->{mofile})) };
+
+	    install_any::getAndSaveFile($_->{mofile});
+	    -s $_->{mofile} and return $_->{name};
 	}
     }
     '';