diff options
Diffstat (limited to 'onionshare/web/receive_mode.py')
| -rw-r--r-- | onionshare/web/receive_mode.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/onionshare/web/receive_mode.py b/onionshare/web/receive_mode.py index d6ef86ad..bc805445 100644 --- a/onionshare/web/receive_mode.py +++ b/onionshare/web/receive_mode.py @@ -79,7 +79,7 @@ class ReceiveModeWeb(object): }) self.common.log('ReceiveModeWeb', 'define_routes', '/upload, uploaded {}, saving to {}'.format(f.filename, local_path)) - print('\n' + strings._('receive_mode_received_file').format(local_path)) + print('\n' + "Received: {}".format(local_path)) if request.upload_error: self.common.log('ReceiveModeWeb', 'define_routes', '/upload, there was an upload error') @@ -87,7 +87,7 @@ class ReceiveModeWeb(object): self.web.add_request(self.web.REQUEST_ERROR_DATA_DIR_CANNOT_CREATE, request.path, { "receive_mode_dir": request.receive_mode_dir }) - print(strings._('error_cannot_create_data_dir').format(request.receive_mode_dir)) + print("Could not create OnionShare data folder: {}".format(request.receive_mode_dir)) msg = 'Error uploading, please inform the OnionShare user' if ajax: @@ -112,12 +112,14 @@ class ReceiveModeWeb(object): else: flash(msg, 'info') else: + msg = 'Sent ' for filename in filenames: - msg = 'Sent {}'.format(filename) - if ajax: - info_flashes.append(msg) - else: - flash(msg, 'info') + msg += '{}, '.format(filename) + msg = msg.rstrip(', ') + if ajax: + info_flashes.append(msg) + else: + flash(msg, 'info') if self.can_upload: if ajax: @@ -297,6 +299,7 @@ class ReceiveModeRequest(Request): new_receive_mode_dir = '{}-{}'.format(self.receive_mode_dir, i) try: os.makedirs(new_receive_mode_dir, 0o700, exist_ok=False) + self.receive_mode_dir = new_receive_mode_dir break except OSError: pass @@ -310,7 +313,7 @@ class ReceiveModeRequest(Request): self.web.add_request(self.web.REQUEST_ERROR_DATA_DIR_CANNOT_CREATE, request.path, { "receive_mode_dir": self.receive_mode_dir }) - print(strings._('error_cannot_create_data_dir').format(self.receive_mode_dir)) + print("Could not create OnionShare data folder: {}".format(self.receive_mode_dir)) self.web.common.log('ReceiveModeRequest', '__init__', 'Permission denied creating receive mode directory') self.upload_error = True |