The Oxford comma, always, the one-line description included

Every list of three or more takes the serial comma: the one-liner in
pyproject.toml, meshterm/__init__.py, and --help ("USB, Bluetooth, or TCP",
"Windows, macOS, and Linux"), the README, the changelog, the manuals, the
issue and PR templates, and six strings the app shows (the region-name
rule, a repeater setting's help, the diagnostics tool's description, and
the archive confirms). The Windows-console notice is rewrapped so its
comma keeps it inside 72 columns.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Jean-Pierre MartineauandClaude Opus 5.5 committed 2026-09-25 21:28:00 -04:00
1 parent 5d0bf52717
commit b7a1ad47c2
21 files changed
+46 -46

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
"""MeshTerm is a full-featured TUI MeshCore client for your terminal.
Connects to a companion over USB, Bluetooth or TCP. For Windows, macOS and Linux.
Connects to a companion over USB, Bluetooth, or TCP. For Windows, macOS, and Linux.
"""
from datetime import datetime
+5 -5
View File
@@ -127,8 +127,8 @@ app = typer.Typer(
# `meshterm.__doc__` — if this drifts from that, one of them is lying.
help=(
"MeshTerm is a full-featured TUI MeshCore client for your terminal. "
"Connects to a companion over USB, Bluetooth or TCP. "
"For Windows, macOS and Linux."
"Connects to a companion over USB, Bluetooth, or TCP. "
"For Windows, macOS, and Linux."
),
epilog=EXIT_STATUS_EPILOG,
)
@@ -593,9 +593,9 @@ def _report_no_windows_console(console: Console) -> None:
console.print()
console.print("That usually means one of two things:")
console.print()
console.print(" • You are in Git Bash, MSYS or Cygwin. Those are not Windows consoles.")
console.print(" Open [accent]Windows Terminal[/accent] or [accent]PowerShell[/accent]")
console.print(" and run it from there.")
console.print(" • You are in Git Bash, MSYS, or Cygwin, which are not Windows")
console.print(" consoles. Open [accent]Windows Terminal[/accent] or")
console.print(" [accent]PowerShell[/accent] and run it from there.")
console.print(" • The output is piped or redirected somewhere. The full-screen menu")
console.print(" needs the terminal itself.")
console.print()
+1 -1
View File
@@ -513,7 +513,7 @@ def validate_new_name(name: str, taken: Iterable[str] = ()) -> str:
bad = sorted({ch for ch in bare if not _is_name_char(ch)})
if bad:
raise RegionNameError(
f"a repeater refuses {' '.join(bad)} in a region name — letters, digits and - only"
f"a repeater refuses {' '.join(bad)} in a region name — letters, digits, and - only"
)
if bare in set(taken):
raise RegionNameError(f"{bare} is already a region here")
+1 -1
View File
@@ -543,7 +543,7 @@ REPEATER_SETTINGS: tuple[RemoteSetting, ...] = (
label="Bridge type",
category="Bridge",
writable=False,
help="The bridge this firmware was built with: none, rs232 or espnow",
help="The bridge this firmware was built with: none, rs232, or espnow",
),
RemoteSetting(
key="bridge.enabled",
+1 -1
View File
@@ -55,7 +55,7 @@ class DiagnosticsTool(Tool):
name = "diagnostics"
title = "Diagnostics"
icon = "🩺"
help = "Version, host, terminal and device facts for a bug report"
help = "Version, host, terminal, and device facts for a bug report"
category = "This app"
order = 7 # after Preferences (the row that changes MeshTerm), before the pages
+1 -1
View File
@@ -1598,7 +1598,7 @@ async def _archive_contact(ctx: AppContext, contact: Contact, self_key: str, lab
)
prompt.append(
"? It comes off this device's contact list, freeing a slot for a new one. MeshTerm "
"keeps it — with its key, reception history and messages — and you can restore it "
"keeps it — with its key, reception history, and messages — and you can restore it "
"at any time.",
style="warn",
)
+1 -1
View File
@@ -629,7 +629,7 @@ async def _add_region(
prompt=f"Name of the new region, {inside}:",
default=values[slot] or "",
validate=check,
help_text="letters, digits and -, up to 30 bytes",
help_text="letters, digits, and -, up to 30 bytes",
floating=True,
)
return typed.strip() if typed else None
+1 -1
View File
@@ -661,7 +661,7 @@ async def _sweep(ctx: AppContext, self_key: str, victims: list[ScoredContact]) -
if not await ctx.ui.dialog(
f"Archive {_count_desc(len(victims))}? They come off this device's contact list, "
"freeing space for new ones. MeshTerm keeps them — with their keys, reception "
"history and messages — under Archived contacts, and any of them can be restored.",
"history, and messages — under Archived contacts, and any of them can be restored.",
[("Cancel", False), ("Archive", True)],
title="Archive contacts",
default=1,