Bitmessage/PyBitmessage-2024-12-06
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Merge pull request #522 from Atheros1/master

Browse Source 
Bug fixes
This commit is contained in:
Jonathan Warren 2013-10-05 10:43:22 -07:00
commit 5ca93907f1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bitmessageqt/__init__.py
View File

@ -3234,7 +3234,10 @@ def run():
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]
translation_path = "translations/bitmessage_" try:
translation_path = os.path.join(sys._MEIPASS, "translations/bitmessage_")
except Exception, e:
translation_path = "translations/bitmessage_"
if shared.config.get('bitmessagesettings', 'userlocale') == 'system': if shared.config.get('bitmessagesettings', 'userlocale') == 'system':
# try to detect the users locale otherwise fallback to English # try to detect the users locale otherwise fallback to English

2
src/class_receiveDataThread.py
View File

@ -1120,7 +1120,7 @@ class receiveDataThread(threading.Thread):
else: # We're using a whitelist else: # We're using a whitelist
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''SELECT label FROM whitelist where address=? and enabled='1' ''', '''SELECT label FROM whitelist where address=? and enabled='1' ''',
toAddress) fromAddress)
if queryreturn == []: if queryreturn == []:
print 'Message ignored because address not in whitelist.' print 'Message ignored because address not in whitelist.'
blockMessage = True blockMessage = True