X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=a6f6fb75125404225cf8eed459f48d7cca282294;hb=dddfac1d036f22b694a00c029744ac0e92168a8f;hp=b4af5e836598bdce5a5bc6d0b04b1b8297bf6aff;hpb=5bc9573be46f09ac92207e104915bd5babbd6d63;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index b4af5e8..a6f6fb7 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -17,6 +17,7 @@ import be.nikiroo.fanfix.library.LocalLibrary;
 import be.nikiroo.fanfix.library.RemoteLibrary;
 import be.nikiroo.utils.Cache;
 import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.Proxy;
 import be.nikiroo.utils.TempFiles;
 import be.nikiroo.utils.TraceHandler;
 import be.nikiroo.utils.resources.Bundles;
@@ -52,6 +53,9 @@ public class Instance {
 
 		// Most of the rest is dependent upon this:
 		createConfigs(configDir, false);
+		
+		// Proxy support
+		Proxy.use(Instance.getConfig().getString(Config.USE_PROXY));
 
 		// update tracer:
 		boolean debug = Instance.getConfig()
@@ -545,8 +549,11 @@ public class Instance {
 	private static String getLang() {
 		String lang = config.getString(Config.LANG);
 
-		if (System.getenv("LANG") != null && !System.getenv("LANG").isEmpty()) {
-			lang = System.getenv("LANG");
+		if (lang == null | lang.isEmpty()) {
+			if (System.getenv("LANG") != null
+					&& !System.getenv("LANG").isEmpty()) {
+				lang = System.getenv("LANG");
+			}
 		}
 
 		if (lang != null && lang.isEmpty()) {