diff options
| author | Prometheus0000 <prometheus0000000@gmail.com> | 2021-02-11 14:29:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 14:29:19 -0500 |
| commit | 3a027e939e2c18e165b2f1405637c92f25736582 (patch) | |
| tree | 1d75209cd6c074313f0e3f15bc989f7b258a57bd /src/main/java/gregtech/api/util/GT_LanguageManager.java | |
| parent | c6324633a4491296c0505e59aa7f8747af0c640a (diff) | |
| parent | e0c1f654b17d901d018603912bf32c32bd136bad (diff) | |
| download | GT5-Unofficial-3a027e939e2c18e165b2f1405637c92f25736582.tar.gz GT5-Unofficial-3a027e939e2c18e165b2f1405637c92f25736582.tar.bz2 GT5-Unofficial-3a027e939e2c18e165b2f1405637c92f25736582.zip | |
Merge pull request #23 from GTNewHorizons/experimental
update
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_LanguageManager.java')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_LanguageManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java index c87e0f7417..5046af9e5f 100644 --- a/src/main/java/gregtech/api/util/GT_LanguageManager.java +++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java @@ -33,8 +33,12 @@ public class GT_LanguageManager { TEMPMAP.put(aKey.trim(), aEnglish); LanguageRegistry.instance().injectLanguage("en_US", TEMPMAP); TEMPMAP.clear(); - if(sUseEnglishFile && !aWriteIntoLangFile && LANGMAP.containsKey(aKey)){ - aEnglish = LANGMAP.get(aKey); + if(sUseEnglishFile && !aWriteIntoLangFile){ + if (!LANGMAP.containsKey(aKey)) { + Property tProperty = sEnglishFile.get("LanguageFile", aKey, aEnglish); + aEnglish = tProperty.getString(); + LANGMAP.put(aKey, aEnglish); + } else aEnglish = LANGMAP.get(aKey); } return aEnglish; } |