Merge pull request #8309 from nextcloud/bugfix/file-picker-lang

fix(cmake): Generate CFBundleLocalizations for macOS Info.plist
2025-10-26 11:17:43 +00:00 · 2025-06-02 15:15:14 +02:00 · 2025-06-02 15:15:14 +02:00 · ff3bea62d1
commit ff3bea62d1
parent c92359ae61 bc102fc06b
2 changed files with 100 additions and 86 deletions
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@ -18,3 +18,17 @@ configure_file(macosx.entitlements.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.enti
 configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
 configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
 configure_file(post_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/post_install.sh)
+
+# Generate CFBundleLocalizations for MacOSXBundleInfo.plist.in
+file(GLOB_RECURSE TS_FILES RELATIVE ${CMAKE_SOURCE_DIR} "${CMAKE_SOURCE_DIR}/translations/client_*.ts")
+set(LOCALIZATIONS_LIST "")
+foreach(TS_FILE ${TS_FILES})
+    get_filename_component(LANG_CODE ${TS_FILE} NAME_WE) # client_en_GB
+    string(REPLACE "client_" "" LANG_CODE ${LANG_CODE}) # en_GB
+    string(REPLACE "_" "-" LANG_CODE ${LANG_CODE}) # en-GB
+    set(LOCALIZATIONS_LIST "${LOCALIZATIONS_LIST}        <string>${LANG_CODE}</string>\n")
+endforeach()
+if(LOCALIZATIONS_LIST)
+    string(STRIP "${LOCALIZATIONS_LIST}" LOCALIZATIONS_LIST)
+endif()
+set(MACOSX_BUNDLE_LOCALIZATIONS "${LOCALIZATIONS_LIST}" CACHE INTERNAL "Generated list of localizations for macOS bundle" FORCE)
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@ -2,93 +2,93 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-        <key>NSPrincipalClass</key>
-        <string>NSApplication</string>
-        <key>LSMinimumSystemVersion</key>
-        <string>12.0</string>
-        <key>LSUIElement</key>
-        <true/>
-        <key>CFBundleDevelopmentRegion</key>
-        <string>en</string>
-        <key>CFBundleAllowMixedLocalizations</key>
-        <true/>
-        <key>CFBundleExecutable</key>
-        <string>@APPLICATION_NAME@</string>
-        <key>CFBundleIconFile</key>
-        <string>@APPLICATION_ICON_NAME@.icns</string>
-        <key>CFBundleIdentifier</key>
-        <string>@APPLICATION_REV_DOMAIN@</string>
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>6.0</string>
-        <key>CFBundleLongVersionString</key>
-        <string>@APPLICATION_NAME_XML_ESCAPED@ @MIRALL_VERSION_STRING@</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>CFBundleSignature</key>
-        <string>????</string>
-        <key>CFBundleVersion</key>
-        <string>@MIRALL_VERSION_FULL@</string>
-        <key>CFBundleShortVersionString</key>
-        <string>@MIRALL_VERSION_STRING@</string>
-        <key>NSHumanReadableCopyright</key>
-        <string>(C) 2014-2025 @APPLICATION_VENDOR_XML_ESCAPED@</string>
-        <key>NSSupportsAutomaticGraphicsSwitching</key>
-        <true/>
-        <key>NSRequiresAquaSystemAppearance</key>
-        <false/>
-        <key>SUShowReleaseNotes</key>
-        <false/>
-        <key>SUPublicDSAKeyFile</key>
-        <string>dsa_pub.pem</string>
-        <key>SUPublicEDKey</key>
-        <string>c3RcfDWDayvsYSZW8FhZN1UOJhvPVN30zleb4zOqbtU=</string>
-
-<key>UTExportedTypeDeclarations</key>
-<array>
-    <dict>
-        <key>UTTypeIdentifier</key>
-        <string>@APPLICATION_REV_DOMAIN@.VIRTUALFILE</string>
-        <key>UTTypeTagSpecification</key>
+    <key>NSPrincipalClass</key>
+    <string>NSApplication</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>12.0</string>
+    <key>LSUIElement</key>
+    <true/>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleAllowMixedLocalizations</key>
+    <true/>
+    <key>CFBundleLocalizations</key>
+    <array>
+@MACOSX_BUNDLE_LOCALIZATIONS@
+    </array>
+    <key>CFBundleExecutable</key>
+    <string>@APPLICATION_NAME@</string>
+    <key>CFBundleIconFile</key>
+    <string>@APPLICATION_ICON_NAME@.icns</string>
+    <key>CFBundleIdentifier</key>
+    <string>@APPLICATION_REV_DOMAIN@</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleLongVersionString</key>
+    <string>@APPLICATION_NAME_XML_ESCAPED@ @MIRALL_VERSION_STRING@</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>@MIRALL_VERSION_FULL@</string>
+    <key>CFBundleShortVersionString</key>
+    <string>@MIRALL_VERSION_STRING@</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>(C) 2014-2025 @APPLICATION_VENDOR_XML_ESCAPED@</string>
+    <key>NSSupportsAutomaticGraphicsSwitching</key>
+    <true/>
+    <key>NSRequiresAquaSystemAppearance</key>
+    <false/>
+    <key>SUShowReleaseNotes</key>
+    <false/>
+    <key>SUPublicDSAKeyFile</key>
+    <string>dsa_pub.pem</string>
+    <key>SUPublicEDKey</key>
+    <string>c3RcfDWDayvsYSZW8FhZN1UOJhvPVN30zleb4zOqbtU=</string>
+    <key>UTExportedTypeDeclarations</key>
+    <array>
        <dict>
-            <key>public.filename-extension</key>
-            <string>@APPLICATION_VIRTUALFILE_SUFFIX@</string>
-            <key>public.mime-type</key>
-            <string>application/octet-stream</string>
-        </dict>
-        <key>UTTypeConformsTo</key>
-         <array>
-             <string>public.data</string>
-         </array>
-    </dict>
-</array>
-
-<key>CFBundleDocumentTypes</key>
-<array>
-    <dict>
-        <key>CFBundleTypeName</key>
-        <string>@APPLICATION_EXECUTABLE@ Download Virtual File</string>
-        <key>CFBundleTypeRole</key>
-        <string>Editor</string>
-        <key>LSHandlerRank</key>
-        <string>Owner</string>
-        <key>LSItemContentTypes</key>
-        <array>
+            <key>UTTypeIdentifier</key>
            <string>@APPLICATION_REV_DOMAIN@.VIRTUALFILE</string>
-        </array>
-    </dict>
-</array>
-
-<key>CFBundleURLTypes</key>
-<array>
-    <dict>
-        <key>CFBundleURLName</key>
-        <string>@APPLICATION_NAME@ Edit Locally</string>
-        <key>CFBundleURLSchemes</key>
-        <array>
-            <string>@APPLICATION_URI_HANDLER_SCHEME@</string>
-        </array>
-    </dict>
-</array>
-
+            <key>UTTypeTagSpecification</key>
+            <dict>
+                <key>public.filename-extension</key>
+                <string>@APPLICATION_VIRTUALFILE_SUFFIX@</string>
+                <key>public.mime-type</key>
+                <string>application/octet-stream</string>
+            </dict>
+            <key>UTTypeConformsTo</key>
+            <array>
+                <string>public.data</string>
+            </array>
+        </dict>
+    </array>
+    <key>CFBundleDocumentTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleTypeName</key>
+            <string>@APPLICATION_EXECUTABLE@ Download Virtual File</string>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>LSHandlerRank</key>
+            <string>Owner</string>
+            <key>LSItemContentTypes</key>
+            <array>
+                <string>@APPLICATION_REV_DOMAIN@.VIRTUALFILE</string>
+            </array>
+        </dict>
+    </array>
+    <key>CFBundleURLTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleURLName</key>
+            <string>@APPLICATION_NAME@ Edit Locally</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>@APPLICATION_URI_HANDLER_SCHEME@</string>
+            </array>
+        </dict>
+    </array>
 </dict>
 </plist>