aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorUsernm <usernm0@gmail.com>2021-05-20 13:15:20 +0300
committerUsernm <usernm0@gmail.com>2021-05-20 13:15:20 +0300
commit7a47b85780bd78118bb5a31cf119fa6417e596a5 (patch)
treef159c7099050c3774fb24cec71cb5ac552765f99 /src/main
parent7c0098bcf8b1c83f9b06f01d6e460c7bd2ce000d (diff)
downloadGT5-Unofficial-7a47b85780bd78118bb5a31cf119fa6417e596a5.tar.gz
GT5-Unofficial-7a47b85780bd78118bb5a31cf119fa6417e596a5.tar.bz2
GT5-Unofficial-7a47b85780bd78118bb5a31cf119fa6417e596a5.zip
Fix translations from resourcepacks.
Without this fix gregtech always use localised names from GregTech.lang in minecraft root folder. With this fix you can change localisations on fly using resourcepacks.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/util/GT_LanguageManager.java7
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)) {