external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Not needed to read Forge Preferences because the language selected in UI

Browse Source 
is passed when preloading translations.
This commit is contained in:
Peter
2019-07-30 12:31:14 +02:00
parent 98cb151929
commit c7b1e764c6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui/src/main/java/forge/card/CardTranslation.java
View File

@@ -3,7 +3,6 @@ package forge.card;
import com.esotericsoftware.minlog.Log; import com.esotericsoftware.minlog.Log;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import forge.properties.ForgeConstants; import forge.properties.ForgeConstants;
import forge.properties.ForgePreferences;
import forge.util.LineReader; import forge.util.LineReader;
import java.io.FileInputStream; import java.io.FileInputStream;
@@ -16,6 +15,7 @@ public class CardTranslation {
private static Map <String, String> translatednames; private static Map <String, String> translatednames;
private static Map <String, String> translatedtypes; private static Map <String, String> translatedtypes;
private static Map <String, String> translatedoracles; private static Map <String, String> translatedoracles;
private static String languageSelected;
private static void readTranslationFile(String language) { private static void readTranslationFile(String language) {
String filename = "cardnames-" + language + ".txt"; String filename = "cardnames-" + language + ".txt";
@@ -66,16 +66,17 @@ public class CardTranslation {
} }
private static boolean needsTranslation() { private static boolean needsTranslation() {
ForgePreferences preferences = new ForgePreferences(); return !languageSelected.equals("en-US");
return !preferences.getPref(ForgePreferences.FPref.UI_LANGUAGE).equals("en-US");
} }
public static void preloadTranslation(String language) { public static void preloadTranslation(String language) {
languageSelected = language;
if (needsTranslation()) { if (needsTranslation()) {
translatednames = new HashMap<>(); translatednames = new HashMap<>();
translatedtypes = new HashMap<>(); translatedtypes = new HashMap<>();
translatedoracles = new HashMap<>(); translatedoracles = new HashMap<>();
readTranslationFile(language); readTranslationFile(languageSelected);
} }
} }
} }