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

Merge pull request #456 from Atheros1/master

Browse Source 
manually merge #431
This commit is contained in:
Jonathan Warren 2013-08-27 19:40:44 -07:00
commit c4e402b7f8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bitmessageqt/__init__.py
View File

@ -3409,7 +3409,11 @@ def run():
app = QtGui.QApplication(sys.argv) app = QtGui.QApplication(sys.argv)
translator = QtCore.QTranslator() translator = QtCore.QTranslator()
try:
locale_countrycode = str(locale.getdefaultlocale()[0]) locale_countrycode = str(locale.getdefaultlocale()[0])
except:
# The above is not compatible with all versions of OSX.
locale_countrycode = "en_US" # Default to english.
locale_lang = locale_countrycode[0:2] locale_lang = locale_countrycode[0:2]
user_countrycode = str(shared.config.get('bitmessagesettings', 'userlocale')) user_countrycode = str(shared.config.get('bitmessagesettings', 'userlocale'))
user_lang = user_countrycode[0:2] user_lang = user_countrycode[0:2]