From c7b1e764c66e80bba710f7ed28d8622a034eea85 Mon Sep 17 00:00:00 2001 From: Peter Date: Tue, 30 Jul 2019 12:31:14 +0200 Subject: [PATCH] Not needed to read Forge Preferences because the language selected in UI is passed when preloading translations. --- forge-gui/src/main/java/forge/card/CardTranslation.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/forge-gui/src/main/java/forge/card/CardTranslation.java b/forge-gui/src/main/java/forge/card/CardTranslation.java index 861c2e6e9f5..c5c90816283 100644 --- a/forge-gui/src/main/java/forge/card/CardTranslation.java +++ b/forge-gui/src/main/java/forge/card/CardTranslation.java @@ -3,7 +3,6 @@ package forge.card; import com.esotericsoftware.minlog.Log; import com.google.common.base.Charsets; import forge.properties.ForgeConstants; -import forge.properties.ForgePreferences; import forge.util.LineReader; import java.io.FileInputStream; @@ -16,6 +15,7 @@ public class CardTranslation { private static Map translatednames; private static Map translatedtypes; private static Map translatedoracles; + private static String languageSelected; private static void readTranslationFile(String language) { String filename = "cardnames-" + language + ".txt"; @@ -66,16 +66,17 @@ public class CardTranslation { } private static boolean needsTranslation() { - ForgePreferences preferences = new ForgePreferences(); - return !preferences.getPref(ForgePreferences.FPref.UI_LANGUAGE).equals("en-US"); + return !languageSelected.equals("en-US"); } public static void preloadTranslation(String language) { + languageSelected = language; + if (needsTranslation()) { translatednames = new HashMap<>(); translatedtypes = new HashMap<>(); translatedoracles = new HashMap<>(); - readTranslationFile(language); + readTranslationFile(languageSelected); } } } \ No newline at end of file