citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Locale encoding fixes

Browse Source 
On non-Windows, setlocale will try both normalised and preferred
encoding.
This commit is contained in:
Peter Šurda 2016-05-24 08:44:07 +02:00
parent 6dff105a5b
commit e353af3195
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bitmessageqt/__init__.py
View File

@ -105,16 +105,20 @@ def change_translation(locale):
QtGui.QApplication.installTranslator(qsystranslator) QtGui.QApplication.installTranslator(qsystranslator)
lang = pythonlocale.normalize(l10n.getTranslationLanguage()) lang = pythonlocale.normalize(l10n.getTranslationLanguage())
langs = [lang.split(".")[0] + "." + l10n.encoding, lang]
if 'win32' in sys.platform or 'win64' in sys.platform: if 'win32' in sys.platform or 'win64' in sys.platform:
lang = l10n.getWindowsLocale(lang) langs = [l10n.getWindowsLocale(lang)]
try: for lang in langs:
pythonlocale.setlocale(pythonlocale.LC_ALL, lang) try:
if 'win32' not in sys.platform and 'win64' not in sys.platform: pythonlocale.setlocale(pythonlocale.LC_ALL, lang)
l10n.encoding = pythonlocale.nl_langinfo(pythonlocale.CODESET) if 'win32' not in sys.platform and 'win64' not in sys.platform:
else: l10n.encoding = pythonlocale.nl_langinfo(pythonlocale.CODESET)
l10n.encoding = pythonlocale.getlocale()[1] else:
except: l10n.encoding = pythonlocale.getlocale()[1]
logger.error("Failed to set locale to %s", lang, exc_info=True) logger.info("Successfully set locale to %s", lang)
break
except:
logger.error("Failed to set locale to %s", lang, exc_info=True)
class MyForm(settingsmixin.SMainWindow): class MyForm(settingsmixin.SMainWindow):