7b69ac2f4682be94ccc9d3e8b86b28cdbccb8f46
2
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
7bdbedce0b |
feat(language): follow the active keyboard layout while dictating (#837)
* feat(language): follow the active keyboard layout while dictating Adds a "Follow keyboard layout" switch to Settings -> Speech Model -> Advanced. With it on, the active keyboard layout is re-read at the start of every dictation and the matching language is used, so someone who switches layouts to work in two languages gets the right one without opening Settings. #796 already seeded the language once on first run, but from the *configured* primary layout, which never changes as the user switches between them: a "fr,us" setup reports fr forever. detect_active_keyboard_ layout() reads GNOME's input sources instead. It takes mru-sources rather than the current index, because that index goes stale -- observed still reading 0 after a switch to the second layout -- which is why the IBus injection path already trusts the MRU list (#497, #738). An active source that is an IBus engine rather than an xkb layout is a real answer that cannot be mapped, so the language is left to the engine's own auto-detect. Borrowing the configured xkb layout there would pin English for someone typing Japanese through mozc-jp. The mode is a switch over the language picker rather than an entry inside it, since it is a mode and not a language. While on, the picker is disabled and shows what the layout resolves to; turning it off pins that. A language change no longer re-initialises the engine when the loaded model takes the language per utterance, which is the whole whisper family, so following a layout costs a settings read rather than a model reload. VOSK loads one model per language, Parakeet ignores the picker, and an English-only model has no non-English weights, so Settings refuses the mode for all three rather than offering a switch that does nothing. Fixes #821 * fix(language): keep follow mode armed and map IBus engines Swap English-only whisper.cpp weights to the multilingual sibling while passing the layout sentinel into reconfigure, so follow mode stays armed. Map common GNOME IBus engines onto catalogue languages instead of leaving them unmapped. * fix(language): stop IBus hyphen false-maps and gate the sibling swap The last-token hyphen heuristic mapped mozc-us and foo-us to English. Restrict it to *-jp/*-kr and name Mozc's extra engines as Japanese. Only whisper.cpp may consult the whisper.cpp download catalog. * fix(language): keep multilingual weights while following layout The picker shows the active layout while follow is on, often en-us. Deriving whisper.cpp .en from that display made Settings refuse the mode as English-only, then the next auto-apply persisted a concrete language and disarmed follow. Use LANGUAGE_FOLLOWS_LAYOUT for .en vs multilingual derivation instead, including on the load path before the switch is synced. * fix(language): type follow helpers and log sibling-swap failures * fix(test): stub follow-layout model rec so mocked psutil does not blow up follow-mode English-only guard calls get_recommended_whispercpp_model, which reads RAM through psutil. Full CI leaves a MagicMock in sys.modules["psutil"], so ram_gb >= 16 raises TypeError. Patch the settings_dialog alias to return a multilingual tiny rec so the assertion still holds without real RAM. * fix(language): catch specific errors on layout lookup and sibling swap * fix(language): swallow more sibling-swap reconfigure failures ImportError, TypeError, AttributeError, and ChecksumError from the multilingual swap must not abort dictation or disarm follow mode. --------- Co-authored-by: Jatin K Malik <jatinkrmalik@gmail.com> |
||
|
|
688d9e9bd2 |
feat(language): start a first run from the language the system points at (#796)
* feat(language): start a first run from the language the system points at Nothing asked the system what language the user speaks, so whisper.cpp always began on auto-detect and VOSK on a hardcoded en-us. Both are wrong for anyone who does not speak English, and neither improves on its own because nothing ever suggests setting a language. Seed the language on first run only, so a saved choice — including a deliberate "auto" — is never touched. The keyboard layout is consulted before the locale: running the desktop in English while speaking something else is common among the people who install a Linux dictation tool, which makes the interface language a weak signal for the spoken one. A "us" layout is the default on many installs and says little, so the locale gets a say before it is accepted. localectl is used rather than setxkbmap, which reports nothing useful on Wayland. Detection failures leave the packaged default in place. Closes #777 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TKVa2qTLQYMCHffjp97yqT * fix(language): prefer LANGUAGE, keep cs/ca, map nb_NO LANG was consulted before LANGUAGE, so a gettext preference list lost to the fallback locale. C/POSIX detection used startswith("c"), which rejected Czech and Catalan. nb_NO normalised to nb_no and missed the nb→no catalogue map, so Norwegian fell through to en-us. Tests cover LANG+LANGUAGE, LANGUAGE=cs, and nb_NO. * fix(language): walk LANGUAGE prefs until one is supported split(":")[0] dropped later supported preferences, so first-run could stay on auto when LANGUAGE started with an unsupported tag. Try each preference through the catalogue map. Annotate _seed_language_from_system. * style(language): keep _language_from_locale_env on one line for black * fix(language): fall through unmapped LANGUAGE to LANG When every LANGUAGE preference missed the catalogue, the helper returned before LANG was examined, so first-run could stay on auto. Skip unmapped env vars and keep looking. Regression: LANGUAGE=xx:yy with LANG=pl_PL → pl. --------- Co-authored-by: Kacper Paczos <23406555+kacperpaczos@users.noreply.github.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-authored-by: Jatin K Malik <jatinkrmalik@gmail.com> |