From ef70a001ba343ab16e99525aa143f982921de487 Mon Sep 17 00:00:00 2001 From: cary-rowen Date: Wed, 8 Jan 2025 11:47:26 +0800 Subject: [PATCH] Uasof 'Everywhere, Update translator comments'e 'Always' insted --- source/config/configFlags.py | 4 ++-- source/config/configSpec.py | 4 ++-- source/globalCommands.py | 6 +++--- source/speech/speech.py | 4 ++-- user_docs/en/changes.md | 4 ++-- user_docs/en/userGuide.md | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/config/configFlags.py b/source/config/configFlags.py index b05e14c4d2..4a0d3eacce 100644 --- a/source/config/configFlags.py +++ b/source/config/configFlags.py @@ -54,7 +54,7 @@ class TypingEcho(DisplayStringIntEnum): """ OFF = 0 - EVERYWHERE = 1 + ALWAYS = 1 EDIT_CONTROLS = 2 @property @@ -63,7 +63,7 @@ def _displayStringLabels(self): # Translators: One of the choices for typing echo in keyboard settings TypingEcho.OFF: _("Off"), # Translators: One of the choices for typing echo in keyboard settings - TypingEcho.EVERYWHERE: _("Everywhere"), + TypingEcho.ALWAYS: _("Always"), # Translators: One of the choices for typing echo in keyboard settings TypingEcho.EDIT_CONTROLS: _("Only in edit controls"), } diff --git a/source/config/configSpec.py b/source/config/configSpec.py index 41747b30c8..fa499aa50f 100644 --- a/source/config/configSpec.py +++ b/source/config/configSpec.py @@ -178,9 +178,9 @@ # Default = 6: NumpadInsert + ExtendedInsert NVDAModifierKeys = integer(1, 7, default=6) keyboardLayout = string(default="desktop") - # 0: Off, 1: Everywhere, 2: Only in edit controls + # 0: Off, 1: Always, 2: Only in edit controls speakTypedCharacters = integer(default=2,min=0,max=2) - # 0: Off, 1: Everywhere, 2: Only in edit controls + # 0: Off, 1: Always, 2: Only in edit controls speakTypedWords = integer(default=2,min=0,max=2) beepForLowercaseWithCapslock = boolean(default=true) speakCommandKeys = boolean(default=false) diff --git a/source/globalCommands.py b/source/globalCommands.py index d96e1ffa43..d96bc6bdbf 100755 --- a/source/globalCommands.py +++ b/source/globalCommands.py @@ -537,8 +537,8 @@ def script_previousSynthSetting(self, gesture): ui.message("%s %s" % (previousSettingName, previousSettingValue)) @script( - # Translators: Input help mode message for toggle speaked typed characters command. - description=_("Cycle the reporting of typed characters: Off, Everywhere, and Only in edit controls."), + # Translators: Input help mode message for cycling the reporting of typed words. + description=_("Cycle the reporting of typed characters: Off, Always, and Only in edit controls."), category=SCRCAT_SPEECH, gesture="kb:NVDA+2", ) @@ -552,7 +552,7 @@ def script_toggleSpeakTypedCharacters(self, gesture): @script( # Translators: Input help mode message for toggle speak typed words command. - description=_("Cycle the reporting of typed words: Off, Everywhere, and Only in edit controls."), + description=_("Cycle the reporting of typed words: Off, Always, and Only in edit controls."), category=SCRCAT_SPEECH, gesture="kb:NVDA+3", ) diff --git a/source/speech/speech.py b/source/speech/speech.py index 76234c27c8..260fdc3f96 100644 --- a/source/speech/speech.py +++ b/source/speech/speech.py @@ -1389,7 +1389,7 @@ def speakTypedCharacters(ch: str): log.io("typed word: %s" % typedWord) typingEchoMode = config.conf["keyboard"]["speakTypedWords"] if typingEchoMode != TypingEcho.OFF.value and not typingIsProtected: - if typingEchoMode == TypingEcho.EVERYWHERE.value or ( + if typingEchoMode == TypingEcho.ALWAYS.value or ( typingEchoMode == TypingEcho.EDIT_CONTROLS.value and isFocusEditable() ): speakText(typedWord) @@ -1407,7 +1407,7 @@ def speakTypedCharacters(ch: str): typingEchoMode = config.conf["keyboard"]["speakTypedCharacters"] if not suppress and typingEchoMode != TypingEcho.OFF.value and ch >= FIRST_NONCONTROL_CHAR: - if typingEchoMode == TypingEcho.EVERYWHERE.value or ( + if typingEchoMode == TypingEcho.ALWAYS.value or ( typingEchoMode == TypingEcho.EDIT_CONTROLS.value and isFocusEditable() ): speakSpelling(realChar) diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md index 3a3738012f..39e395517e 100644 --- a/user_docs/en/changes.md +++ b/user_docs/en/changes.md @@ -50,7 +50,7 @@ To use this feature, "allow NVDA to control the volume of other applications" mu * Updated CLDR to version 46.0. (#17484, @OzancanKaratas) * Short versions of the most commonly used command line options have been added: `-d` for `--disable-addons` and `-n` for `--lang`. Prefix matching on command line flags, e.g. using `--di` for `--disable-addons` is no longer supported. (#11644, @CyrilleB79) -* The keyboard settings for "Speak typed characters" and "Speak typed words" now have three options: Off, Everywhere, and Only in edit controls. (#17505, @Cary-rowen) +* The keyboard settings for "Speak typed characters" and "Speak typed words" now have three options: Off, Always, and Only in edit controls. (#17505, @Cary-rowen) ### Bug Fixes @@ -163,7 +163,7 @@ As the NVDA update check URL is now configurable directly within NVDA, no replac * The following symbols have been removed with no replacement: `languageHandler.getLanguageCliArgs`, `__main__.quitGroup` and `__main__.installGroup` . (#17486, @CyrilleB79) * Prefix matching on command line flags, e.g. using `--di` for `--disable-addons` is no longer supported. (#11644, @CyrilleB79) * Changed keyboard typing echo configuration from boolean to integer values: - * `config.conf["keyboard"]["speakTypedCharacters"]` and `config.conf["keyboard"]["speakTypedWords"]` now use integer values (0=Off, 1=Everywhere, 2=Only in edit controls). + * `config.conf["keyboard"]["speakTypedCharacters"]` and `config.conf["keyboard"]["speakTypedWords"]` now use integer values (0=Off, 1=Always, 2=Only in edit controls). * Added `TypingEcho` enum in `config.configFlags` to represent these modes. * The `useAsFallBack` keyword argument of `bdDetect.DriverRegistrar` has been renamed to `useAsFallback`. (#17521, @LeonarddeR) diff --git a/user_docs/en/userGuide.md b/user_docs/en/userGuide.md index 8a2818ce83..865fd6cb67 100644 --- a/user_docs/en/userGuide.md +++ b/user_docs/en/userGuide.md @@ -2594,7 +2594,7 @@ This option controls when NVDA announces characters you type on the keyboard. The available options are: * Off: NVDA will not announce typed characters. -* Everywhere: NVDA will announce all typed characters. +* Always: NVDA will announce all typed characters. * Only in edit controls: NVDA will only announce characters typed in edit controls and other areas where text can be typed. @@ -2607,7 +2607,7 @@ This option controls when NVDA announces words you type on the keyboard. The available options are: * Off: NVDA will not announce typed words. -* Everywhere: NVDA will announce all typed words. +* Always: NVDA will announce all typed words. * Only in edit controls: NVDA will only announce words typed in edit controls and other areas where text can be typed. ##### Speech interrupt for typed characters {#KeyboardSettingsSpeechInteruptForCharacters}