diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-11-06 14:46:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-06 14:46:58 +0100 |
| commit | cd458844f337e18d48ee29de7067ab319c47cb27 (patch) | |
| tree | a5d2d5ab0de091caec58d03aa25d6d4d8f3f09c3 /src/main/java/gregtech | |
| parent | d2be2a493c34e78e768ef1c1eb3c155a473c2f9d (diff) | |
| parent | 6e769a3f6139924067516682ade3b2699b05c76c (diff) | |
| download | GT5-Unofficial-cd458844f337e18d48ee29de7067ab319c47cb27.tar.gz GT5-Unofficial-cd458844f337e18d48ee29de7067ab319c47cb27.tar.bz2 GT5-Unofficial-cd458844f337e18d48ee29de7067ab319c47cb27.zip | |
Merge pull request #717 from albus12138/experimental
Make GT_LanguageManager injects into correct language
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 3 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_LanguageManager.java | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 777cea09e5..8980483f47 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -450,6 +450,9 @@ public class GT_Mod implements IGT_Mod { GT_Log.out.println("GT_Mod: Generating Lang-File"); GT_LanguageManager.sEnglishFile = new Configuration(new File(aEvent.getModConfigurationDirectory().getParentFile(), "GregTech.lang")); GT_LanguageManager.sEnglishFile.load(); + if (GT_LanguageManager.sEnglishFile.get("EnableLangFile", "UseThisFileAsLanguageFile", false).getBoolean(false)) { + GT_LanguageManager.sLanguage = GT_LanguageManager.sEnglishFile.get("EnableLangFile", "Language", "en_US").getString(); + } Materials.getMaterialsMap().values().parallelStream().filter(Objects::nonNull).forEach(aMaterial -> aMaterial.mLocalizedName = GT_LanguageManager.addStringLocalization("Material." + aMaterial.mName.toLowerCase(), aMaterial.mDefaultLocalName)); diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java index e0c23fce8e..9faa7b11a6 100644 --- a/src/main/java/gregtech/api/util/GT_LanguageManager.java +++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java @@ -16,6 +16,7 @@ import static gregtech.api.enums.GT_Values.E; public class GT_LanguageManager { public static final HashMap<String, String> TEMPMAP = new HashMap<String, String>(), BUFFERMAP = new HashMap<String, String>(), LANGMAP = new HashMap<String, String>(); public static Configuration sEnglishFile; + public static String sLanguage = "en_US"; public static boolean sUseEnglishFile = false; public static boolean i18nPlaceholder = true; @@ -31,7 +32,7 @@ public class GT_LanguageManager { } } TEMPMAP.put(aKey.trim(), aEnglish); - LanguageRegistry.instance().injectLanguage("en_US", TEMPMAP); + LanguageRegistry.instance().injectLanguage(sLanguage, TEMPMAP); TEMPMAP.clear(); if(sUseEnglishFile && !aWriteIntoLangFile){ if (!LANGMAP.containsKey(aKey)) { |