Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-28 23:37:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Working on #44 (for English), need to test how torbrowser-launcher works on linux

Browse Source
This commit is contained in:
twhite 2014-06-30 11:14:06 -04:00
parent 7f0d3b836f
commit 5f742f2002
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
onionshare/onionshare.py
View File

@ -223,7 +223,18 @@ def start_hidden_service(port):
except SocketError: except SocketError:
pass pass
if not controller: if not controller:
raise NoTor(translated("cant_connect_ctrlport").format(controlports)) if sys.platform == 'win32' or sys.platform == 'darwin':
additional_instructions = "If Tor is installed, please make sure that it is running and try launching" \
" Onionshare again.\nIf Tor is not installed, please download and " \
"install it from www.torproject.com"
raise NoTor(translated("cant_connect_ctrlport").format(controlports, additional_instructions))
elif sys.platform == 'linux2':
def start_torbrowser_launcher():
"""will attempt to start package with a try/except block, if an exception is raised, will
instruct to download tor browser bundle."""
pass
raise NoTor(translated("cant_connect_ctrlport").format(controlports, "is Tor running?"))
controller.authenticate() controller.authenticate()
# set up hidden service # set up hidden service

2
onionshare/strings.json
View File

@ -3,7 +3,7 @@
"closing_hole": "Closing hole in firewall.", "closing_hole": "Closing hole in firewall.",
"calculating_sha1": "Calculating SHA1 checksum.", "calculating_sha1": "Calculating SHA1 checksum.",
"connecting_ctrlport": "Connecting to Tor control port to set up hidden service on port {0}.", "connecting_ctrlport": "Connecting to Tor control port to set up hidden service on port {0}.",
"cant_connect_ctrlport": "Cannot connect to Tor control port on port {0}. Is Tor running?", "cant_connect_ctrlport": "Cannot connect to Tor control port on port {0}. {1}",
"give_this_url": "Give this URL to the person you're sending the file to:", "give_this_url": "Give this URL to the person you're sending the file to:",
"ctrlc_to_stop": "Press Ctrl-C to stop server", "ctrlc_to_stop": "Press Ctrl-C to stop server",
"not_a_file": "{0} is not a file.", "not_a_file": "{0} is not a file.",