[3.15] macOS installer: Properly pluralise "architectures" (GH-160759) (#161163)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>

Author: miss-islington

Mac/BuildScript/build-installer.py

@@ -1403,7 +1403,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))
 

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