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

resolve minor merge conflict with master

Browse Source
This commit is contained in:
Jonathan Warren 2014-10-12 23:33:09 -04:00
commit b6e0396333
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bitmessagemain.py
View File

@ -174,6 +174,7 @@ class Main:
curses = True
signal.signal(signal.SIGINT, helper_generic.signal_handler)
signal.signal(signal.SIGTERM, helper_generic.signal_handler)
# signal.signal(signal.SIGINT, signal.SIG_DFL)
helper_bootstrap.knownNodes()

2
src/l10n.py
View File

@ -18,7 +18,7 @@ language = DEFAULT_LANGUAGE
try:
import locale
encoding = locale.getpreferredencoding(False) or DEFAULT_ENCODING
encoding = locale.getpreferredencoding(True) or DEFAULT_ENCODING
language = locale.getlocale()[0] or locale.getdefaultlocale()[0] or DEFAULT_LANGUAGE
except:
logger.exception('Could not determine language or encoding')