Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-26 01:11:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

add translated() to return encoded translated strings

Browse Source
This commit is contained in:
Espen Kåsa Notodden 2014-06-26 21:51:54 +02:00
parent 4f35282511
commit c52fd0915e
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
onionshare/onionshare.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
import os, sys, subprocess, time, hashlib, platform, json, locale, socket, argparse, Queue, inspect, base64 import os, sys, subprocess, time, hashlib, platform, json, locale, socket, argparse, Queue, inspect, base64
from random import randint from random import randint
from functools import wraps from functools import wraps
@ -146,12 +147,12 @@ def is_root():
def tails_open_port(port): def tails_open_port(port):
if get_platform() == 'Tails': if get_platform() == 'Tails':
print strings["punching_a_hole"] print translated("punching_a_hole")
subprocess.call(['/sbin/iptables', '-I', 'OUTPUT', '-o', 'lo', '-p', 'tcp', '--dport', str(port), '-j', 'ACCEPT']) subprocess.call(['/sbin/iptables', '-I', 'OUTPUT', '-o', 'lo', '-p', 'tcp', '--dport', str(port), '-j', 'ACCEPT'])
def tails_close_port(port): def tails_close_port(port):
if get_platform() == 'Tails': if get_platform() == 'Tails':
print strings["closing_hole"] print translated("closing_hole")
subprocess.call(['/sbin/iptables', '-I', 'OUTPUT', '-o', 'lo', '-p', 'tcp', '--dport', str(port), '-j', 'REJECT']) subprocess.call(['/sbin/iptables', '-I', 'OUTPUT', '-o', 'lo', '-p', 'tcp', '--dport', str(port), '-j', 'REJECT'])
def load_strings(default="en"): def load_strings(default="en"):
@ -168,9 +169,12 @@ def load_strings(default="en"):
# if a string doesn't exist, fallback to English # if a string doesn't exist, fallback to English
for key in translated[default]: for key in translated[default]:
if key in translated[lang]: if key in translated[lang]:
strings[key] = translated[lang][key].encode("utf-8") strings[key] = translated[lang][key]
return strings return strings
def translated(k):
return strings[k].encode("utf-8")
def file_crunching(filename): def file_crunching(filename):
# calculate filehash, file size # calculate filehash, file size
BLOCKSIZE = 65536 BLOCKSIZE = 65536
@ -213,7 +217,7 @@ def start_hidden_service(port):
except SocketError: except SocketError:
pass pass
if not controller: if not controller:
raise NoTor(strings["cant_connect_ctrlport"].format(controlports)) raise NoTor(translated("cant_connect_ctrlport").format(controlports))
controller.authenticate() controller.authenticate()
# set up hidden service # set up hidden service
@ -233,7 +237,7 @@ def main():
# check for root in Tails # check for root in Tails
if get_platform() == 'Tails' and not is_root(): if get_platform() == 'Tails' and not is_root():
sys.exit(strings["tails_requires_root"]) sys.exit(translated("tails_requires_root"))
# parse arguments # parse arguments
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
@ -249,7 +253,7 @@ def main():
stay_open = args.stay_open stay_open = args.stay_open
if not (filename and os.path.isfile(filename)): if not (filename and os.path.isfile(filename)):
sys.exit(strings["not_a_file"].format(filename)) sys.exit(translated("not_a_file").format(filename))
filename = os.path.abspath(filename) filename = os.path.abspath(filename)
port = choose_port() port = choose_port()
@ -257,24 +261,24 @@ def main():
if not local_only: if not local_only:
# try starting hidden service # try starting hidden service
print strings["connecting_ctrlport"].format(port) print translated("connecting_ctrlport").format(port)
try: try:
onion_host = start_hidden_service(port) onion_host = start_hidden_service(port)
except NoTor as e: except NoTor as e:
sys.exit(e.args[0]) sys.exit(e.args[0])
# startup # startup
print strings["calculating_sha1"] print translated("calculating_sha1")
filehash, filesize = file_crunching(filename) filehash, filesize = file_crunching(filename)
set_file_info(filename, filehash, filesize) set_file_info(filename, filehash, filesize)
tails_open_port(port) tails_open_port(port)
print '\n' + strings["give_this_url"] print '\n' + translated("give_this_url")
if local_only: if local_only:
print 'http://{0}/{1}'.format(local_host, slug) print 'http://{0}/{1}'.format(local_host, slug)
else: else:
print 'http://{0}/{1}'.format(onion_host, slug) print 'http://{0}/{1}'.format(onion_host, slug)
print '' print ''
print strings["ctrlc_to_stop"] print translated("ctrlc_to_stop")
# start the web server # start the web server
app.run(port=port) app.run(port=port)