fix(KeyboardShortcuts): correctly localize shortcuts on windows

specify · Jul 14, 2024 · d3623a8 · d3623a8
1 parent b2f2a97
commit d3623a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...fyweb/frontend/js_src/lib/components/Atoms/__tests__/__snapshots__/DataEntry.test.ts.snap b/...fyweb/frontend/js_src/lib/components/Atoms/__tests__/__snapshots__/DataEntry.test.ts.snap
@@ -3,9 +3,9 @@
 exports[`Add renders without errors 1`] = `
 <DocumentFragment>
   <button
-    aria-label="Add (A)"
+    aria-label="Add (a)"
     class="icon link rounded !text-green-700 print:hidden "
-    title="Add (A)"
+    title="Add (a)"
     type="button"
   >
     <svg

diff --git a/specifyweb/frontend/js_src/lib/components/KeyboardShortcuts/utils.ts b/specifyweb/frontend/js_src/lib/components/KeyboardShortcuts/utils.ts
@@ -34,9 +34,9 @@ export function localizeKeyboardShortcut(shortcut: string): LocalizedString {
 
   // If there is only one non-modifier key, then join the keys without separator
   const resolved =
-    nonModifiers.length > 1
-      ? [...modifiers, ...nonModifiers].join(localizedKeyJoinSymbol)
-      : `${modifiers.join('')}${nonModifiers[0]}`;
+    keyboardPlatform === 'mac' && nonModifiers.length === 1
+      ? `${modifiers.join('')}${nonModifiers[0]}`
+      : [...modifiers, ...nonModifiers].join(localizedKeyJoinSymbol);
 
   return localized(resolved);
 }