mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-04-02 21:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

gh-12730: conflict keybord shortcut name always shows "Escape" (gh-12993)

Browse Source 
Co-authored-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
This commit is contained in:
Davide Taffarello
2026-03-30 14:15:25 +02:00
committed by GitHub
parent a2796d7af0
commit 742a1e6882
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/browser/components/preferences/zen-settings.js
View File

@@ -1067,7 +1067,7 @@ var gZenCKSSettings = {
zenMissingKeyboardShortcutL10n[conflictShortcut.getID()] ??
conflictShortcut.getL10NID();
const [group] = await document.l10n.formatValues([
const [group, conflictName] = await document.l10n.formatValues([
{ id: `${ZEN_CKS_GROUP_PREFIX}-${conflictShortcut.getGroup()}` },
{ id: shortcutL10nKey },
]);
@@ -1082,7 +1082,7 @@ var gZenCKSSettings = {
document.l10n.setAttributes(input.nextElementSibling, "zen-key-conflict", {
group: group ?? "",
shortcut: shortcut ?? "",
shortcut: conflictName ?? shortcut ?? "",
});
}
} else {