TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-10-15 21:16:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:essentials/Essentials

Browse source
This commit is contained in:
KHobbits 2012-03-23 13:26:12 +00:00
parent c503adabc5 8a22258945
commit a4d7b5dcf8
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Essentials/src/com/earth2me/essentials/EssentialsConf.java
View file

@ -126,23 +126,25 @@ public class EssentialsConf extends YamlConfiguration
{ {
buffer.rewind(); buffer.rewind();
data.clear(); data.clear();
LOGGER.log(Level.INFO, "File {0} is not utf-8 encoded, trying {1}", new Object[] LOGGER.log(Level.INFO, "File " + configFile.getAbsolutePath().toString() + "is not utf-8 encoded, trying " + Charset.defaultCharset().displayName());
{
configFile.getAbsolutePath().toString(), Charset.defaultCharset().displayName()
});
decoder = Charset.defaultCharset().newDecoder(); decoder = Charset.defaultCharset().newDecoder();
result = decoder.decode(buffer, data, true); result = decoder.decode(buffer, data, true);
if (result.isError()) if (result.isError())
{ {
throw new InvalidConfigurationException("Invalid Characters in file " + configFile.getAbsolutePath().toString()); throw new InvalidConfigurationException("Invalid Characters in file " + configFile.getAbsolutePath().toString());
} else { }
else
{
decoder.flush(data); decoder.flush(data);
} }
} else { }
else
{
decoder.flush(data); decoder.flush(data);
} }
final int end = data.position();
data.rewind(); data.rewind();
super.loadFromString(data.toString()); super.loadFromString(data.subSequence(0, end).toString());
} }
finally finally
{ {

1
Essentials/src/com/earth2me/essentials/I18n.java
View file

@ -114,6 +114,7 @@ public class I18n implements II18n
{ {
currentLocale = new Locale(parts[0], parts[1], parts[2]); currentLocale = new Locale(parts[0], parts[1], parts[2]);
} }
ResourceBundle.clearCache();
Logger.getLogger("Minecraft").log(Level.INFO, String.format("Using locale %s", currentLocale.toString())); Logger.getLogger("Minecraft").log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
customBundle = ResourceBundle.getBundle(MESSAGES, currentLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess)); customBundle = ResourceBundle.getBundle(MESSAGES, currentLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
localeBundle = ResourceBundle.getBundle(MESSAGES, currentLocale); localeBundle = ResourceBundle.getBundle(MESSAGES, currentLocale);