From 875945d4a9a93205d8f9faa1212e166226a6d21b Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 27 Oct 2026 14:32:45 +0200 Subject: [PATCH] Properly pluralise architectures --- Mac/BuildScript/build-installer.py | 5 ++++- Mac/BuildScript/resources/ReadMe.rtf | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index f54a95b22e118f..c45430243343cc 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -1402,7 +1402,10 @@ def patchFile(inPath, outPath): data = data.replace('$FULL_VERSION', getFullVersion()) data = data.replace('$VERSION', getVersion()) data = data.replace('$MACOSX_DEPLOYMENT_TARGET', ''.join((DEPTARGET, ' or later'))) - data = data.replace('$ARCHITECTURES', ", ".join(universal_opts_map[UNIVERSALARCHS])) + archs = universal_opts_map[UNIVERSALARCHS] + data = data.replace('$ARCHITECTURES', ", ".join(archs)) + data = data.replace('$ARCHITECTURE_NOUN', + "architecture" if len(archs) == 1 else "architectures") data = data.replace('$INSTALL_SIZE', installSize()) data = data.replace('$THIRD_PARTY_LIBS', "\\\n".join(THIRD_PARTY_LIBS)) diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf index d19b542b7e6c5a..47f607d2f3c6ea 100644 --- a/Mac/BuildScript/resources/ReadMe.rtf +++ b/Mac/BuildScript/resources/ReadMe.rtf @@ -6,7 +6,7 @@ \margl1440\margr1440\vieww15140\viewh15740\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 -\f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\ +\f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET for the following $ARCHITECTURE_NOUN: $ARCHITECTURES.\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0