Fix nice size
authorJamie Cameron <jcameron@webmin.com>
Thu, 14 Jan 2010 19:24:52 +0000 (11:24 -0800)
committerJamie Cameron <jcameron@webmin.com>
Thu, 14 Jan 2010 19:24:52 +0000 (11:24 -0800)
lang/en
web-lib-funcs.pl

diff --git a/lang/en b/lang/en
index 0eb7881..c2b07b8 100644 (file)
--- a/lang/en
+++ b/lang/en
@@ -256,8 +256,8 @@ feedback_ecannot2=You are not allowed to send feedback containing config files
 
 progress_size2=Downloading $1 ($2) ..
 progress_nosize=Downloading $1 ..
-progress_data=Received $1 bytes ($2 %)
-progress_data2=Received $1 bytes
+progress_datan=Received $1 ($2 %)
+progress_data2n=Received $1
 progress_done=.. download complete.
 progress_incache=Found $1 in cache ..
 
index 9207847..03a2974 100755 (executable)
@@ -6301,7 +6301,7 @@ elsif ($_[0] == 3) {
                if ($st != $progress_step ||
                    $time_now - $last_progress_time > 60) {
                        # Show progress every 10% or 60 seconds
-                       print $sp,&text('progress_data', &nice_size($_[1]),
+                       print $sp,&text('progress_datan', &nice_size($_[1]),
                                        int($_[1]*100/$progress_size)),"<br>\n";
                        $last_progress_time = $time_now;
                        }
@@ -6310,7 +6310,7 @@ elsif ($_[0] == 3) {
        else {
                # No total size .. so only show in 100k jumps
                if ($_[1] > $last_progress_size+100*1024) {
-                       print $sp,&text('progress_data2',
+                       print $sp,&text('progress_data2n',
                                        &nice_size($_[1])),"<br>\n";
                        $last_progress_size = $_[1];
                        }