Merge 29e6a9f into 0316158

seanbudd · web-flow · commit 5f52a76b5774 · 2021-03-24T10:29:35.000+10:00
diff --git a/source/core.py b/source/core.py
@@ -447,9 +447,11 @@ 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)
-
+	
 	log.debug("Initializing garbageHandler")
 	garbageHandler.initialize()
 
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,38 @@ 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
+	'''
+	# Try setting Python's locale to lang
+	localeChanged = False
+	try:
+		locale.setlocale(locale.LC_ALL, localeName)
+		localeChanged = True
+	except locale.Error:
+		pass
+	if not localeChanged:
+		# Python couldn't support the language-country locale, try language_country.
+		try:
+			localeName = localeName.replace('-', '_')
+			locale.setlocale(locale.LC_ALL, localeName)
+			localeChanged = True
+		except locale.Error:
+			pass
+	if not localeChanged:
+		# Python couldn't support the language_country locale, just try language.
+		try:
+			localeName = localeName.split('_')[0]
+			locale.setlocale(locale.LC_ALL, localeName)
+			localeChanged = True
+		except locale.Error:
+			pass
+	if not localeChanged:
+		log.warning("python locale could not be set")
 
 
 def getLanguage() -> str:
