X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FBasicOutput.java;h=62a008c001b8b3697671079ab34b839fef74bf31;hp=dc6fe51de2cb1d6e66c4bbe06af2e1850bf99847;hb=HEAD;hpb=276f95c6ca9a79d2fc6879877b240cefb4ceb598

diff --git a/src/be/nikiroo/fanfix/output/BasicOutput.java b/src/be/nikiroo/fanfix/output/BasicOutput.java
index dc6fe51..62a008c 100644
--- a/src/be/nikiroo/fanfix/output/BasicOutput.java
+++ b/src/be/nikiroo/fanfix/output/BasicOutput.java
@@ -12,6 +12,7 @@ import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.Version;
 
 /**
  * This class is the base class used by the other output classes. It can be used
@@ -62,13 +63,13 @@ public abstract class BasicOutput {
 			StringId id = longDesc ? StringId.OUTPUT_DESC
 					: StringId.OUTPUT_DESC_SHORT;
 
-			String desc = Instance.getTrans().getStringX(id, this.name());
+			String desc = Instance.getInstance().getTrans().getStringX(id, this.name());
 
 			if (desc == null) {
-				desc = Instance.getTrans().getString(id, this);
+				desc = Instance.getInstance().getTrans().getString(id, this.toString());
 			}
 
-			if (desc == null) {
+			if (desc == null || desc.isEmpty()) {
 				desc = this.toString();
 			}
 
@@ -150,7 +151,8 @@ public abstract class BasicOutput {
 	}
 
 	/** The creator name (this program, by me!) */
-	static final String EPUB_CREATOR = "Fanfix (by Niki)";
+	static protected final String EPUB_CREATOR = "Fanfix "
+			+ Version.getCurrentVersion() + " (by Niki)";
 
 	/** The current best name for an image */
 	private String imageName;
@@ -297,27 +299,21 @@ public abstract class BasicOutput {
 		return "";
 	}
 
-	@SuppressWarnings("unused")
 	protected void writeStoryHeader(Story story) throws IOException {
 	}
 
-	@SuppressWarnings("unused")
 	protected void writeChapterHeader(Chapter chap) throws IOException {
 	}
 
-	@SuppressWarnings("unused")
 	protected void writeParagraphHeader(Paragraph para) throws IOException {
 	}
 
-	@SuppressWarnings("unused")
 	protected void writeStoryFooter(Story story) throws IOException {
 	}
 
-	@SuppressWarnings("unused")
 	protected void writeChapterFooter(Chapter chap) throws IOException {
 	}
 
-	@SuppressWarnings("unused")
 	protected void writeParagraphFooter(Paragraph para) throws IOException {
 	}