diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-05-22 11:47:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-22 11:47:18 +0200 |
| commit | 736b670d3bdfffca047ce1df884ad684c4eb5cb1 (patch) | |
| tree | c11afca6cf859d4eb168d955f1217a6e5492cbc0 /src/main | |
| parent | 615638a8125f84c879a3ca8906668bcdad469984 (diff) | |
| parent | 7a47b85780bd78118bb5a31cf119fa6417e596a5 (diff) | |
| download | GT5-Unofficial-736b670d3bdfffca047ce1df884ad684c4eb5cb1.tar.gz GT5-Unofficial-736b670d3bdfffca047ce1df884ad684c4eb5cb1.tar.bz2 GT5-Unofficial-736b670d3bdfffca047ce1df884ad684c4eb5cb1.zip | |
Merge pull request #542 from Usernm0/experimental
Fix translations from resourcepacks.
Diffstat (limited to 'src/main')
| -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)) { |