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

Merge pull request #41 from tmwbook/master

Browse Source 
Fixed IOError in onionshare.py (load_strings())
This commit is contained in:
Micah Lee 2014-06-09 17:29:49 -07:00
commit 02912d5fe0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
onionshare/onionshare.py
View File

@ -2,6 +2,7 @@ import os, sys, subprocess, time, hashlib, platform, json, locale, socket, argpa
from random import randint
from functools import wraps
def get_platform():
if 'ONIONSHARE_PLATFORM' in os.environ:
return os.environ['ONIONSHARE_PLATFORM']
@ -96,8 +97,10 @@ def tails_close_port(port):
def load_strings(default="en"):
global strings
translated = json.loads(open('{0}/strings.json'.format(
os.path.dirname(__file__))).read())
try:
translated = json.loads(open('{0}/strings.json'.format(os.getcwd())).read())
except IOError:
translated = json.loads(open('{0}/strings.json'.format(os.path.dirname(__file__))).read())
strings = translated[default]
lc, enc = locale.getdefaultlocale()
if lc: