Skip to content

Add plural forms for needed strings in NVDA's code base #15864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seanbudd merged 22 commits into from
Dec 8, 2023
Merged

Add plural forms for needed strings in NVDA's code base #15864

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
34d8487
First work
CyrilleB79 Sep 10, 2023
95dc8f6
Merge branch 'master' into plural
CyrilleB79 Oct 9, 2023
f1fc977
Merge branch 'master' into plural
CyrilleB79 Nov 13, 2023
d6318de
fix syntax errors
CyrilleB79 Nov 13, 2023
8d7942d
Merge branch 'master' into plural
CyrilleB79 Nov 29, 2023
fca18e1
More files converted
CyrilleB79 Nov 29, 2023
bad1de6
Touch gestures
CyrilleB79 Nov 29, 2023
9b6ffe5
Change log
CyrilleB79 Nov 30, 2023
009744a
Add PR number in the log
CyrilleB79 Nov 30, 2023
d3e70e4
Fix check POT
CyrilleB79 Nov 30, 2023
795a6dd
Update source/globalCommands.py
CyrilleB79 Nov 30, 2023
dcea438
Linting
CyrilleB79 Nov 30, 2023
72f6475
Fix expressions for tables
CyrilleB79 Dec 1, 2023
4024f2f
Fix row/column count in virtual buffer
CyrilleB79 Dec 4, 2023
0f2fef6
Apply suggestions from code review
CyrilleB79 Dec 5, 2023
6a3f2c6
Remove unexpected file
CyrilleB79 Dec 5, 2023
9cc41e3
Simplify statement
CyrilleB79 Dec 5, 2023
5b4b35c
Fix spelling in moved comments
CyrilleB79 Dec 5, 2023
70d32e4
Sub-function to compute table size reporting
CyrilleB79 Dec 6, 2023
3ec7c14
Revert "Sub-function to compute table size reporting"
CyrilleB79 Dec 7, 2023
93abb27
Revert "Revert "Sub-function to compute table size reporting""
CyrilleB79 Dec 7, 2023
6db8c7d
Factor out common translations to report rows and columns
CyrilleB79 Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Sub-function to compute table size reporting
  • Loading branch information
@CyrilleB79
CyrilleB79 committed Dec 6, 2023
commit 70d32e48bc780e82b5630bf66c9c8a62b90c6304
64 changes: 34 additions & 30 deletions source/speech/speech.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1882,36 +1882,9 @@ def getPropertiesSpeech( # noqa: C901
textList.append(rowColSpanTranslation)
rowCount=propertyValues.get('rowCount',0)
columnCount=propertyValues.get('columnCount',0)
if rowCount and columnCount:
rowCountTranslation: str = ngettext(
# Translators: Sub-part of the compound string to speak number of columns and rows in a table
"{rowCount} row",
"{rowCount} rows",
rowCount,
).format(rowCount=rowCount)
colCountTranslation: str = ngettext(
# Translators: Sub-part of the compound string to speak number of columns and rows in a table
"{columnCount} column",
"{columnCount} columns",
columnCount,
).format(columnCount=columnCount)
# Translators: Main part of the compound string to speak number of columns and rows in a table
# Example output: "with 3 rows and 2 columns"
# In this example {rowCountTranslation} will be replaced by "3 rows" and {colCountTranslation} by
# "2 columns"
rowAndColCountTranslation: str = _("with {rowCountTranslation} and {colCountTranslation}").format(
rowCountTranslation=rowCountTranslation,
colCountTranslation=colCountTranslation,
)
textList.append(rowAndColCountTranslation)
elif columnCount and not rowCount:
# Translators: Speaks number of columns (example output: with 4 columns).
columnCountTransation: str = ngettext("with %s column", "with %s columns", columnCount) % columnCount
textList.append(columnCountTransation)
elif rowCount and not columnCount:
# Translators: Speaks number of rows (example output: with 2 rows).
rowCountTranslation: str = ngettext("with %s row", "with %s rows", rowCount) % rowCount
textList.append(rowCountTranslation)
rowAndColumnCountText = _rowAndColumnCountText(rowCount, columnCount)
if rowAndColumnCountText:
textList.append(rowAndColumnCountText)
if rowCount or columnCount:
# The caller is entering a table, so ensure that it is treated as a new table, even if the previous table was the same.
_speechState.oldTableID = None
Expand Down Expand Up @@ -1971,6 +1944,37 @@ def getPropertiesSpeech( # noqa: C901
return textList


def _rowAndColumnCountText(rowCount: int, columnCount: int) -> Optional[str]:
if rowCount and columnCount:
rowCountTranslation: str = ngettext(
# Translators: Sub-part of the compound string to speak number of columns and rows in a table
"{rowCount} row",
"{rowCount} rows",
rowCount,
).format(rowCount=rowCount)
colCountTranslation: str = ngettext(
# Translators: Sub-part of the compound string to speak number of columns and rows in a table
"{columnCount} column",
"{columnCount} columns",
columnCount,
).format(columnCount=columnCount)
# Translators: Main part of the compound string to speak number of columns and rows in a table
# Example output: "with 3 rows and 2 columns"
# In this example {rowCountTranslation} will be replaced by "3 rows" and {colCountTranslation} by
# "2 columns"
return _("with {rowCountTranslation} and {colCountTranslation}").format(
rowCountTranslation=rowCountTranslation,
colCountTranslation=colCountTranslation,
)
elif columnCount and not rowCount:
# Translators: Speaks number of columns (example output: with 4 columns).
return ngettext("with %s column", "with %s columns", columnCount) % columnCount
elif rowCount and not columnCount:
# Translators: Speaks number of rows (example output: with 2 rows).
return ngettext("with %s row", "with %s rows", rowCount) % rowCount
return None


def _shouldSpeakContentFirst(
reason: OutputReason,
role: int,
Expand Down