diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-05-11 22:26:29 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-03-04 11:29:50 +0100 |
| commit | 6e9a41dbc25402350e4b767d8f10e8e855f7531a (patch) | |
| tree | 55d7915270a7411dc56e8da71cbeb693e4df2615 /Makefile.in | |
| parent | ca3e8b0299b3a3f6e8029a47cb7391512c49ac4a (diff) | |
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 packaged 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.
Conflicts:
Makefile.in
(cherry picked from commit 91902ef1411943f65da296fefd15fff9170d9c0c)
Change-Id: I9c502cdf737b497ca2ceef8f3c535ccfea2f6134
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 8e84f4682517..ff8f36ba0334 100644 --- a/Makefile.in +++ b/Makefile.in @@ -306,14 +306,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 # |