Skip to content

languageHandler.getAvailableLanguages: use globalVars.appDir rather than depending on the current directory #11778

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
michaelDCurran merged 3 commits into from
Oct 21, 2020
Merged

languageHandler.getAvailableLanguages: use globalVars.appDir rather than depending on the current directory #11778

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd993a1
languageHandler.getAvailableLanguages: use globalVars.appDir rather t…
michaelDCurran Oct 21, 2020
2a1ae60
languageHandler: no need to filter out '.' prefixed directories in lo…
michaelDCurran Oct 21, 2020
ebb7ed7
Merge branch 'master' into moreCwdFixes
michaelDCurran Oct 21, 2020
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
7 changes: 5 additions & 2 deletions source/languageHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import ctypes
import locale
import gettext
import globalVars

#a few Windows locale constants
LOCALE_SLANGUAGE=0x2
Expand Down Expand Up @@ -95,8 +96,10 @@ def getAvailableLanguages(presentational=False):
@rtype: list of tuples
"""
#Make a list of all the locales found in NVDA's locale dir
locales = [x for x in os.listdir('locale') if not x.startswith('.')]
locales = [x for x in locales if os.path.isfile('locale/%s/LC_MESSAGES/nvda.mo'%x)]
localesDir = os.path.join(globalVars.appDir, 'locale')
locales = [
x for x in os.listdir(localesDir) if os.path.isfile(os.path.join(localesDir, x, 'LC_MESSAGES', 'nvda.mo'))
]
#Make sure that en (english) is in the list as it may not have any locale files, but is default
if 'en' not in locales:
locales.append('en')
Expand Down