mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-10-21 11:19:11 -05:00
fix: keep a RetroPie list's comma before its and
quasi88 writes its list "N88KNJ2.ROM, and N88SUB.ROM". Extended with N88EXT0.ROM, which QUASI88kai reads, it came back as "N88SUB.ROM and N88EXT0.ROM": every list was rewritten in one idiom. A list that puts a comma before its final and keeps it.
This commit is contained in:
1 parent
c3af859621
commit
6d38e597db
2 files changed
+17
-4
No files matched your search
@@ -250,11 +250,13 @@ class Exporter(BaseExporter):
|
||||
return core in required_by
|
||||
|
||||
@staticmethod
|
||||
def _join(names: list[str]) -> str:
|
||||
"""RetroPie's own idiom: a, b and c."""
|
||||
def _join(names: list[str], serial: bool = False) -> str:
|
||||
"""RetroPie's own idiom: a, b and c, or a, b, and c where the
|
||||
sentence already writes the comma before its final and."""
|
||||
if len(names) == 1:
|
||||
return names[0]
|
||||
return ", ".join(names[:-1]) + " and " + names[-1]
|
||||
last = ", and " if serial and len(names) > 2 else " and "
|
||||
return ", ".join(names[:-1]) + last + names[-1]
|
||||
|
||||
@classmethod
|
||||
def _extended(
|
||||
@@ -269,7 +271,8 @@ class Exporter(BaseExporter):
|
||||
name: appending ", c and d" after "a and b" read "a and b, c and d".
|
||||
"""
|
||||
start, end, written = enumeration
|
||||
return help_text[:start] + cls._join([*written, *missing]) + help_text[end:]
|
||||
serial = ", and " in help_text[start:end]
|
||||
return help_text[:start] + cls._join([*written, *missing], serial) + help_text[end:]
|
||||
|
||||
def modules(self, originals: dict[str, str]) -> dict[str, tuple[str, str]]:
|
||||
"""Module id and help string of every script that mentions BIOS."""
|
||||
|
||||
Reference in new issue
Block a user