[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - Makefile.in

[Andras Timar]

 Makefile.in |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 20116a1ef0d860d55a216082ff9593f4af799015
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon May 11 22:26:29 2015 +0200

    create empty .lproj directories for languages supported by OS X
    
    The previous solution had problems. InfoPlist.strings were empty,
    because localization has not been working since the CFBundleTypeIconFile
    entries were removed from Info.plist. Icon file basename was the key
    in documents.ulf. So we packages 0 bytes long files. The second problem
    was that we used LibreOffice language codes, and OS X language codes are
    different in some cases. This caused problems such as French strings on
    English UI (e.g. Open/Save dialogs), because the system did not
    recognize en-US.lproj and en-GB.lproj, and fell back to the next one: fr.
    
    Change-Id: I9c502cdf737b497ca2ceef8f3c535ccfea2f6134

diff --git a/Makefile.in b/Makefile.in
index ec2a9b6..445d22b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -295,13 +295,10 @@ else
 	@ooinstall $(TESTINSTALLDIR)
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
 #
-# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj directories.
-	set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \
-		bn=`basename $$F .zip`; \
-		lang=$${bn#InfoPlist_}; \
+# Create Resources/*.lproj directories for languages supported by OS X
+	set -x; for lang in 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; do \
 		lproj=$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \
 		mkdir $$lproj; \
-		(cd $$lproj; unzip $$F); \
 	done
 #
 # And remove the "bin" folder which should not be there