diff --git a/gui/src/main/groovy/com/muwire/gui/chat/CollectionLinkLabel.groovy b/gui/src/main/groovy/com/muwire/gui/chat/CollectionLinkLabel.groovy index 9603ed75..118a3602 100644 --- a/gui/src/main/groovy/com/muwire/gui/chat/CollectionLinkLabel.groovy +++ b/gui/src/main/groovy/com/muwire/gui/chat/CollectionLinkLabel.groovy @@ -18,7 +18,7 @@ class CollectionLinkLabel extends MuLinkLabel { StringBuffer sb = new StringBuffer() SizeFormatter.format(link.totalSize, sb) - return HTMLSanitizer.escape(link.name) + " (" + link.numFiles + " " + trans("FILES") + + return link.name + " (" + link.numFiles + " " + trans("FILES") + " " + sb.toString() + trans("BYTES_SHORT") + ")" } } diff --git a/gui/src/main/groovy/com/muwire/gui/chat/FileLinkLabel.groovy b/gui/src/main/groovy/com/muwire/gui/chat/FileLinkLabel.groovy index 5d95337c..5416fd31 100644 --- a/gui/src/main/groovy/com/muwire/gui/chat/FileLinkLabel.groovy +++ b/gui/src/main/groovy/com/muwire/gui/chat/FileLinkLabel.groovy @@ -19,6 +19,6 @@ class FileLinkLabel extends MuLinkLabel { StringBuffer sb = new StringBuffer() SizeFormatter.format(link.fileSize, sb) - HTMLSanitizer.escape(link.name) + " (" + sb.toString() + trans("BYTES_SHORT") + ")" + link.name + " (" + sb.toString() + trans("BYTES_SHORT") + ")" } } diff --git a/gui/src/main/groovy/com/muwire/gui/chat/MuLinkLabel.groovy b/gui/src/main/groovy/com/muwire/gui/chat/MuLinkLabel.groovy index 60e6287c..b66b99d0 100644 --- a/gui/src/main/groovy/com/muwire/gui/chat/MuLinkLabel.groovy +++ b/gui/src/main/groovy/com/muwire/gui/chat/MuLinkLabel.groovy @@ -1,6 +1,6 @@ package com.muwire.gui.chat - +import com.muwire.gui.HTMLSanitizer import com.muwire.gui.UISettings import com.muwire.core.mulinks.MuLink @@ -19,8 +19,8 @@ abstract class MuLinkLabel extends JLabel { this.settings = settings String visibleText = getVisibleText() - String nbspd = visibleText.replaceAll(" ", " ") - setText("$nbspd") + String escaped = HTMLSanitizer.escape(visibleText) + setText("$escaped") int preferredX = 0, preferredY = 24