X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=df990d7f3b1431aabc81c3a3d6ceabaa91a21a94;hb=e604986c4208da0091d26bc0e1c4feb4ff3c588f;hp=14977822bec55ca032a26e266ac35445ca96c570;hpb=f1fb834c62f9d9a73edeeda3fed060e0dede8cef;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index 1497782..df990d7 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -6,12 +6,12 @@ import java.util.Date;
 
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.bundles.ConfigBundle;
+import be.nikiroo.fanfix.bundles.StringId;
 import be.nikiroo.fanfix.bundles.StringIdBundle;
 import be.nikiroo.fanfix.bundles.UiConfig;
 import be.nikiroo.fanfix.bundles.UiConfigBundle;
 import be.nikiroo.fanfix.library.BasicLibrary;
 import be.nikiroo.fanfix.library.LocalLibrary;
-import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.resources.Bundles;
 
@@ -104,11 +104,16 @@ public class Instance {
 		} catch (IOException e) {
 			syserr(e);
 		}
-		try {
-			trans = new StringIdBundle(getLang());
-			trans.updateFile(configDir);
-		} catch (IOException e) {
-			syserr(e);
+
+		// No updateFile for this one! (we do not want the user to have custom
+		// translations that won't accept updates from newer versions)
+		trans = new StringIdBundle(getLang());
+
+		// Fix an old bug (we used to store custom translation files by
+		// default):
+		if (trans.getString(StringId.INPUT_DESC_CBZ) == null) {
+			// TODO: create the deleteFile method
+			// trans.deleteFile(configDir);
 		}
 
 		Bundles.setDirectory(configDir);
@@ -116,8 +121,7 @@ public class Instance {
 		uiconfig = new UiConfigBundle();
 		trans = new StringIdBundle(getLang());
 		try {
-			lib = new LocalLibrary(getFile(Config.LIBRARY_DIR),
-					OutputType.INFO_TEXT, OutputType.CBZ);
+			lib = new LocalLibrary(getFile(Config.LIBRARY_DIR));
 		} catch (Exception e) {
 			syserr(new IOException("Cannot create library for directory: "
 					+ getFile(Config.LIBRARY_DIR), e));
@@ -128,7 +132,7 @@ public class Instance {
 		coverDir = getFile(Config.DEFAULT_COVERS_DIR);
 		File tmp = getFile(Config.CACHE_DIR);
 		readerTmp = getFile(UiConfig.CACHE_DIR_LOCAL_READER);
-		remoteDir = new File(getFile(Config.LIBRARY_DIR), "remote");
+		remoteDir = new File(configDir, "remote");
 
 		if (checkEnv("NOUTF")) {
 			trans.setUnicode(false);