X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=733c16cf9a6e8705e1a602ec279e2b8309d6f395;hb=6bfa64ff2d9809039de5b53c3bad417ba7cd6606;hp=ece87186b7021a11118d8c42ed324c51a8374333;hpb=2aac79c740789071ad9b773d25f20e103f0da86c;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index ece8718..733c16c 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -8,6 +8,7 @@ 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.StringIdGuiBundle;
 import be.nikiroo.fanfix.bundles.UiConfig;
 import be.nikiroo.fanfix.bundles.UiConfigBundle;
 import be.nikiroo.fanfix.library.BasicLibrary;
@@ -30,6 +31,7 @@ public class Instance {
 	private static UiConfigBundle uiconfig;
 	private static StringIdBundle trans;
 	private static DataLoader cache;
+	private static StringIdGuiBundle transGui;
 	private static BasicLibrary lib;
 	private static File coverDir;
 	private static File readerTmp;
@@ -50,6 +52,10 @@ public class Instance {
 
 		// Most of the rest is dependent upon this:
 		createConfigs(configDir, false);
+		
+		// Proxy support
+		// TODO: include new nikiroo-utils version
+		// Proxy.use(Instance.getConfig().getString(Config.USE_PROXY));
 
 		// update tracer:
 		boolean debug = Instance.getConfig()
@@ -200,6 +206,8 @@ public class Instance {
 
 	/**
 	 * Get the (unique) {link StringIdBundle} for the program.
+	 * <p>
+	 * This is used for the translations of the core parts of Fanfix.
 	 * 
 	 * @return the {link StringIdBundle}
 	 */
@@ -207,6 +215,17 @@ public class Instance {
 		return trans;
 	}
 
+	/**
+	 * Get the (unique) {link StringIdGuiBundle} for the program.
+	 * <p>
+	 * This is used for the translations of the GUI parts of Fanfix.
+	 * 
+	 * @return the {link StringIdGuiBundle}
+	 */
+	public static StringIdGuiBundle getTransGui() {
+		return transGui;
+	}
+
 	/**
 	 * Get the (unique) {@link LocalLibrary} for the program.
 	 * 
@@ -350,7 +369,8 @@ public class Instance {
 
 	/**
 	 * Create the config variables ({@link Instance#config},
-	 * {@link Instance#uiconfig} and {@link Instance#trans}).
+	 * {@link Instance#uiconfig}, {@link Instance#trans} and
+	 * {@link Instance#transGui}).
 	 * 
 	 * @param configDir
 	 *            the directory where to find the configuration files
@@ -380,6 +400,7 @@ public class Instance {
 		// 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());
+		transGui = new StringIdGuiBundle(getLang());
 
 		// Fix an old bug (we used to store custom translation files by
 		// default):
@@ -389,6 +410,7 @@ public class Instance {
 
 		if (checkEnv("NOUTF")) {
 			trans.setUnicode(false);
+			transGui.setUnicode(false);
 		}
 
 		Bundles.setDirectory(configDir);
@@ -527,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()) {