Skip to content

Commit c2cfff2

Browse files
committed
Reworked translate function to be more accommodating
1 parent e7fffe7 commit c2cfff2

1 file changed

Lines changed: 3 additions & 12 deletions

File tree

src/bitmessagemain.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4058,27 +4058,18 @@ def arg(self,argument):
40584058
print 'Error message:', err
40594059
os._exit(0)
40604060

4061-
try:
4062-
_encoding = QtGui.QApplication.UnicodeUTF8
4063-
def _translate(context, text): # A non-QT version of _translate is defined below.
4064-
return QtGui.QApplication.translate(context, text)
4065-
except Exception as err:
4066-
print 'Error:', err
4067-
40684061
import bitmessageqt
40694062
bitmessageqt.run()
40704063
else:
4071-
def _translate(context, text): # A QT version of _translate is defined above.
4072-
if '%' in text:
4073-
return translateClass(context, text.replace('%','',1))
4074-
else:
4075-
return text
40764064
shared.printLock.acquire()
40774065
print 'Running as a daemon. You can use Ctrl+C to exit.'
40784066
shared.printLock.release()
40794067
while True:
40804068
time.sleep(20)
40814069

4070+
def _translate(context, text):
4071+
return translateText(context, text)
4072+
40824073
def translateText(context, text):
40834074
if not shared.safeConfigGetBoolean('bitmessagesettings', 'daemon'):
40844075
try:

0 commit comments

Comments
 (0)