[Libreoffice-commits] .: Branch 'libreoffice-3-3' - solenv/bin

[Michael Meeks]

 solenv/bin/modules/installer/download.pm |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 62634add0bea36cb9a914d629a57c1dd53d1544c
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Nov 30 16:58:24 2010 +0000

    get substitution order right for overlapping variables

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index b6c3d37..073516e 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1708,7 +1708,8 @@ sub replace_variables
 {
     my ($translationfile, $variableshashref) = @_;
 
-    foreach $key (keys %{$variableshashref})
+    # we want to substitute FOO_BR before FOO to avoid floating _BR suffixes
+    foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref})
     {
         my $value = $variableshashref->{$key};