hankxdev · fregante · Jul 30, 2024 · Jul 29, 2024 · Jul 29, 2024 · Jul 29, 2024
diff --git a/source/_locales/de/messages.json b/source/_locales/de/messages.json
@@ -27,7 +27,7 @@
 		"message": "Nach Name suchen…"
 	},
 	"undoInfoMsg": {
-		"message": "Du kannst deine letzte Aktionen rückgäng machen oder wiederherstellen. Dies funktioniert aber nur solange wie dieser Popup-Dialog geöffnet ist. Drücke dazu <kbd>Strg+z</kbd> unter Windows und <kbd>cmd+z</kbd> unter macOS, <kbd>super+z</kbd> unter Ubuntu."
+		"message": "Du kannst deine letzte Aktionen rückgäng machen oder wiederherstellen. Dies funktioniert aber nur solange wie dieser Popup-Dialog geöffnet ist. Drücke dazu <kbd>Strg+Z</kbd>."
 	},
 	"uninstall": {
 		"message": "Erweiterung entfernen…"

diff --git a/source/_locales/en/messages.json b/source/_locales/en/messages.json
@@ -27,7 +27,7 @@
 		"message": "Search by name…"
 	},
 	"undoInfoMsg": {
-		"message": "You can undo and redo your last action until you close this popup. Press <kbd>ctrl+z</kbd> on Windows or Ubuntu,  and <kbd>cmd+z</kbd> on macOS."
+		"message": "You can undo (with <kbd>Ctrl+Z</kbd>) and redo your last action until you close this popup."
 	},
 	"uninstall": {
 		"message": "Remove from Chrome"

diff --git a/source/_locales/es/messages.json b/source/_locales/es/messages.json
@@ -27,7 +27,7 @@
 		"message": "Buscar por nombre…"
 	},
 	"undoInfoMsg": {
-		"message": "Puedes deshacer y rehacer tu última acción hasta que cierres esta ventana. Presiona <kbd>ctrl+z</kbd> en Windows y <kbd>cmd+z</kbd> en macOS, <kbd>super+z</kbd> en Ubuntu."
+		"message": "Puedes deshacer (con <kbd>Ctrl+Z</kbd>) y rehacer tu última acción hasta que cierres esta ventana."
 	},
 	"uninstall": {
 		"message": "Eliminar"

diff --git a/source/_locales/fr/messages.json b/source/_locales/fr/messages.json
@@ -36,7 +36,7 @@
 		"hash": "1220702106584c8c90c0f41c486a3e0b"
 	},
 	"undoInfoMsg": {
-		"message": "Vous pouvez annuler et refaire votre dernière action jusqu'à ce que vous fermiez cette fenêtre contextuelle. Appuyez sur <kbd>ctrl+z</kbd> sur Windows et <kbd>cmd+z</kbd> sur macOS, <kbd>super+z</kbd> sur Ubuntu.",
+		"message": "Vous pouvez annuler et refaire votre dernière action jusqu'à ce que vous fermiez cette fenêtre contextuelle. Appuyez sur <kbd>Ctrl+Z</kbd>.",
 		"hash": "4105b6ebe6d3c7badf1a2bf9d425ddbb"
 	},
 	"uninstall": {

diff --git a/source/_locales/he/messages.json b/source/_locales/he/messages.json
@@ -27,7 +27,7 @@
 		"message": "חיפוש תוסף לפי שם"
 	},
 	"undoInfoMsg": {
-		"message": "ניתן לבטל או לבצע מחדש פעולות עד לסגירת החלון באמצעות <kbd>ctrl+z</kbd> ב - windows, <kbd>cmd+z</kbd> ב - macOS או <kbd>super+z</kbd> ב Ubuntu."
+		"message": "ניתן לבטל או לבצע מחדש פעולות עד לסגירת החלון באמצעות <kbd>Ctrl+Z</kbd>."
 	},
 	"uninstall": {
 		"message": "להסיר את התוסף"

diff --git a/source/_locales/it/messages.json b/source/_locales/it/messages.json
@@ -36,7 +36,7 @@
 		"hash": "1220702106584c8c90c0f41c486a3e0b"
 	},
 	"undoInfoMsg": {
-		"message": "Puoi annullare e ripetere la tua ultima azione finché non chiudi questo popup. Premi <kbd>ctrl+z</kbd> su Windows, <kbd>cmd+z</kbd> su macOS o <kbd>super+z</kbd> on Ubuntu.",
+		"message": "Puoi annullare (con <kbd>Ctrl+Z</kbd>) e ripetere la tua ultima azione finché non chiudi questo popup.",
 		"hash": "4c9adc1bb6418b3ecbc77f3ddda22a70"
 	},
 	"uninstall": {

diff --git a/source/_locales/nl/messages.json b/source/_locales/nl/messages.json
@@ -36,7 +36,7 @@
 		"hash": "1220702106584c8c90c0f41c486a3e0b"
 	},
 	"undoInfoMsg": {
-		"message": "Je kan je laatste actie ongedaan maken of opnieuw uitvoeren totdat je deze popup sluit. Druk op <kbd>ctrl+z</kbd> op Windows of Ubuntu,  en <kbd>cmd+z</kbd> op MacOS.",
+		"message": "Je kan je laatste actie ongedaan maken of opnieuw uitvoeren totdat je deze popup sluit. Druk op <kbd>Ctrl+Z</kbd>.",
 		"hash": "b8be6c1fc88c7e6042b054effb2c6981"
 	},
 	"uninstall": {

diff --git a/source/_locales/tr/messages.json b/source/_locales/tr/messages.json
@@ -36,7 +36,7 @@
 		"hash": "1220702106584c8c90c0f41c486a3e0b"
 	},
 	"undoInfoMsg": {
-		"message": "Bu pencere kapanıncaya kadar son işleminizi geri ya da ileri alabilirsiniz. Windows’ta <kbd>ctrl+z</kbd>’ye, macOS’te <kbd>cmd+z</kbd>’ye.",
+		"message": "Bu pencere kapanıncaya kadar son işleminizi geri ya da ileri alabilirsiniz. <kbd>Ctrl+Z</kbd>’ye.",
 		"hash": "4105b6ebe6d3c7badf1a2bf9d425ddbb"
 	},
 	"uninstall": {

diff --git a/source/_locales/zh_CN/messages.json b/source/_locales/zh_CN/messages.json
@@ -21,7 +21,7 @@
 		"message": "查找扩展"
 	},
 	"undoInfoMsg": {
-		"message": "在关闭这个窗口前你可以撤销你的操作。 在 Windows 或 Ubuntu 中按 <kbd>Ctrl+Z</kbd>, macOS 中按<kbd>CMD+Z</kbd>."
+		"message": "在关闭这个窗口前你可以撤销你的操作。 中按 <kbd>Ctrl+Z</kbd>。"
 	},
 	"uninstall": {
 		"message": "卸载这个扩展"

diff --git a/source/_locales/zh_TW/messages.json b/source/_locales/zh_TW/messages.json
@@ -36,7 +36,7 @@
 		"hash": "1220702106584c8c90c0f41c486a3e0b"
 	},
 	"undoInfoMsg": {
-		"message": "在關閉這個窗口前你可以撤銷你的操作。 <br>在 Windows 或 Ubuntu 中按<kbd>ctrl+z</kbd>, macOS 中按<kbd>cmd+z</kbd>。",
+		"message": "在關閉這個窗口前你可以撤銷你的操作。 中按<kbd>Ctrl+Z</kbd>。",
 		"hash": "4105b6ebe6d3c7badf1a2bf9d425ddbb"
 	},
 	"uninstall": {

diff --git a/source/app.svelte b/source/app.svelte
@@ -149,7 +149,7 @@
 <main>
 	{#if showInfoMessage && !userClickedHideInfoMessage}
 		<p class="notice">
-			{@html getI18N('undoInfoMsg')}
+			{@html UndoStack.replaceKbdOnMac(getI18N('undoInfoMsg'))}
 			<a class="hide-action" href="#hide" on:click={hideInfoMessage}
 				>{getI18N('hideInfoMsg')}</a
 			>

diff --git a/source/lib/undo-stack.js b/source/lib/undo-stack.js
@@ -1,8 +1,12 @@
 export default class UndoStack {
 	_undoStack = [];
 	_redoStack = [];
-	_Z_KEY = 90;
-	_isWin = navigator.userAgent.match(/win/i);
+	static isMac = navigator.platform.includes('Mac');
+	static replaceKbdOnMac = string =>
+		UndoStack.isMac
+			? // Some locales don't call it "ctrl"
+				string.replace(/(?<=>)[a-z]+\+z/i, '⌘Z')
+			: string;
 
 	constructor(element) {
 		if (element) {
@@ -12,8 +16,8 @@ export default class UndoStack {
 
 	#keyboardEventListener = event => {
 		if (
-			event.keyCode === this._Z_KEY &&
-			(this._isWin ? event.ctrlKey : event.metaKey)
+			event.code === 'KeyZ' &&
+			(UndoStack._isMac ? event.metaKey : event.ctrlKey)
 		) {
 			if (event.shiftKey) {
 				this.redo();

diff --git a/source/style.css b/source/style.css
@@ -43,6 +43,10 @@ a {
 	text-decoration: none;
 }
 
+kbd {
+	font-family: system-ui, monospace;
+}
+
 button {
 	display: inline-block;
 	padding: 0;