add translated() to return encoded translated strings

1 files changed, 14 insertions, 10 deletions

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