Fix LanguageRegistry loading files in UTF-8 format. loadLocalization should work for non-xml in
all languages now (assumes UTF-8)
This commit is contained in:
parent
256aef5e0f
commit
79c7933b5e
|
@ -2,11 +2,14 @@ package cpw.mods.fml.common.registry;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
|
import com.google.common.base.Charsets;
|
||||||
|
|
||||||
import cpw.mods.fml.common.FMLLog;
|
import cpw.mods.fml.common.FMLLog;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
|
@ -133,7 +136,7 @@ public class LanguageRegistry
|
||||||
langPack.loadFromXML(langStream);
|
langPack.loadFromXML(langStream);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
langPack.load(langStream);
|
langPack.load(new InputStreamReader(langStream,Charsets.UTF_8));
|
||||||
}
|
}
|
||||||
|
|
||||||
addStringLocalization(langPack, lang);
|
addStringLocalization(langPack, lang);
|
||||||
|
|
Loading…
Reference in New Issue