diff --git a/src/main/java/net/knarcraft/stargate/LanguageLoader.java b/src/main/java/net/knarcraft/stargate/LanguageLoader.java index 326ca3a..6fb7c08 100644 --- a/src/main/java/net/knarcraft/stargate/LanguageLoader.java +++ b/src/main/java/net/knarcraft/stargate/LanguageLoader.java @@ -65,7 +65,7 @@ public class LanguageLoader { loadedStringTranslations = load(chosenLanguage); // We have a default hashMap used for when new text is added. - InputStream inputStream = getClass().getResourceAsStream("/lang/" + chosenLanguage + ".txt"); + InputStream inputStream = getClass().getResourceAsStream("/lang/en.txt"); if (inputStream != null) { loadedBackupStrings = load("en", inputStream); } else { @@ -89,10 +89,17 @@ public class LanguageLoader { * @return
The string in the user's preferred language
*/ public String getString(String name) { - String val = loadedStringTranslations.get(name); - if (val == null && loadedBackupStrings != null) val = loadedBackupStrings.get(name); - if (val == null) return ""; - return val; + String value = null; + if (loadedStringTranslations != null) { + value = loadedStringTranslations.get(name); + } + if (value == null && loadedBackupStrings != null) { + value = loadedBackupStrings.get(name); + } + if (value == null) { + return ""; + } + return value; } /** @@ -115,7 +122,14 @@ public class LanguageLoader { Map