Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-06-24 14:30:29 -04:00
Code Issues Projects Releases Packages Wiki Activity

Added estimated time remaining strings to English locale file

Browse source
This commit is contained in:
Micah Lee 2016-02-12 08:58:29 -08:00
parent 3c3ea6faf3
commit 41b3e6ab9d
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
locale/en.json
View file

@ -41,5 +41,8 @@
"gui_please_wait": "Please wait...", "gui_please_wait": "Please wait...",
"error_hs_dir_cannot_create": "Cannot create hidden service dir {0:s}", "error_hs_dir_cannot_create": "Cannot create hidden service dir {0:s}",
"error_hs_dir_not_writable": "Hidden service dir {0:s} is not writable", "error_hs_dir_not_writable": "Hidden service dir {0:s} is not writable",
"using_ephemeral": "Staring ephemeral Tor hidden service and awaiting publication" "using_ephemeral": "Staring ephemeral Tor hidden service and awaiting publication",
"gui_download_progress_complete": "%p%, Time Elapsed: {0:s}",
"gui_download_progress_starting": "{0:s}, %p% (Computing ETA)",
"gui_download_progress_eta": "{0:s}, ETA: {1:s}, %p%"
} }

6
onionshare_gui/downloads.py
View file

@ -52,7 +52,7 @@ class Download(object):
self.progress_bar.setValue(downloaded_bytes) self.progress_bar.setValue(downloaded_bytes)
if downloaded_bytes == self.progress_bar.total_bytes: if downloaded_bytes == self.progress_bar.total_bytes:
pb_fmt = "%p%, Time Elapsed: {0:s}".format( pb_fmt = strings._('gui_download_progress_complete').format(
helpers.format_seconds(time.time() - self.started)) helpers.format_seconds(time.time() - self.started))
else: else:
elapsed = time.time() - self.started elapsed = time.time() - self.started
@ -60,10 +60,10 @@ class Download(object):
# Wait a couple of seconds for the download rate to stabilize. # Wait a couple of seconds for the download rate to stabilize.
# This prevents an "Windows copy dialog"-esque experience at # This prevents an "Windows copy dialog"-esque experience at
# the beginning of the download. # the beginning of the download.
pb_fmt = "{0:s}, %p% (Computing ETA)".format( pb_fmt = strings._('gui_download_progress_starting').format(
helpers.human_readable_filesize(downloaded_bytes)) helpers.human_readable_filesize(downloaded_bytes))
else: else:
pb_fmt = "{0:s}, ETA: {1:s}, %p%".format( pb_fmt = strings._('gui_download_progress_eta').format(
helpers.human_readable_filesize(downloaded_bytes), helpers.human_readable_filesize(downloaded_bytes),
self.estimated_time_remaining) self.estimated_time_remaining)