X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FBasicReader.java;h=c749a59cdc6e1c1149282a78c6b777ef1f680a2b;hp=63c34b0fb5cea1db3adfdfc1011390d4428986dd;hb=91b82a5cbd8a9c90798d1bd49bfa9a061e652a6a;hpb=a4a94451785cb983d369b746198586e8644ba80a

diff --git a/src/be/nikiroo/fanfix/reader/BasicReader.java b/src/be/nikiroo/fanfix/reader/BasicReader.java
index 63c34b0..c749a59 100644
--- a/src/be/nikiroo/fanfix/reader/BasicReader.java
+++ b/src/be/nikiroo/fanfix/reader/BasicReader.java
@@ -231,7 +231,11 @@ public abstract class BasicReader implements Reader {
 		metaDesc.put("Publication date", formatDate(meta.getDate()));
 		metaDesc.put("Published on", meta.getPublisher());
 		metaDesc.put("URL", meta.getUrl());
-		metaDesc.put("Word count", format(meta.getWords()));
+		if (meta.isImageDocument()) {
+			metaDesc.put("Number of images", format(meta.getWords()));
+		} else {
+			metaDesc.put("Number of words", format(meta.getWords()));
+		}
 		metaDesc.put("Source", meta.getSource());
 		metaDesc.put("Subject", meta.getSubject());
 		metaDesc.put("Language", meta.getLang());
@@ -347,8 +351,20 @@ public abstract class BasicReader implements Reader {
 		}
 	}
 
+	/**
+	 * @deprecated use StringUtils when updated
+	 */
+	@Deprecated
 	static private String format(long value) {
+		//TODO: use StringUtils
+		
 		String display = "";
+		String suffix = "";
+
+		if (value > 4000) {
+			value = value / 1000;
+			suffix = "k";
+		}
 
 		while (value > 0) {
 			if (!display.isEmpty()) {
@@ -358,7 +374,7 @@ public abstract class BasicReader implements Reader {
 			value = value / 1000;
 		}
 
-		return display;
+		return display + suffix;
 	}
 
 	static private String formatDate(String date) {