Date: prev next · Thread: first prev next last
2010 Archives by date, by thread · List index


This patch is public domain.
From bb46cc9b0af522ea5764995f0a1f0c3d98c0a3b1 Mon Sep 17 00:00:00 2001
Date: Mon, 25 Oct 2010 13:01:32 -0700
Subject: [PATCH] Bug fix for installer::languages::shorten_language_string()

Added the missing : to installer:languages::shorten_language_string() call in systemactions
Moved the chomp in shorten_language_string() to better imitate the original code.
---
 solenv/bin/modules/installer/languages.pm     |    2 +-
 solenv/bin/modules/installer/systemactions.pm |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm
index 29f3b78..1e9b597 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -378,13 +378,13 @@ sub get_java_language
 }
 
 sub shorten_language_string {
-    chomp;
     my $languagestring = shift;
     if (length($languagestring) > $installer::globals::max_lang_length )
     {
         my $number_of_languages = installer::systemactions::get_number_of_langs($languagestring);
         my $shorter = Digest::MD5->new($languagestring);
         $shorter =~s/ .*//g;
+        chomp $shorter;
         my $id = substr($shorter, 0, 8); # taking only the first 8 digits
         $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
     }
diff --git a/solenv/bin/modules/installer/systemactions.pm 
b/solenv/bin/modules/installer/systemactions.pm
index 0c39477..bade02c 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -398,7 +398,7 @@ sub create_directories
 
         if (!($locallanguagesref eq "" ))      # this will be a path like "01_49", for Profiles 
and ConfigurationFiles, idt-Files
         {
-            my $languagestring = installer:languages::shorten_language_string($$languagesref);
+            my $languagestring = installer::languages::shorten_language_string($$languagesref);
 
             $path = $path . $languagestring  . $installer::globals::separator;
             create_directory($path);
-- 
1.6.2.5


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.