X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FText.java;h=ee72385b32220c479e1e03ad2d8a378f59539e49;hb=2a25f7814eec9854022f1c9dee188bfbdb955591;hp=22056ed3cf0185ab5407903ce42b4036a7b91590;hpb=08fe2e33007063e30fe22dc1d290f8afaa18eb1d;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/output/Text.java b/src/be/nikiroo/fanfix/output/Text.java
index 22056ed..ee72385 100644
--- a/src/be/nikiroo/fanfix/output/Text.java
+++ b/src/be/nikiroo/fanfix/output/Text.java
@@ -1,33 +1,35 @@
 package be.nikiroo.fanfix.output;
 
+import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
-import java.net.URL;
+import java.io.OutputStreamWriter;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.StringId;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
-import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
+import be.nikiroo.fanfix.data.Story;
 
 class Text extends BasicOutput {
-	protected FileWriter writer;
+	protected BufferedWriter writer;
 	protected File targetDir;
 
 	@Override
 	public File process(Story story, File targetDir, String targetName)
 			throws IOException {
 		String targetNameOrig = targetName;
-		targetName += getDefaultExtension();
+		targetName += getDefaultExtension(false);
 
 		this.targetDir = targetDir;
 
 		File target = new File(targetDir, targetName);
 
-		writer = new FileWriter(target);
+		writer = new BufferedWriter(new OutputStreamWriter(
+				new FileOutputStream(target), "UTF-8"));
 		try {
 			super.process(story, targetDir, targetNameOrig);
 		} finally {
@@ -39,7 +41,7 @@ class Text extends BasicOutput {
 	}
 
 	@Override
-	protected String getDefaultExtension() {
+	public String getDefaultExtension(boolean readerTarget) {
 		return ".txt";
 	}
 
@@ -59,7 +61,8 @@ class Text extends BasicOutput {
 		writer.write(title);
 		writer.write("\n");
 		if (author != null && !author.isEmpty()) {
-			writer.write("©" + author);
+			writer.write(Instance.getTrans().getString(StringId.BY) + " "
+					+ author);
 		}
 		if (date != null && !date.isEmpty()) {
 			writer.write(" (");
@@ -101,7 +104,7 @@ class Text extends BasicOutput {
 	protected void writeParagraphHeader(Paragraph para) throws IOException {
 		if (para.getType() == ParagraphType.IMAGE) {
 			File file = new File(targetDir, getCurrentImageBestName(true));
-			Instance.getCache().saveAsImage(new URL(para.getContent()), file);
+			Instance.getCache().saveAsImage(para.getContentImage(), file);
 		}
 	}