diff options
author | Martin Robertz <dream-master@gmx.net> | 2021-05-22 21:04:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-22 21:04:04 +0200 |
commit | 1fd4f8b1daaa3a1eea153bf5b9e314ae0e38c724 (patch) | |
tree | 2738ab883aea0867694101df29002a08f3c67256 /src/main/java/gregtech/api/util | |
parent | 6adfad819f014bbf86afa36fd32849d772b0efb4 (diff) | |
parent | 85356852b644c42b932e2b4852cefb06ffd22673 (diff) | |
download | GT5-Unofficial-1fd4f8b1daaa3a1eea153bf5b9e314ae0e38c724.tar.gz GT5-Unofficial-1fd4f8b1daaa3a1eea153bf5b9e314ae0e38c724.tar.bz2 GT5-Unofficial-1fd4f8b1daaa3a1eea153bf5b9e314ae0e38c724.zip |
Merge branch 'experimental' into glow-texture
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r-- | src/main/java/gregtech/api/util/GT_LanguageManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java index 5046af9e5f..e0c23fce8e 100644 --- a/src/main/java/gregtech/api/util/GT_LanguageManager.java +++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java @@ -67,7 +67,12 @@ public class GT_LanguageManager { public static String getTranslation(String aKey) { if (aKey == null) return E; - String tTrimmedKey = aKey.trim(), rTranslation = LanguageRegistry.instance().getStringLocalization(tTrimmedKey); + String tTrimmedKey = aKey.trim(), rTranslation; + if (sUseEnglishFile) { + rTranslation = LanguageRegistry.instance().getStringLocalization(tTrimmedKey); + } else { + rTranslation = StatCollector.translateToLocal(tTrimmedKey); + } if (GT_Utility.isStringInvalid(rTranslation)) { rTranslation = StatCollector.translateToLocal(tTrimmedKey); if (GT_Utility.isStringInvalid(rTranslation) || tTrimmedKey.equals(rTranslation)) { |