From 781560d6a1e432e3f2dd178af3b4c21194fc1080 Mon Sep 17 00:00:00 2001
From: Gogades <gogades@gmail.com>
Date: Wed, 21 Oct 2026 15:57:37 -0400
Subject: [PATCH] On Apple products, display cmd/opt in the shortcut help

---
 .../components/workplane/ShortcutsModal.tsx   | 30 +++++++++++++++----
 apps/web/src/lib/messages.ar.ts               |  1 -
 apps/web/src/lib/messages.cs.ts               |  1 -
 apps/web/src/lib/messages.da.ts               |  1 -
 apps/web/src/lib/messages.de.ts               |  1 -
 apps/web/src/lib/messages.en.ts               |  1 -
 apps/web/src/lib/messages.fr.ts               |  1 -
 apps/web/src/lib/messages.hu.ts               |  1 -
 apps/web/src/lib/messages.it.ts               |  1 -
 apps/web/src/lib/messages.ja.ts               |  1 -
 apps/web/src/lib/messages.nl.ts               |  1 -
 apps/web/src/lib/messages.pl.ts               |  1 -
 apps/web/src/lib/messages.pt-br.ts            |  1 -
 apps/web/src/lib/messages.ru.ts               |  1 -
 apps/web/src/lib/messages.sl.ts               |  1 -
 apps/web/src/lib/messages.tr.ts               |  1 -
 16 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/apps/web/src/components/workplane/ShortcutsModal.tsx b/apps/web/src/components/workplane/ShortcutsModal.tsx
index a96d0b20..1bb3872d 100644
--- a/apps/web/src/components/workplane/ShortcutsModal.tsx
+++ b/apps/web/src/components/workplane/ShortcutsModal.tsx
@@ -185,7 +185,27 @@ function comboKeys(combo: string) {
   return parts.length > 0 ? parts : [combo];
 }
 
-function ShortcutKeys({ combos }: { combos: string[] }) {
+/**
+ * Whether the keyboard is an Apple one - a Mac, or an iPad with a keyboard,
+ * which reports itself as a Mac. Browsers do not say "Darwin"; the user agent
+ * says Macintosh. The editor takes Cmd wherever it takes Ctrl, and Option is
+ * Alt, so the list shows the keys under the names on that keyboard.
+ */
+function appleKeyboard() {
+  return typeof navigator !== "undefined" && /Macintosh|Mac OS X|iPhone|iPad|iPod/.test(navigator.userAgent);
+}
+
+const APPLE_KEY_NAMES: Record<string, string> = { Ctrl: "Cmd", Alt: "Option" };
+
+function keyLabel(key: string, apple: boolean) {
+  if (key === "Click") return t("shortcuts.click");
+  if (key === "RightClick") return t("shortcuts.rightClick");
+  if (key === "Drag") return t("shortcuts.drag");
+  if (key === "Wheel") return t("shortcuts.wheel");
+  return apple ? APPLE_KEY_NAMES[key] ?? key : key;
+}
+
+function ShortcutKeys({ combos, apple }: { combos: string[]; apple: boolean }) {
   return (
     <>
       {combos.map((combo, comboIndex) => (
@@ -195,7 +215,7 @@ function ShortcutKeys({ combos }: { combos: string[] }) {
             {comboKeys(combo).map((key, keyIndex) => (
               <Fragment key={key}>
                 {keyIndex > 0 ? <span className="shortcuts-plus" aria-hidden="true">+</span> : null}
-                <kbd>{key === "Click" ? t("shortcuts.click") : key === "RightClick" ? t("shortcuts.rightClick") : key === "Drag" ? t("shortcuts.drag") : key === "Wheel" ? t("shortcuts.wheel") : key}</kbd>
+                <kbd>{keyLabel(key, apple)}</kbd>
               </Fragment>
             ))}
           </span>
@@ -207,6 +227,7 @@ function ShortcutKeys({ combos }: { combos: string[] }) {
 
 /** The groups with their rows, the same markup in the window and on the printed sheet. */
 function ShortcutGroups({ groups }: { groups: ShortcutGroup[] }) {
+  const apple = appleKeyboard();
   return (
     <div className="shortcuts-groups">
       {groups.map((group) => (
@@ -217,7 +238,7 @@ function ShortcutGroups({ groups }: { groups: ShortcutGroup[] }) {
               <div className="shortcuts-row" key={`${group.title}:${shortcut.label}`}>
                 <dt>{t(shortcut.label)}</dt>
                 <dd>
-                  <ShortcutKeys combos={shortcut.combos} />
+                  <ShortcutKeys combos={shortcut.combos} apple={apple} />
                 </dd>
               </div>
             ))}
@@ -309,9 +330,6 @@ export function ShortcutsModal({ sketchMode, onClose }: { sketchMode: boolean; o
             <p className="shortcuts-intro">{t("shortcuts.intro")}</p>
             <ShortcutGroups groups={groups} />
           </div>
-          <div className="workspace-modal-footer">
-            <span>{t("shortcuts.footer")}</span>
-          </div>
         </div>
       </div>
       <button className="workspace-modal-backdrop" aria-label={t("shortcuts.close")} onClick={onClose} />
diff --git a/apps/web/src/lib/messages.ar.ts b/apps/web/src/lib/messages.ar.ts
index b91d1daa..a2b2c897 100644
--- a/apps/web/src/lib/messages.ar.ts
+++ b/apps/web/src/lib/messages.ar.ts
@@ -739,7 +739,6 @@ export const MESSAGES_AR: Partial<Record<MessageKey, string>> = {
   "shortcuts.click": "نقرة",
   "shortcuts.rightClick": "نقرة بالزر الأيمن",
   "shortcuts.drag": "سحب",
-  "shortcuts.footer": "على أجهزة Mac، استخدم Cmd أينما كُتب Ctrl.",
   "shortcuts.group.selection": "التحديد",
   "shortcuts.group.clipboard": "الحافظة",
   "shortcuts.group.history": "السجل",
diff --git a/apps/web/src/lib/messages.cs.ts b/apps/web/src/lib/messages.cs.ts
index 7883ebff..2c9c56a9 100644
--- a/apps/web/src/lib/messages.cs.ts
+++ b/apps/web/src/lib/messages.cs.ts
@@ -809,7 +809,6 @@ export const MESSAGES_CS: Record<MessageKey, string> = {
   "shortcuts.click": "Kliknutí",
   "shortcuts.rightClick": "Pravé tlačítko",
   "shortcuts.drag": "Tažení",
-  "shortcuts.footer": "Na Macu použijte Cmd místo uvedeného Ctrl.",
   "shortcuts.group.selection": "Výběr",
   "shortcuts.group.clipboard": "Schránka",
   "shortcuts.group.history": "Historie",
diff --git a/apps/web/src/lib/messages.da.ts b/apps/web/src/lib/messages.da.ts
index ee33954a..58881893 100644
--- a/apps/web/src/lib/messages.da.ts
+++ b/apps/web/src/lib/messages.da.ts
@@ -715,7 +715,6 @@ export const MESSAGES_DA: Partial<Record<MessageKey, string>> = {
   "shortcuts.click": "Klik",
   "shortcuts.rightClick": "Højreklik",
   "shortcuts.drag": "Træk",
-  "shortcuts.footer": "På en Mac, brug Cmd hvor end der står Ctrl.",
   "shortcuts.group.selection": "Markering",
   "shortcuts.group.clipboard": "Udklipsholder",
   "shortcuts.group.history": "Historik",
diff --git a/apps/web/src/lib/messages.de.ts b/apps/web/src/lib/messages.de.ts
index 7cfd9a75..9f75b22e 100644
--- a/apps/web/src/lib/messages.de.ts
+++ b/apps/web/src/lib/messages.de.ts
@@ -730,7 +730,6 @@ export const MESSAGES_DE: Record<MessageKey, string> = {
   "shortcuts.click": "Klick",
   "shortcuts.rightClick": "Rechtsklick",
   "shortcuts.drag": "Ziehen",
-  "shortcuts.footer": "Auf dem Mac gilt überall dort Cmd, wo Ctrl steht.",
   "shortcuts.group.selection": "Auswahl",
   "shortcuts.group.clipboard": "Zwischenablage",
   "shortcuts.group.history": "Verlauf",
diff --git a/apps/web/src/lib/messages.en.ts b/apps/web/src/lib/messages.en.ts
index bea39b62..baa69d57 100644
--- a/apps/web/src/lib/messages.en.ts
+++ b/apps/web/src/lib/messages.en.ts
@@ -731,7 +731,6 @@ export const MESSAGES_EN = {
   "shortcuts.click": "Click",
   "shortcuts.rightClick": "Right click",
   "shortcuts.drag": "Drag",
-  "shortcuts.footer": "On a Mac, use Cmd wherever Ctrl is listed.",
   "shortcuts.group.selection": "Selection",
   "shortcuts.group.clipboard": "Clipboard",
   "shortcuts.group.history": "History",
diff --git a/apps/web/src/lib/messages.fr.ts b/apps/web/src/lib/messages.fr.ts
index 0a7707eb..1eb6ac5e 100644
--- a/apps/web/src/lib/messages.fr.ts
+++ b/apps/web/src/lib/messages.fr.ts
@@ -721,7 +721,6 @@ export const MESSAGES_FR: Partial<Record<MessageKey, string>> = {
   "shortcuts.click": "Cliquez",
   "shortcuts.rightClick": "Clic droit",
   "shortcuts.drag": "Faites glisser",
-  "shortcuts.footer": "Sur un Mac, utilisez Cmd partout où Ctrl est répertorié.",
   "shortcuts.group.selection": "Sélection",
   "shortcuts.group.clipboard": "Presse-papiers",
   "shortcuts.group.history": "Histoire",
diff --git a/apps/web/src/lib/messages.hu.ts b/apps/web/src/lib/messages.hu.ts
index 82f3777e..8a14f162 100644
--- a/apps/web/src/lib/messages.hu.ts
+++ b/apps/web/src/lib/messages.hu.ts
@@ -694,7 +694,6 @@ export const MESSAGES_HU: Partial<Record<MessageKey, string>> = {
   "shortcuts.click": "Kattintás",
   "shortcuts.rightClick": "Jobb kattintás",
   "shortcuts.drag": "Húzás",
-  "shortcuts.footer": "Macen a Ctrl helyett mindenhol a Cmd-t használd.",
   "shortcuts.group.selection": "Kijelölés",
   "shortcuts.group.clipboard": "Vágólap",
   "shortcuts.group.history": "Előzmények",
diff --git a/apps/web/src/lib/messages.it.ts b/apps/web/src/lib/messages.it.ts
index 363a1936..0aadaa78 100644
--- a/apps/web/src/lib/messages.it.ts
+++ b/apps/web/src/lib/messages.it.ts
@@ -694,7 +694,6 @@ export const MESSAGES_IT: Partial<Record<MessageKey, string>> = {
   "shortcuts.click": "Clic",
   "shortcuts.rightClick": "Clic destro",
   "shortcuts.drag": "Trascina",
-  "shortcuts.footer": "Su Mac, usa Cmd al posto di Ctrl quando indicato.",
   "shortcuts.group.selection": "Selezione",
   "shortcuts.group.clipboard": "Appunti",
   "shortcuts.group.history": "Cronologia",
diff --git a/apps/web/src/lib/messages.ja.ts b/apps/web/src/lib/messages.ja.ts
index 29eabd0e..da8b2574 100644
--- a/apps/web/src/lib/messages.ja.ts
+++ b/apps/web/src/lib/messages.ja.ts
@@ -721,7 +721,6 @@ export const MESSAGES_JA: Partial<Record<MessageKey, string>> = {
   "shortcuts.click": "クリック",
   "shortcuts.rightClick": "右クリック",
   "shortcuts.drag": "ドラッグ",
-  "shortcuts.footer": "Macでは、Ctrlと書かれている箇所でCmdを使ってください。",
   "shortcuts.group.selection": "選択",
   "shortcuts.group.clipboard": "クリップボード",
   "shortcuts.group.history": "履歴",
diff --git a/apps/web/src/lib/messages.nl.ts b/apps/web/src/lib/messages.nl.ts
index 93c97417..6860617f 100644
--- a/apps/web/src/lib/messages.nl.ts
+++ b/apps/web/src/lib/messages.nl.ts
@@ -730,7 +730,6 @@ export const MESSAGES_NL: Record<MessageKey, string> = {
   "shortcuts.click": "Klik",
   "shortcuts.rightClick": "Rechtsklik",
   "shortcuts.drag": "Slepen",
-  "shortcuts.footer": "Gebruik op een Mac Cmd overal waar Ctrl staat.",
   "shortcuts.group.selection": "Selectie",
   "shortcuts.group.clipboard": "Klembord",
   "shortcuts.group.history": "Geschiedenis",
diff --git a/apps/web/src/lib/messages.pl.ts b/apps/web/src/lib/messages.pl.ts
index 45731488..0a282b9c 100644
--- a/apps/web/src/lib/messages.pl.ts
+++ b/apps/web/src/lib/messages.pl.ts
@@ -736,7 +736,6 @@ export const MESSAGES_PL: Partial<Record<MessageKey, string>> = {
   "shortcuts.click": "Klik",
   "shortcuts.rightClick": "Prawy klik",
   "shortcuts.drag": "Przeciągnij",
-  "shortcuts.footer": "Na Macu używaj Cmd wszędzie tam, gdzie podano Ctrl.",
   "shortcuts.group.selection": "Zaznaczanie",
   "shortcuts.group.clipboard": "Schowek",
   "shortcuts.group.history": "Historia",
diff --git a/apps/web/src/lib/messages.pt-br.ts b/apps/web/src/lib/messages.pt-br.ts
index fbb3c47b..f69438f2 100644
--- a/apps/web/src/lib/messages.pt-br.ts
+++ b/apps/web/src/lib/messages.pt-br.ts
@@ -1703,7 +1703,6 @@ export const MESSAGES_PT_BR: Partial<Record<MessageKey, string>> = {
   "shortcuts.click": "Clique",
   "shortcuts.rightClick": "Clique direito",
   "shortcuts.drag": "Arraste",
-  "shortcuts.footer": "No Mac, use Cmd onde aparece Ctrl.",
   "shortcuts.group.selection": "Seleção",
   "shortcuts.group.clipboard": "Área de transferência",
   "shortcuts.group.history": "Histórico",
diff --git a/apps/web/src/lib/messages.ru.ts b/apps/web/src/lib/messages.ru.ts
index 159aa74c..20c2ff33 100644
--- a/apps/web/src/lib/messages.ru.ts
+++ b/apps/web/src/lib/messages.ru.ts
@@ -727,7 +727,6 @@ export const MESSAGES_RU: Partial<Record<MessageKey, string>> = {
   "shortcuts.click": "Щелчок",
   "shortcuts.rightClick": "Правый щелчок",
   "shortcuts.drag": "Перетаскивание",
-  "shortcuts.footer": "На Mac используйте Cmd везде, где указан Ctrl.",
   "shortcuts.group.selection": "Выделение",
   "shortcuts.group.clipboard": "Буфер обмена",
   "shortcuts.group.history": "История",
diff --git a/apps/web/src/lib/messages.sl.ts b/apps/web/src/lib/messages.sl.ts
index 6f727057..7f746779 100644
--- a/apps/web/src/lib/messages.sl.ts
+++ b/apps/web/src/lib/messages.sl.ts
@@ -620,7 +620,6 @@ export const MESSAGES_SL: Partial<Record<MessageKey, string>> = {
   "shortcuts.click": "Klik",
   "shortcuts.rightClick": "Desni klik",
   "shortcuts.drag": "Vleci",
-  "shortcuts.footer": "Na Macu uporabi Cmd povsod, kjer je navedeno Ctrl.",
   "shortcuts.group.selection": "Izbor",
   "shortcuts.group.clipboard": "Odložišče",
   "shortcuts.group.history": "Zgodovina",
diff --git a/apps/web/src/lib/messages.tr.ts b/apps/web/src/lib/messages.tr.ts
index 151a2e83..43f0adef 100644
--- a/apps/web/src/lib/messages.tr.ts
+++ b/apps/web/src/lib/messages.tr.ts
@@ -703,7 +703,6 @@ export const MESSAGES_TR: Partial<Record<MessageKey, string>> = {
   "shortcuts.click": "Tık",
   "shortcuts.rightClick": "Sağ tık",
   "shortcuts.drag": "Sürükle",
-  "shortcuts.footer": "Mac'te Ctrl yazan her yerde Cmd kullan.",
   "shortcuts.group.selection": "Seçim",
   "shortcuts.group.clipboard": "Pano",
   "shortcuts.group.history": "Geçmiş",