[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/simplepackage.pm |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit b4d2b39cb9e46cb0b09d5c1f3d3dadfeb16c30d2
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 8 11:38:56 2015 +0200

    tdf#78834 enable localized system dialogs on OS X
    
    Change-Id: I37f5b183b36f2a3077f591162402ddd83e4a46d4
    Reviewed-on: https://gerrit.libreoffice.org/15673
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 2df138b483f60ffdcd3b62c8c2884d2f5cc076af)
    Reviewed-on: https://gerrit.libreoffice.org/15674
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index ae91d0c..d70394e 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -393,10 +393,16 @@ sub create_package
 
             chdir $localfrom;
         }
-        else
+        elsif ($volume_name_classic_app eq 'LibreOffice' || $volume_name_classic_app eq 'LibreOfficeDev')
         {
-            if (($volume_name_classic_app eq 'LibreOffice' || $volume_name_classic_app eq 'LibreOfficeDev') &&
-                defined($ENV{'MACOSX_CODESIGNING_IDENTITY'}) && $ENV{'MACOSX_CODESIGNING_IDENTITY'} ne "" )
+            my $subdir = "$tempdir/$packagename/$volume_name_classic_app.app/Contents/Resources";
+            if ( ! -d $subdir ) { installer::systemactions::create_directory($subdir); }
+            # iterate over OS X localizations
+            foreach $lang ("ca", "cs", "da", "de", "el", "en", "es", "fi", "fr", "hr", "hu", "id", "it", "ja", "ko", "ms", "nl", "no", "pl", "pt", "pt_PT", "ro", "ru", "sk", "sv", "th", "tr", "uk", "vi", "zh_CN", "zh_TW")
+            {
+                installer::systemactions::create_directory($subdir . "/" . $lang . ".lproj");
+            }
+            if ( defined($ENV{'MACOSX_CODESIGNING_IDENTITY'}) && $ENV{'MACOSX_CODESIGNING_IDENTITY'} ne "" )
             {
                 $systemcall = "$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle $localtempdir/$folder/$volume_name_classic_app.app";
                 print "... $systemcall ...\n";