diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-05-11 22:26:29 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-06-11 13:10:37 +0200 |
| commit | 8d8f6ab952b699756fc9a17f979933b311502770 (patch) | |
| tree | 782d3f3caa52c3d3e1ffb50e98afbbfa7d8f2b1f | |
| parent | Remove potential old leftover before moving the app bundle (diff) | |
| download | core-8d8f6ab952b699756fc9a17f979933b311502770.tar.gz core-8d8f6ab952b699756fc9a17f979933b311502770.zip | |
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
Conflicts:
Makefile.in
(cherry picked from commit e013f39a3fe928ea22cdde6e0da1c3fe8072c588)
| -rw-r--r-- | Makefile.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 1df8ef36b3d9..7ceabf3347b9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -304,14 +304,13 @@ ifeq ($(OS_FOR_BUILD),WNT) else @$(SRCDIR)/solenv/bin/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 rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin @$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app |