Add options to set translation and input braille tables according to NVDA's language #17314
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
seanbudd
added
the
conceptApproved
… autoBrailleLang
… autoBrailleLang
… autoBrailleLang
See test results for failed build of commit 0d25bc42d7 |
LeonarddeR
suggested changes
Oct 22, 2024
source/braille.py
Outdated
| tableName = config.conf["braille"]["translationTable"] | ||
| # #6140: Migrate to new table names as smoothly as possible. | ||
| newTableName = brailleTables.RENAMED_TABLES.get(tableName) | ||
| if newTableName: | ||
| tableName = config.conf["braille"]["translationTable"] = newTableName | ||
| if tableName != self._table.fileName: | ||
| try: | ||
| self._table = brailleTables.getTable(tableName) | ||
| if config.conf["braille"]["translationTable"] == "auto": | ||
| self._table = brailleTables.getDefaultTableForCurLang(brailleTables.TableType.OUTPUT) |
There was a problem hiding this comment.
Is this correct? Shouldn't this be?
Suggested change
| self._table = brailleTables.getDefaultTableForCurLang(brailleTables.TableType.OUTPUT) | |
| tableName = brailleTables.getDefaultTableForCurLang(brailleTables.TableType.OUTPUT) |
That means instead of the else block, you can just load tableName.
source/gui/settingsDialogs.py
Outdated
| ) | ||
| self.inTableForCurLang = self.inTables[inTableForCurLangIndex] | ||
| # Translators: An option in Braille settings to select a braille table automatically, according to the current language. | ||
| inTableChoices = [_("Automatic (%s)" % self.inTableForCurLang.displayName)] |
nvdaes
changed the title
Co-authored-by: Leonard de Ruijter <[email protected]>
See test results for failed build of commit 4a72f93aeb |
|
@LeonarddeR , thanks for your review! UnboundLocalError: cannot access local variable 'table' where it is not associated with a value Perhaps we should revert this suggestion? |
|
I assumed that @LeonarddeR suggestion was complete, but now I've committed a fix and this should be ready. |
|
pre-commit.ci run. |
Qchristensen
approved these changes
Oct 23, 2024
|
Thanks Quentin. |
LeonarddeR
approved these changes
Oct 24, 2024
| tableName = config.conf["braille"]["translationTable"] | ||
| # #6140: Migrate to new table names as smoothly as possible. | ||
| newTableName = brailleTables.RENAMED_TABLES.get(tableName) | ||
| if newTableName: | ||
| tableName = config.conf["braille"]["translationTable"] = newTableName | ||
| if config.conf["braille"]["translationTable"] == "auto": |
There was a problem hiding this comment.
tableName already contains the name of config at this point, so it is not necessary to recheck the config here.
Suggested change
| if config.conf["braille"]["translationTable"] == "auto": | |
| if tableName == "auto": |
| # #6140: Migrate to new table names as smoothly as possible. | ||
| tableName = config.conf["braille"]["inputTable"] | ||
| newTableName = brailleTables.RENAMED_TABLES.get(tableName) | ||
| if newTableName: | ||
| tableName = config.conf["braille"]["inputTable"] = newTableName | ||
| table = config.conf["braille"]["inputTable"] | ||
| if table != self._table.fileName: | ||
| if config.conf["braille"]["inputTable"] == "auto": |
There was a problem hiding this comment.
Idem as above
Suggested change
| if config.conf["braille"]["inputTable"] == "auto": | |
| if tableName == "auto": |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Link to issue number:
Fixes issue #17306
Summary of the issue:
By default, NVDA sets braille tables according to its language. When NVDA's language is changed, by default braille tables are modified accordingly, which may be confusing for users.
Description of user facing changes
In the Braille settings panel, combo boxes for tables have an option to set them according to NVDA's language, so that now this is optional. The automatically selected tables corresponding to the current language are described in parentheses.
Description of development approach
New options have been added to the Braille settings panel. braille, brailleInput and brailleTables modules have been modified so that the "auto" option in configuration can be optional.
Testing strategy:
Tested manually checking that options are presented in the gui and that braille tables are set accordingly.
Known issues with pull request:
None
Code Review Checklist:
@coderabbitai summary