diff --git a/deluge/ui/webui/webui_plugin/render.py b/deluge/ui/webui/webui_plugin/render.py
index 4e4ae502f..f6fca2f94 100644
--- a/deluge/ui/webui/webui_plugin/render.py
+++ b/deluge/ui/webui/webui_plugin/render.py
@@ -129,6 +129,7 @@ template.Template.globals.update({
'self_url': self_url,
'fspeed': common.fspeed,
'fsize': common.fsize,
+ 'ftime':common.ftime,
'render': render, #for easy resuse of templates
'rev': 'rev.%s' % (REVNO, ),
'version': VERSION,
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/index.html b/deluge/ui/webui/webui_plugin/templates/advanced/index.html
index 5313ac739..4ef2f996d 100644
--- a/deluge/ui/webui/webui_plugin/templates/advanced/index.html
+++ b/deluge/ui/webui/webui_plugin/templates/advanced/index.html
@@ -114,7 +114,7 @@ $for torrent in torrent_list:
$else:
-
$torrent.eta |
+ $ftime(torrent.eta) |
$("%.3f" % torrent.distributed_copies) |
$("%.3f" % torrent.ratio) |
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/index.html b/deluge/ui/webui/webui_plugin/templates/deluge/index.html
index 4c29278fc..1bcda5173 100644
--- a/deluge/ui/webui/webui_plugin/templates/deluge/index.html
+++ b/deluge/ui/webui/webui_plugin/templates/deluge/index.html
@@ -40,7 +40,7 @@ $for torrent in torrent_list:
$torrent.num_peers ($torrent.total_peers) |
$fspeed(torrent.download_rate) |
$fspeed(torrent.upload_rate) |
- $torrent.eta |
+ $ftime(torrent.eta) |
$("%.3f" % torrent.distributed_copies) |
$("%.3f" % torrent.ratio) |
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/tab_meta.html b/deluge/ui/webui/webui_plugin/templates/deluge/tab_meta.html
index e7f7f4bf2..bdc5859b8 100644
--- a/deluge/ui/webui/webui_plugin/templates/deluge/tab_meta.html
+++ b/deluge/ui/webui/webui_plugin/templates/deluge/tab_meta.html
@@ -45,7 +45,7 @@ $fspeed(torrent.download_rate)
$torrent.num_peers ($torrent.total_peers ) |
$_('ETA'): |
-$torrent.eta |
+$ftime(torrent.eta) |
$_('Availability'): |
$("%.3f" % torrent.distributed_copies) |
@@ -62,7 +62,7 @@ $fspeed(torrent.download_rate)
$_('Total Size'): |
-$fspeed(torrent.total_size) |
+$fsize(torrent.total_size) |
$_('# Of Files'): |
$torrent.num_files |
diff --git a/deluge/ui/webui/webui_plugin/utils.py b/deluge/ui/webui/webui_plugin/utils.py
index a2db7c06c..b20cfad7a 100644
--- a/deluge/ui/webui/webui_plugin/utils.py
+++ b/deluge/ui/webui/webui_plugin/utils.py
@@ -37,7 +37,7 @@ from lib.webpy022 import changequery as self_url, template
from lib.webpy022.utils import Storage
from lib.webpy022.http import seeother, url
-from deluge.common import fsize,fspeed
+from deluge.common import fsize,fspeed,ftime
import traceback
import random