From f2bbf0d6c639b98d6e16e68f17f3f7f22239fe4b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 11 Oct 2026 07:16:53 +0900 Subject: [PATCH] Drop the azerty conversion now that the installer no longer offers it Co-Authored-By: Claude Opus 5.5 --- default/input-methods/typing_setup.py | 11 ++++------- test/shell.d/typing-setup-checks.py | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/default/input-methods/typing_setup.py b/default/input-methods/typing_setup.py index b19f7aa9..c1d323ea 100644 --- a/default/input-methods/typing_setup.py +++ b/default/input-methods/typing_setup.py @@ -25,14 +25,11 @@ def keyboard_catalog(): mappings.setdefault(fields[0], layout + (":" + variant if variant != "-" else "")) # The console names systemd's table lacks convert as keyboard_xkb_settings in # omarchy-provision-owner does, so a choice types what it did at install. - installer = {"azerty": "fr", "bg-cp1251": "bg:phonetic", "colemak": "us:colemak", "cz": "cz:qwerty", - "kyrgyz": "kg", "de_CH-latin1": "ch", "no-latin1": "no"} - mappings.update(installer) + mappings.update({"bg-cp1251": "bg:phonetic", "colemak": "us:colemak", "cz": "cz:qwerty", + "kyrgyz": "kg", "de_CH-latin1": "ch", "no-latin1": "no"}) catalog = {} - rows = [choice.split("|") for choice in choices.splitlines()] - # azerty is French AZERTY, so a converted keymap never renames a layout - # another choice names directly. - for label, keymap, *input_settings in sorted(rows, key=lambda row: row[1] in installer): + for choice in choices.splitlines(): + label, keymap, *input_settings = choice.split("|") layout = input_settings[1] if len(input_settings) > 1 else mappings.get(keymap, keymap) if label == "Lao": layout = "la" diff --git a/test/shell.d/typing-setup-checks.py b/test/shell.d/typing-setup-checks.py index 2b88e646..1fcc56c1 100644 --- a/test/shell.d/typing-setup-checks.py +++ b/test/shell.d/typing-setup-checks.py @@ -30,7 +30,7 @@ class TypingSetupTest(unittest.TestCase): self.assertEqual(catalog["us:colemak"], "English (US, Colemak)") self.assertEqual(catalog["ch"], "German (Switzerland)") self.assertEqual(catalog["la"], "Lao") - # Converted as the installer does, without renaming French. + # Converted as the installer does. self.assertEqual(catalog["fr"], "French") self.assertEqual(catalog["bg:phonetic"], "Bulgarian") self.assertEqual(catalog["cz:qwerty"], "Czech")