[freenet-cvs] r21911 - in branches/db4o/freenet/src/freenet: clients/http l10n

[t...@freenetproject.org]

Author: toad
Date: 2008-08-15 16:38:33 +0000 (Fri, 15 Aug 2008)
New Revision: 21911

Modified:
   branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
   branches/db4o/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
Show the total queued data on the queue page.


Modified: branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java    
2008-08-15 16:38:11 UTC (rev 21910)
+++ branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java    
2008-08-15 16:38:33 UTC (rev 21911)
@@ -763,6 +763,14 @@
                        navigationContent.addChild("li").addChild("a", "href", 
"#uncompletedDirUpload", L10n.getString("QueueToadlet.DUinProgress", new 
String[]{ "size" }, new String[]{ String.valueOf(uncompletedDirUpload.size()) 
}));
                        includeNavigationBar = true;
                }
+               if (totalQueuedDownloadSize > 0) {
+                       navigationContent.addChild("li", 
L10n.getString("QueueToadlet.totalQueuedDownloads", "size", 
SizeUtil.formatSize(totalQueuedDownloadSize)));
+                       includeNavigationBar = true;
+               }
+               if (totalQueuedUploadSize > 0) {
+                       navigationContent.addChild("li", 
L10n.getString("QueueToadlet.totalQueuedUploads", "size", 
SizeUtil.formatSize(totalQueuedUploadSize)));
+                       includeNavigationBar = true;
+               }

                if (includeNavigationBar) {
                        contentNode.addChild(navigationBar);

Modified: branches/db4o/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- branches/db4o/freenet/src/freenet/l10n/freenet.l10n.en.properties   
2008-08-15 16:38:11 UTC (rev 21910)
+++ branches/db4o/freenet/src/freenet/l10n/freenet.l10n.en.properties   
2008-08-15 16:38:33 UTC (rev 21911)
@@ -993,13 +993,15 @@
 QueueToadlet.uploadProgressbarNotAccurate=This progress value is likely to 
change as the upload encodes more blocks
 QueueToadlet.reason=Reason
 QueueToadlet.remove=Remove
-QueueToadlet.requestNavigation=Request Navigation
+QueueToadlet.requestNavigation=Request Navigation and Totals
 QueueToadlet.restart=Restart
 QueueToadlet.siteUploadSucceededTitle=Freesite insert succeeded: ${filename}
 QueueToadlet.siteUploadSucceeded=Your freesite ${filename} (${files} files, 
${size} total size) has been successfully uploaded to Freenet. ${link}Click 
here${/link} to open the site homepage.
 QueueToadlet.size=Size
 QueueToadlet.starting=STARTING
 QueueToadlet.title=Global queue of ${nodeName}
+QueueToadlet.totalQueuedDownloads=Total queued downloads: ${size}
+QueueToadlet.totalQueuedUploads=Total queued uploads: ${size}
 QueueToadlet.totalSize=Total Size
 QueueToadlet.unknown=Unknown
 QueueToadlet.uploadSucceededTitle=Insert succeeded: ${filename}