i18n: fix files

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index b4af5e836598bdce5a5bc6d0b04b1b8297bf6aff..cacbbfe33320c32df5002563105e643a9ac8c86a 100644 (file)
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -545,8 +545,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()) {

diff --git a/src/be/nikiroo/fanfix/bundles/resources.properties b/src/be/nikiroo/fanfix/bundles/resources_core.properties
similarity index 100%
rename from src/be/nikiroo/fanfix/bundles/resources.properties
rename to src/be/nikiroo/fanfix/bundles/resources_core.properties

diff --git a/src/be/nikiroo/fanfix/bundles/resources_fr.properties b/src/be/nikiroo/fanfix/bundles/resources_core_fr.properties
similarity index 100%
rename from src/be/nikiroo/fanfix/bundles/resources_fr.properties
rename to src/be/nikiroo/fanfix/bundles/resources_core_fr.properties

diff --git a/src/be/nikiroo/fanfix/output/BasicOutput.java b/src/be/nikiroo/fanfix/output/BasicOutput.java
index dc6fe51de2cb1d6e66c4bbe06af2e1850bf99847..f3e314171321d17e63cb98b12574181fc058fd1a 100644 (file)
--- a/src/be/nikiroo/fanfix/output/BasicOutput.java
+++ b/src/be/nikiroo/fanfix/output/BasicOutput.java
@@ -65,10 +65,10 @@ public abstract class BasicOutput {
                        String desc = Instance.getTrans().getStringX(id, this.name());
 
                        if (desc == null) {
-                               desc = Instance.getTrans().getString(id, this);
+                               desc = Instance.getTrans().getString(id, this.toString());
                        }
 
-                       if (desc == null) {
+                       if (desc == null || desc.isEmpty()) {
                                desc = this.toString();
                        }