From a69af310ad9af129b1575ef2d1a8bf7203ab2523 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 15 Aug 2021 16:59:18 +0200
Subject: [PATCH] Use CFBundleLocalizations in internant sample Info.plist only

Remove this bundle key from the generic Info.plist files as it's not
really useful there because none of our samples except "internat" is
localized.

So just add a special Info.plist for this sample and add values
corresponding to all the languages for which we have translations to its
CFBundleLocalizations.
---
 samples/docview/Info.plist.in    |  7 -----
 samples/internat/Info.plist.in   | 49 ++++++++++++++++++++++++++++++++
 samples/internat/Makefile.in     |  4 +--
 samples/internat/internat.bkl    |  2 ++
 samples/minimal/Info_cocoa.plist |  7 -----
 src/osx/carbon/Info.plist.in     |  7 -----
 src/osx/iphone/Info.plist.in     |  7 -----
 7 files changed, 53 insertions(+), 30 deletions(-)
 create mode 100644 samples/internat/Info.plist.in

diff --git a/samples/docview/Info.plist.in b/samples/docview/Info.plist.in
index cbdb32a09a..dfed6e326f 100644
--- a/samples/docview/Info.plist.in
+++ b/samples/docview/Info.plist.in
@@ -58,13 +58,6 @@
 	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
-	<key>CFBundleLocalizations</key>
-	<array>
-		<string>de</string>
-		<string>en</string>
-		<string>fr</string>
-		<string>it</string>
-	</array>
 	<key>CFBundleLongVersionString</key>
 	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
 	<key>CFBundleName</key>
diff --git a/samples/internat/Info.plist.in b/samples/internat/Info.plist.in
new file mode 100644
index 0000000000..e06f424b0b
--- /dev/null
+++ b/samples/internat/Info.plist.in
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
+	<key>CFBundleIconFile</key>
+	<string>wxmac.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>ar</string>
+		<string>bg</string>
+		<string>cs</string>
+		<string>de</string>
+		<string>en</string>
+		<string>fr</string>
+		<string>it</string>
+		<string>ka</string>
+		<string>pl</string>
+		<string>ru</string>
+		<string>sv</string>
+		<string>ja</string>
+	</array>
+	<key>CFBundleLongVersionString</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+	<key>CFBundleName</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+	<key>ATSApplicationFontsPath</key>
+	<string>Fonts</string>
+	<key>NSPrincipalClass</key>
+	<string>wxNSApplication</string>
+</dict>
+</plist>
diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 9d36a6336e..4b983c0d49 100644
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -155,7 +155,7 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
 	$(CXX) -o $@ $(INTERNAT_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 	$(__internat___os2_emxbindcmd)
 
-@COND_PLATFORM_MACOSX_1@internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@internat.app/Contents/PkgInfo: internat$(EXEEXT) $(srcdir)/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@	mkdir -p internat.app/Contents
 @COND_PLATFORM_MACOSX_1@	mkdir -p internat.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@	mkdir -p internat.app/Contents/Resources
@@ -169,7 +169,7 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
 @COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/internat version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
 @COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
 @COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
-@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >internat.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(srcdir)/Info.plist.in >internat.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	/bin/echo "APPL????" >internat.app/Contents/PkgInfo
diff --git a/samples/internat/internat.bkl b/samples/internat/internat.bkl
index 33e0c06f58..73725f27e7 100644
--- a/samples/internat/internat.bkl
+++ b/samples/internat/internat.bkl
@@ -1,6 +1,8 @@
 <?xml version="1.0" ?>
 <makefile>
 
+    <set var="BUNDLE_PLIST">$(SRCDIR)/Info.plist.in</set>
+
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
     <exe id="internat" template="wx_sample" template_append="wx_append">
diff --git a/samples/minimal/Info_cocoa.plist b/samples/minimal/Info_cocoa.plist
index 6ce540c770..48d022555a 100644
--- a/samples/minimal/Info_cocoa.plist
+++ b/samples/minimal/Info_cocoa.plist
@@ -14,13 +14,6 @@
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
-	<key>CFBundleLocalizations</key>
-	<array>
-		<string>de</string>
-		<string>en</string>
-		<string>fr</string>
-		<string>it</string>
-	</array>
 	<key>CFBundleLongVersionString</key>
 	<string>3.1.6, (c) 2005-2021 wxWidgets</string>
 	<key>CFBundleName</key>
diff --git a/src/osx/carbon/Info.plist.in b/src/osx/carbon/Info.plist.in
index bbf00f1257..2485114502 100644
--- a/src/osx/carbon/Info.plist.in
+++ b/src/osx/carbon/Info.plist.in
@@ -14,13 +14,6 @@
 	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
-	<key>CFBundleLocalizations</key>
-	<array>
-		<string>de</string>
-		<string>en</string>
-		<string>fr</string>
-		<string>it</string>
-	</array>
 	<key>CFBundleLongVersionString</key>
 	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
 	<key>CFBundleName</key>
diff --git a/src/osx/iphone/Info.plist.in b/src/osx/iphone/Info.plist.in
index ee312dc1f8..d752993f88 100644
--- a/src/osx/iphone/Info.plist.in
+++ b/src/osx/iphone/Info.plist.in
@@ -12,13 +12,6 @@
 	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
-	<key>CFBundleLocalizations</key>
-	<array>
-		<string>de</string>
-		<string>en</string>
-		<string>fr</string>
-		<string>it</string>
-	</array>
 	<key>CFBundleLongVersionString</key>
 	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
 	<key>CFBundleName</key>