Skip to content

Merge beta to master#14665

Merged
seanbudd merged 24 commits into
masterfrom
beta
Feb 22, 2023
Merged

Merge beta to master#14665
seanbudd merged 24 commits into
masterfrom
beta

Conversation

@seanbudd

Copy link
Copy Markdown
Member

merge commit not squash merge

NVDA translation automation and others added 24 commits February 13, 2023 23:13
From translation svn revision: 71696

Authors:
Fatma Mehanna <fatma.mehanna@gmail.com>
Shaimaa Ibrahim <shamse1@gmail.com>
Abdelkrim Bensaid <abdelkrim.bensaid@free.fr>
Omar Alojaimi <amrahmad1995@gmail.com>

Stats:
298	115	source/locale/ar/LC_MESSAGES/nvda.po
2	0	source/locale/ar/gestures.ini
 2 files changed, 300 insertions(+), 115 deletions(-)
From translation svn revision: 71696

Authors:
Michel such <michel.such@free.fr>
Patrick ZAJDA <patrick@zajda.fr>
Remy Ruiz <remyruiz@gmail.com>
Abdelkrim Bensaid <abdelkrim.bensaid@free.fr>
Cyrille Bougot <cyrille.bougot2@laposte.net>
Corentin Bacqué-Cazenave <corentin@progaccess.net>
Sylvie Duchateau <sylvieduchateau@gmail.com>
Sof <hellosof@gmail.com>

Stats:
1	0	source/locale/fr/symbols.dic
 1 file changed, 1 insertion(+)
From translation svn revision: 71696

Authors:
Zvonimir Stanecic <9a5dsz@gozaltech.org>
Aleksandr Lin'kov <kvark128@yandex.ru>

Stats:
1	0	source/locale/ru/gestures.ini
 1 file changed, 1 insertion(+)
From translation svn revision: 71696

Authors:
wangjanli@gmail.com
maro.zhang@gmail.com
Aaron Wu <waaron2000@gmail.com>
Victor Cai <surfer0627@gmail.com>
haach111000@gmail.com

Stats:
11	8	source/locale/zh_TW/characterDescriptions.dic
 1 file changed, 11 insertions(+), 8 deletions(-)
From translation svn revision: 71696
From translation svn revision: 71807

Authors:
Fatma Mehanna <fatma.mehanna@gmail.com>
Shaimaa Ibrahim <shamse1@gmail.com>
Abdelkrim Bensaid <abdelkrim.bensaid@free.fr>
Omar Alojaimi <amrahmad1995@gmail.com>

Stats:
115	36	source/locale/ar/LC_MESSAGES/nvda.po
64	1	user_docs/ar/changes.t2t
 2 files changed, 179 insertions(+), 37 deletions(-)
From translation svn revision: 71807

Authors:
Daniel K. Gartmann <kontakt@nvda.dk>
Nicolai Svendsen <chojiro1990@gmail.com>
bue@vester-andersen.dk

Stats:
378	118	source/locale/da/LC_MESSAGES/nvda.po
44	2	user_docs/da/userGuide.t2t
 2 files changed, 422 insertions(+), 120 deletions(-)
From translation svn revision: 71807

Authors:
Bernd Dorer <bdorer@mailbox.org>
David Parduhn <xkill85@gmx.net>
Rene Linke <rene.linke@hamburg.de>
Adriani Botez <adriani.botez@gmail.com>
Karl Eick <hozosch@web.de>
Robert Hänggi <aarjay.robert@gmail.com>
Astrid Waldschmetterling <a.r.waldschmetterling@gmx.de>

Stats:
97	7	source/locale/de/LC_MESSAGES/nvda.po
39	5	user_docs/de/changes.t2t
1	0	user_docs/de/userGuide.t2t
 3 files changed, 137 insertions(+), 12 deletions(-)
From translation svn revision: 71807

Authors:
Juan C. buno <oprisniki@gmail.com>
Noelia Martinez <nrm1977@gmail.com>
Remy Ruiz <remyruiz@gmail.com>
Jose M. Delicado <jm.delicado@nvda.es>

Stats:
99	8	source/locale/es/LC_MESSAGES/nvda.po
34	0	user_docs/es/changes.t2t
1	0	user_docs/es/userGuide.t2t
 3 files changed, 134 insertions(+), 8 deletions(-)
From translation svn revision: 71807

Authors:
Jani Kinnunen <janikinnunen340@gmail.com>
Isak Sand <isak.sand@gmail.com>

Stats:
102	10	source/locale/fi/LC_MESSAGES/nvda.po
71	44	user_docs/fi/changes.t2t
1	0	user_docs/fi/userGuide.t2t
 3 files changed, 174 insertions(+), 54 deletions(-)
From translation svn revision: 71807

Authors:
Michel such <michel.such@free.fr>
Patrick ZAJDA <patrick@zajda.fr>
Remy Ruiz <remyruiz@gmail.com>
Abdelkrim Bensaid <abdelkrim.bensaid@free.fr>
Cyrille Bougot <cyrille.bougot2@laposte.net>
Corentin Bacqué-Cazenave <corentin@progaccess.net>
Sylvie Duchateau <sylvieduchateau@gmail.com>
Sof <hellosof@gmail.com>

Stats:
96	54	source/locale/fr/LC_MESSAGES/nvda.po
207	1	user_docs/fr/changes.t2t
1	0	user_docs/fr/userGuide.t2t
 3 files changed, 304 insertions(+), 55 deletions(-)
From translation svn revision: 71807

Authors:
Juan C. buno <oprisniki@gmail.com>
Ivan Novegil <ivan.novegil@nvda.es>
Javier Curras <javier.curras@nvda.es>
Jose M. Delicado <jm.delicado@nvda.es>

Stats:
98	8	source/locale/gl/LC_MESSAGES/nvda.po
34	0	user_docs/gl/changes.t2t
2	1	user_docs/gl/userGuide.t2t
 3 files changed, 134 insertions(+), 9 deletions(-)
From translation svn revision: 71807

Authors:
Simone Dal Maso <simone.dalmaso@gmail.com>
Alberto Buffolino <a.buffolino@gmail.com>

Stats:
100	8	source/locale/it/LC_MESSAGES/nvda.po
61	2	user_docs/it/userGuide.t2t
 2 files changed, 161 insertions(+), 10 deletions(-)
From translation svn revision: 71807

Authors:
Takuya Nishimoto <nishimotz@gmail.com>
Minako Nonogaki <minakonono3519@gmail.com>

Stats:
126	47	source/locale/ja/LC_MESSAGES/nvda.po
39	5	user_docs/ja/changes.t2t
9	8	user_docs/ja/userGuide.t2t
 3 files changed, 174 insertions(+), 60 deletions(-)
From translation svn revision: 71807

Authors:
Bermet Zhakypbekova <bermet.zhakypbekova@gmail.com>

Stats:
8158	5349	source/locale/ky/LC_MESSAGES/nvda.po
 1 file changed, 8158 insertions(+), 5349 deletions(-)
From translation svn revision: 71807

Authors:
zvonimir stanecic <9a5dsz@gozaltech.org>
Ertay Shashko <ertay@outlook.com>
Aleksandar <glupav@gmail.com>
Kiko Lazarev <kristijan.lazarev@gmail.com>

Stats:
693	215	source/locale/mk/LC_MESSAGES/nvda.po
1	1	source/locale/mk/symbols.dic
 2 files changed, 694 insertions(+), 216 deletions(-)
From translation svn revision: 71807

Authors:
Grzegorz Zlotowicz <grzezlo@wp.pl>
Patryk Faliszewski <patric3031@wp.pl>
Zvonimir Stanecic <9a5dsz@gozaltech.org>
Dorota Krac <dorkakrac@yandex.com>
Piotr Rakowski <kontakt@piotrrakowski.net>
Hubert Meyer <hubmeyer1989@gmail.com>
Arkadiusz Swietnicki <nuno69a@gmail.com>

Stats:
101	9	source/locale/pl/LC_MESSAGES/nvda.po
 1 file changed, 101 insertions(+), 9 deletions(-)
From translation svn revision: 71807

Authors:
Cleverson Casarin Uliana <nvdasrt@clul.router5.com>
Marlin Rodrigues <marlincgrodrigues@yahoo.com.br>
Tiago Melo Casal <tcasal@intervox.nce.ufrj.br>
Lucas Antonio <lucasantoniocwb@gmail.com>

Stats:
377	117	source/locale/pt_BR/LC_MESSAGES/nvda.po
 1 file changed, 377 insertions(+), 117 deletions(-)
From translation svn revision: 71807

Authors:
Diogo Costa <diogojoca@gmail.com>
Rui Batista <ruiandrebatista@gmail.com>
Rui Fontes <rui.fontes@tiflotecnia.com>
Ângelo Abrantes <ampa4374@gmail.com>

Stats:
97	7	source/locale/pt_PT/LC_MESSAGES/nvda.po
1	0	user_docs/pt_PT/userGuide.t2t
 2 files changed, 98 insertions(+), 7 deletions(-)
From translation svn revision: 71807

Authors:
Zvonimir Stanecic <9a5dsz@gozaltech.org>
Aleksandr Lin'kov <kvark128@yandex.ru>

Stats:
369	118	source/locale/ru/LC_MESSAGES/nvda.po
 1 file changed, 369 insertions(+), 118 deletions(-)
From translation svn revision: 71807

Authors:
Volodymyr Pyrig <vp88.mobile@gmail.com>

Stats:
107	17	source/locale/uk/LC_MESSAGES/nvda.po
4	3	user_docs/uk/userGuide.t2t
 2 files changed, 111 insertions(+), 20 deletions(-)
From translation svn revision: 71807

Authors:
vgjh2005@gmail.com
jiangtiandao901647@gmail.com
manchen_0528@outlook.com
dingpengyu06@gmail.com
singer.mike.zhao@gmail.com
1872265132@qq.com

Stats:
142	84	source/locale/zh_CN/LC_MESSAGES/nvda.po
 1 file changed, 142 insertions(+), 84 deletions(-)
From translation svn revision: 71807
…bels displayed in the user's language (#14658)

Fixes #14657

Summary of the issue:
In pull request #14528 keyLabels were imported pretty early during NVDA's startup. Since this module contains localized strings at the module level these are translated before languageHandler is initialized. This means that they're translated either to the default language of the system, or for locales for which Python's locale.getdefaultlocale fails they remain in English, disregarding the language set in preferences.

Description of user facing changes
Key labels are once again presented in the language set in preferences.

Description of development approach
keyLabels are imported lazily in the configFlags
I've added docstring to the keyLabels module explaining when it can be safely imported.
Testing strategy:
On a English Windows set NVDA's language to Polish, ensured that key labels in the keyboard help and in the preferences are displayed in Polish.
@seanbudd seanbudd requested a review from a team as a code owner February 22, 2023 22:43
@seanbudd seanbudd merged commit bb1cde8 into master Feb 22, 2023
@nvaccessAuto nvaccessAuto added this to the 2023.2 milestone Feb 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants