Merge 3e33267 into 0316158

seanbudd · web-flow · commit 3d5d5fe10634 · 2021-03-24T11:03:17.000+10:00
diff --git a/source/core.py b/source/core.py
@@ -447,6 +447,8 @@ def handlePowerStatusChange(self):
 	if wxLang:
 		try:
 			locale.Init(wxLang.Language)
+			# Fix whatever wx locale did to python's locale
+			languageHandler.setLocale(languageHandler.curLang)
 		except:
 			log.error("Failed to initialize wx locale",exc_info=True)
 
diff --git a/source/languageHandler.py b/source/languageHandler.py
@@ -13,6 +13,7 @@
 import locale
 import gettext
 import globalVars
+from logging import log
 
 #a few Windows locale constants
 LOCALE_SLANGUAGE=0x2
@@ -156,19 +157,6 @@ def setLanguage(lang):
 		else:
 			trans=gettext.translation("nvda", localedir="locale", languages=[lang])
 			curLang=lang
-			localeChanged=False
-			#Try setting Python's locale to lang
-			try:
-				locale.setlocale(locale.LC_ALL,lang)
-				localeChanged=True
-			except:
-				pass
-			if not localeChanged and '_' in lang:
-				#Python couldn'tsupport the language_country locale, just try language.
-				try:
-					locale.setlocale(locale.LC_ALL,lang.split('_')[0])
-				except:
-					pass
 			#Set the windows locale for this thread (NVDA core) to this locale.
 			LCID=localeNameToWindowsLCID(lang)
 			ctypes.windll.kernel32.SetThreadLocale(LCID)
@@ -177,6 +165,63 @@ def setLanguage(lang):
 		curLang="en"
 	# #9207: Python 3.8 adds gettext.pgettext, so add it to the built-in namespace.
 	trans.install(names=["pgettext"])
+	setLocale(curLang)
+
+
+def setLocale(localeName):
+	'''
+	Set python's locale using a `localeName` set by `setLanguage`.
+	Python 3.8's locale system allows you to set locales that you cannot get
+	so we must test for both ValueErrors and locale.Errors
+	'''
+
+	r'''
+	>>> import locale
+	>>> locale.setlocale(locale.LC_ALL, 'foobar')
+	Traceback (most recent call last):
+	File "<stdin>", line 1, in <module>
+	File "Python38-32\lib\locale.py", line 608, in setlocale
+		return _setlocale(category, locale)
+	locale.Error: unsupported locale setting
+	>>> locale.setlocale(locale.LC_ALL, 'en-GB')
+	'en-GB'
+	>>> locale.getlocale()
+	Traceback (most recent call last):
+	File "<stdin>", line 1, in <module>
+	File "Python38-32\lib\locale.py", line 591, in getlocale
+		return _parse_localename(localename)
+	File "Python38-32\lib\locale.py", line 499, in _parse_localename
+		raise ValueError('unknown locale: %s' % localename)
+	ValueError: unknown locale: en-GB
+	'''
+	# Try setting Python's locale to lang
+	localeChanged = False
+	try:
+		locale.setlocale(locale.LC_ALL, localeName)
+		locale.getlocale()
+		localeChanged = True
+	except (locale.Error, ValueError):
+		pass
+	if not localeChanged and '-' in localeName:
+		# Python couldn't support the language-country locale, try language_country.
+		try:
+			localeName = localeName.replace('-', '_')
+			locale.setlocale(locale.LC_ALL, localeName)
+			locale.getlocale()
+			localeChanged = True
+		except (locale.Error, ValueError):
+			pass
+	if not localeChanged and '_' in localeName:
+		# Python couldn't support the language_country locale, just try language.
+		try:
+			localeName = localeName.split('_')[0]
+			locale.setlocale(locale.LC_ALL, localeName)
+			locale.getlocale()
+			localeChanged = True
+		except (locale.Error, ValueError):
+			pass
+	if not localeChanged:
+		log.warning("python locale could not be set")
 
 
 def getLanguage() -> str:
