Unlocalize CLI strings

7 files changed, 50 insertions, 97 deletions

diff --git a/install/check_lacked_trans.py b/install/check_lacked_trans.py
index 1caa6b27..010cdb7a 100644
--- a/install/check_lacked_trans.py
+++ b/install/check_lacked_trans.py
@@ -56,8 +56,9 @@ def main():
 
     src = files_in(dir, 'onionshare') + \
           files_in(dir, 'onionshare_gui') + \
-          files_in(dir, 'onionshare_gui/share_mode') + \
-          files_in(dir, 'onionshare_gui/receive_mode') + \
+          files_in(dir, 'onionshare_gui/mode') + \
+          files_in(dir, 'onionshare_gui/mode/share_mode') + \
+          files_in(dir, 'onionshare_gui/mode/receive_mode') + \
           files_in(dir, 'install/scripts') + \
           files_in(dir, 'tests')
     pysrc = [p for p in src if p.endswith('.py')]
diff --git a/onionshare/__init__.py b/onionshare/__init__.py
index 248ab68c..620ada98 100644
--- a/onionshare/__init__.py
+++ b/onionshare/__init__.py
@@ -22,7 +22,6 @@ import os, sys, time, argparse, threading
 from datetime import datetime
 from datetime import timedelta
 
-from . import strings
 from .common import Common
 from .web import Web
 from .onion import *
@@ -35,16 +34,8 @@ def main(cwd=None):
     """
     common = Common()
 
-    # Load the default settings and strings early, for the sake of being able to parse options.
-    # These won't be in the user's chosen locale necessarily, but we need to parse them
-    # early in order to even display the option to pass alternate settings (which might
-    # contain a preferred locale).
-    # If an alternate --config is passed, we'll reload strings later.
-    common.load_settings()
-    strings.load_strings(common)
-
     # Display OnionShare banner
-    print(strings._('version_string').format(common.version))
+    print("OnionShare {0:s} | https://onionshare.org/".format(common.version))
 
     # OnionShare CLI in OSX needs to change current working directory (#132)
     if common.platform == 'Darwin':
@@ -53,16 +44,16 @@ def main(cwd=None):
 
     # Parse arguments
     parser = argparse.ArgumentParser(formatter_class=lambda prog: argparse.HelpFormatter(prog,max_help_position=28))
-    parser.add_argument('--local-only', action='store_true', dest='local_only', help=strings._("help_local_only"))
-    parser.add_argument('--stay-open', action='store_true', dest='stay_open', help=strings._("help_stay_open"))
-    parser.add_argument('--auto-start-timer', metavar='<int>', dest='autostart_timer', default=0, help=strings._("help_autostart_timer"))
-    parser.add_argument('--auto-stop-timer', metavar='<int>', dest='autostop_timer', default=0, help=strings._("help_autostop_timer"))
-    parser.add_argument('--connect-timeout', metavar='<int>', dest='connect_timeout', default=120, help=strings._("help_connect_timeout"))
-    parser.add_argument('--stealth', action='store_true', dest='stealth', help=strings._("help_stealth"))
-    parser.add_argument('--receive', action='store_true', dest='receive', help=strings._("help_receive"))
-    parser.add_argument('--config', metavar='config', default=False, help=strings._('help_config'))
-    parser.add_argument('-v', '--verbose', action='store_true', dest='verbose', help=strings._("help_verbose"))
-    parser.add_argument('filename', metavar='filename', nargs='*', help=strings._('help_filename'))
+    parser.add_argument('--local-only', action='store_true', dest='local_only', help="Don't use Tor (only for development)")
+    parser.add_argument('--stay-open', action='store_true', dest='stay_open', help="Continue sharing after files have been sent")
+    parser.add_argument('--auto-start-timer', metavar='<int>', dest='autostart_timer', default=0, help="Schedule this share to start N seconds from now")
+    parser.add_argument('--auto-stop-timer', metavar='<int>', dest='autostop_timer', default=0, help="Stop sharing after a given amount of seconds")
+    parser.add_argument('--connect-timeout', metavar='<int>', dest='connect_timeout', default=120, help="Give up connecting to Tor after a given amount of seconds (default: 120)")
+    parser.add_argument('--stealth', action='store_true', dest='stealth', help="Use client authorization (advanced)")
+    parser.add_argument('--receive', action='store_true', dest='receive', help="Receive shares instead of sending them")
+    parser.add_argument('--config', metavar='config', default=False, help="Custom JSON config file location (optional)")
+    parser.add_argument('-v', '--verbose', action='store_true', dest='verbose', help="Log OnionShare errors to stdout, and web errors to disk")
+    parser.add_argument('filename', metavar='filename', nargs='*', help="List of files or folders to share")
     args = parser.parse_args()
 
     filenames = args.filename
@@ -94,10 +85,10 @@ def main(cwd=None):
         valid = True
         for filename in filenames:
             if not os.path.isfile(filename) and not os.path.isdir(filename):
-                print(strings._("not_a_file").format(filename))
+                print("{0:s} is not a valid file.".format(filename))
                 valid = False
             if not os.access(filename, os.R_OK):
-                print(strings._("not_a_readable_file").format(filename))
+                print("{0:s} is not a readable file.".format(filename))
                 valid = False
         if not valid:
             sys.exit()
@@ -105,8 +96,6 @@ def main(cwd=None):
     # Re-load settings, if a custom config was passed in
     if config:
         common.load_settings(config)
-        # Re-load the strings, in case the provided config has changed locale
-        strings.load_strings(common)
 
     # Verbose mode?
     common.verbose = verbose
@@ -138,7 +127,7 @@ def main(cwd=None):
         if autostart_timer > 0:
             # Can't set a schedule that is later than the auto-stop timer
             if app.autostop_timer > 0 and app.autostop_timer < autostart_timer:
-                print(strings._('gui_autostop_timer_cant_be_earlier_than_autostart_timer'))
+                print("The auto-stop time can't be the same or earlier than the auto-start time. Please update it to start sharing.")
                 sys.exit()
 
             app.start_onion_service(False, True)
@@ -148,24 +137,24 @@ def main(cwd=None):
                 url = 'http://{0:s}/{1:s}'.format(app.onion_host, web.slug)
             schedule = datetime.now() + timedelta(seconds=autostart_timer)
             if mode == 'receive':
-                print(strings._('receive_mode_data_dir').format(common.settings.get('data_dir')))
+                print("Files sent to you appear in this folder: {}".format(common.settings.get('data_dir')))
                 print('')
-                print(strings._('receive_mode_warning'))
+                print("Warning: Receive mode lets people upload files to your computer. Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing.")
                 print('')
                 if stealth:
-                    print(strings._("give_this_scheduled_url_receive_stealth").format(schedule.strftime("%I:%M:%S%p, %b %d, %y")))
+                    print("Give this address and HidServAuth lineto your sender, and tell them it won't be accessible until: {}".format(schedule.strftime("%I:%M:%S%p, %b %d, %y")))
                     print(app.auth_string)
                 else:
-                    print(strings._("give_this_scheduled_url_receive").format(schedule.strftime("%I:%M:%S%p, %b %d, %y")))
+                    print("Give this address to your sender, and tell them it won't be accessible until: {}".format(schedule.strftime("%I:%M:%S%p, %b %d, %y")))
             else:
                 if stealth:
-                    print(strings._("give_this_scheduled_url_share_stealth").format(schedule.strftime("%I:%M:%S%p, %b %d, %y")))
+                    print("Give this address and HidServAuth line to your recipient, and tell them it won't be accessible until: {}".format(schedule.strftime("%I:%M:%S%p, %b %d, %y")))
                     print(app.auth_string)
                 else:
-                    print(strings._("give_this_scheduled_url_share").format(schedule.strftime("%I:%M:%S%p, %b %d, %y")))
+                    print("Give this address to your recipient, and tell them it won't be accessible until: {}".format(schedule.strftime("%I:%M:%S%p, %b %d, %y")))
             print(url)
             print('')
-            print(strings._("waiting_for_scheduled_time"))
+            print("Waiting for the scheduled time before starting...")
             app.onion.cleanup(False)
             time.sleep(autostart_timer)
             app.start_onion_service()
@@ -181,7 +170,7 @@ def main(cwd=None):
 
     if mode == 'share':
         # Prepare files to share
-        print(strings._("preparing_files"))
+        print("Compressing files.")
         try:
             web.share_mode.set_file_info(filenames)
             app.cleanup_filenames += web.share_mode.cleanup_filenames
@@ -192,7 +181,7 @@ def main(cwd=None):
         # Warn about sending large files over Tor
         if web.share_mode.download_filesize >= 157286400:  # 150mb
             print('')
-            print(strings._("large_filesize"))
+            print("Warning: Sending a large share could take hours")
             print('')
 
     # Start OnionShare http service in new thread
@@ -222,31 +211,31 @@ def main(cwd=None):
 
         print('')
         if autostart_timer > 0:
-            print(strings._('server_started'))
+            print("Server started")
         else:
             if mode == 'receive':
-                print(strings._('receive_mode_data_dir').format(common.settings.get('data_dir')))
+                print("Files sent to you appear in this folder: {}".format(common.settings.get('data_dir')))
                 print('')
-                print(strings._('receive_mode_warning'))
+                print("Warning: Receive mode lets people upload files to your computer. Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing.")
                 print('')
 
                 if stealth:
-                    print(strings._("give_this_url_receive_stealth"))
+                    print("Give this address and HidServAuth to the sender:")
                     print(url)
                     print(app.auth_string)
                 else:
-                    print(strings._("give_this_url_receive"))
+                    print("Give this address to the sender:")
                     print(url)
             else:
                 if stealth:
-                    print(strings._("give_this_url_stealth"))
+                    print("Give this address and HidServAuth line to the recipient:")
                     print(url)
                     print(app.auth_string)
                 else:
-                    print(strings._("give_this_url"))
+                    print("Give this address to the recipient:")
                     print(url)
         print('')
-        print(strings._("ctrlc_to_stop"))
+        print("Press Ctrl+C to stop the server")
 
         # Wait for app to close
         while t.is_alive():
@@ -256,12 +245,12 @@ def main(cwd=None):
                     if mode == 'share':
                         # If there were no attempts to download the share, or all downloads are done, we can stop
                         if web.share_mode.download_count == 0 or web.done:
-                            print(strings._("close_on_autostop_timer"))
+                            print("Stopped because auto-stop timer ran out")
                             web.stop(app.port)
                             break
                     if mode == 'receive':
                         if web.receive_mode.upload_count == 0 or not web.receive_mode.uploads_in_progress:
-                            print(strings._("close_on_autostop_timer"))
+                            print("Stopped because auto-stop timer ran out")
                             web.stop(app.port)
                             break
                         else:
diff --git a/onionshare/onion.py b/onionshare/onion.py
index 51336df9..bc2c4e1d 100644
--- a/onionshare/onion.py
+++ b/onionshare/onion.py
@@ -161,8 +161,10 @@ class Onion(object):
         if custom_settings:
             self.settings = custom_settings
         else:
+            self.common.load_settings()
             self.settings = self.common.settings
 
+        strings.load_strings(self.common)
         # The Tor controller
         self.c = None
 
diff --git a/onionshare_gui/__init__.py b/onionshare_gui/__init__.py
index 828d5ee3..99c52937 100644
--- a/onionshare_gui/__init__.py
+++ b/onionshare_gui/__init__.py
@@ -26,7 +26,6 @@ import signal
 from .widgets import Alert
 from PyQt5 import QtCore, QtWidgets
 
-from onionshare import strings
 from onionshare.common import Common
 from onionshare.onion import Onion
 from onionshare.onionshare import OnionShare
@@ -59,16 +58,8 @@ def main():
     common = Common()
     common.define_css()
 
-    # Load the default settings and strings early, for the sake of being able to parse options.
-    # These won't be in the user's chosen locale necessarily, but we need to parse them
-    # early in order to even display the option to pass alternate settings (which might
-    # contain a preferred locale).
-    # If an alternate --config is passed, we'll reload strings later.
-    common.load_settings()
-    strings.load_strings(common)
-
     # Display OnionShare banner
-    print(strings._('version_string').format(common.version))
+    print("OnionShare {0:s} | https://onionshare.org/".format(common.version))
 
     # Allow Ctrl-C to smoothly quit the program instead of throwing an exception
     # https://stackoverflow.com/questions/42814093/how-to-handle-ctrlc-in-python-app-with-pyqt
@@ -80,10 +71,10 @@ def main():
 
     # Parse arguments
     parser = argparse.ArgumentParser(formatter_class=lambda prog: argparse.HelpFormatter(prog,max_help_position=48))
-    parser.add_argument('--local-only', action='store_true', dest='local_only', help=strings._("help_local_only"))
-    parser.add_argument('-v', '--verbose', action='store_true', dest='verbose', help=strings._("help_verbose"))
-    parser.add_argument('--filenames', metavar='filenames', nargs='+', help=strings._('help_filename'))
-    parser.add_argument('--config', metavar='config', default=False, help=strings._('help_config'))
+    parser.add_argument('--local-only', action='store_true', dest='local_only', help="Don't use Tor (only for development)")
+    parser.add_argument('-v', '--verbose', action='store_true', dest='verbose', help="Log OnionShare errors to stdout, and web errors to disk")
+    parser.add_argument('--filenames', metavar='filenames', nargs='+', help="List of files or folders to share")
+    parser.add_argument('--config', metavar='config', default=False, help="Custom JSON config file location (optional)")
     args = parser.parse_args()
 
     filenames = args.filenames
@@ -93,9 +84,7 @@ def main():
 
     config = args.config
     if config:
-        # Re-load the strings, in case the provided config has changed locale
         common.load_settings(config)
-        strings.load_strings(common)
 
     local_only = bool(args.local_only)
     verbose = bool(args.verbose)
@@ -108,10 +97,10 @@ def main():
         valid = True
         for filename in filenames:
             if not os.path.isfile(filename) and not os.path.isdir(filename):
-                Alert(common, strings._("not_a_file").format(filename))
+                Alert(common, "{0:s} is not a valid file.".format(filename))
                 valid = False
             if not os.access(filename, os.R_OK):
-                Alert(common, strings._("not_a_readable_file").format(filename))
+                Alert(common, "{0:s} is not a readable file.".format(filename))
                 valid = False
         if not valid:
             sys.exit()
diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index 88c0052e..88f85deb 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -62,6 +62,10 @@ class OnionShareGui(QtWidgets.QMainWindow):
         self.config = config
         if self.config:
             self.common.load_settings(self.config)
+        else:
+            self.common.load_settings()
+
+        strings.load_strings(self.common)
 
         # System tray
         menu = QtWidgets.QMenu()
diff --git a/onionshare_gui/update_checker.py b/onionshare_gui/update_checker.py
index a7e0b99c..1e37b73a 100644
--- a/onionshare_gui/update_checker.py
+++ b/onionshare_gui/update_checker.py
@@ -25,7 +25,7 @@ from distutils.version import LooseVersion as Version
 from onionshare.settings import Settings
 from onionshare.onion import Onion
 
-from . import strings
+from onionshare import strings
 
 class UpdateCheckerCheckError(Exception):
     """
diff --git a/share/locale/en.json b/share/locale/en.json
index d4886844..e546487a 100644
--- a/share/locale/en.json
+++ b/share/locale/en.json
@@ -1,33 +1,11 @@
 {
     "config_onion_service": "Setting up onion service on port {0:d}.",
     "preparing_files": "Compressing files.",
-    "give_this_url": "Give this address to the recipient:",
-    "give_this_url_stealth": "Give this address and HidServAuth line to the recipient:",
-    "give_this_url_receive": "Give this address to the sender:",
-    "give_this_url_receive_stealth": "Give this address and HidServAuth to the sender:",
-    "give_this_scheduled_url_share": "Give this address to your recipient, and tell them it won't be accessible until: {}",
-    "give_this_scheduled_url_receive": "Give this address to your sender, and tell them it won't be accessible until: {}",
-    "give_this_scheduled_url_share_stealth": "Give this address and HidServAuth line to your recipient, and tell them it won't be accessible until: {}",
-    "give_this_scheduled_url_receive_stealth": "Give this address and HidServAuth lineto your sender, and tell them it won't be accessible until: {}",
-    "server_started": "Server started",
-    "ctrlc_to_stop":  "Press Ctrl+C to stop the server",
-    "not_a_file": "{0:s} is not a valid file.",
-    "not_a_readable_file": "{0:s} is not a readable file.",
     "no_available_port": "Could not find an available port to start the onion service",
     "other_page_loaded": "Address loaded",
     "close_on_autostop_timer": "Stopped because auto-stop timer ran out",
     "closing_automatically": "Stopped because transfer is complete",
     "large_filesize": "Warning: Sending a large share could take hours",
-    "help_local_only": "Don't use Tor (only for development)",
-    "help_stay_open": "Continue sharing after files have been sent",
-    "help_autostart_timer": "Schedule this share to start N seconds from now",
-    "help_autostop_timer": "Stop sharing after a given amount of seconds",
-    "help_connect_timeout": "Give up connecting to Tor after a given amount of seconds (default: 120)",
-    "help_stealth": "Use client authorization (advanced)",
-    "help_receive": "Receive shares instead of sending them",
-    "help_verbose": "Log OnionShare errors to stdout, and web errors to disk",
-    "help_filename": "List of files or folders to share",
-    "help_config": "Custom JSON config file location (optional)",
     "gui_drag_and_drop": "Drag and drop files and folders\nto start sharing",
     "gui_add": "Add",
     "gui_add_files": "Add Files",
@@ -117,7 +95,6 @@
     "settings_test_success": "Connected to the Tor controller.\n\nTor version: {}\nSupports ephemeral onion services: {}.\nSupports client authentication: {}.\nSupports next-gen .onion addresses: {}.",
     "error_tor_protocol_error": "There was an error with Tor: {}",
     "error_tor_protocol_error_unknown": "There was an unknown error with Tor",
-    "error_invalid_private_key": "This private key type is unsupported",
     "connecting_to_tor": "Connecting to the Tor network",
     "update_available": "New OnionShare out. <a href='{}'>Click here</a> to get it.<br><br>You are using {} and the latest is {}.",
     "update_error_check_error": "Could not check for new versions: The OnionShare website is saying the latest version is the unrecognizable '{}'…",
@@ -156,11 +133,7 @@
     "history_in_progress_tooltip": "{} in progress",
     "history_completed_tooltip": "{} completed",
     "error_cannot_create_data_dir": "Could not create OnionShare data folder: {}",
-    "receive_mode_data_dir": "Files sent to you appear in this folder: {}",
-    "receive_mode_warning": "Warning: Receive mode lets people upload files to your computer. Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing.",
     "gui_receive_mode_warning": "Receive mode lets people upload files to your computer.<br><br><b>Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing.</b>",
-    "receive_mode_upload_starting": "Upload of total size {} is starting",
-    "receive_mode_received_file": "Received: {}",
     "gui_mode_share_button": "Share Files",
     "gui_mode_receive_button": "Receive Files",
     "gui_settings_receiving_label": "Receiving settings",
@@ -184,10 +157,6 @@
     "gui_all_modes_history": "History",
     "gui_all_modes_clear_history": "Clear All",
     "gui_all_modes_transfer_started": "Started {}",
-    "gui_all_modes_transfer_finished_range": "Transferred {} - {}",
-    "gui_all_modes_transfer_finished": "Transferred {}",
-    "gui_all_modes_transfer_canceled_range": "Canceled {} - {}",
-    "gui_all_modes_transfer_canceled": "Canceled {}",
     "gui_all_modes_progress_complete": "%p%, {0:s} elapsed.",
     "gui_all_modes_progress_starting": "{0:s}, %p% (calculating)",
     "gui_all_modes_progress_eta": "{0:s}, ETA: {1:s}, %p%",
@@ -195,7 +164,6 @@
     "gui_share_mode_autostop_timer_waiting": "Waiting to finish sending",
     "gui_receive_mode_no_files": "No Files Received Yet",
     "gui_receive_mode_autostop_timer_waiting": "Waiting to finish receiving",
-    "waiting_for_scheduled_time": "Waiting for the scheduled time before starting...",
     "days_first_letter": "d",
     "hours_first_letter": "h",
     "minutes_first_letter": "m",