Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-09-16 01:57:09 +02:00
Code Issues Projects Releases Wiki Activity

Try and prevent 'corrupt' messages files from breaking essentials.

Browse Source
This commit is contained in:
KHobbits 2012-08-13 02:32:45 +01:00
parent c40b23d80e
commit 6bd2d2c4b9
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Essentials/src/com/earth2me/essentials/I18n.java
View File

@ -70,7 +70,8 @@ public class I18n implements II18n
public static String _(final String string, final Object... objects) public static String _(final String string, final Object... objects)
{ {
if (instance == null) { if (instance == null)
{
return ""; return "";
} }
if (objects.length == 0) if (objects.length == 0)
@ -85,11 +86,20 @@ public class I18n implements II18n
public String format(final String string, final Object... objects) public String format(final String string, final Object... objects)
{ {
final String format = translate(string); String format = translate(string);
MessageFormat messageFormat = messageFormatCache.get(format); MessageFormat messageFormat = messageFormatCache.get(format);
if (messageFormat == null) if (messageFormat == null)
{ {
messageFormat = new MessageFormat(format); try
{
messageFormat = new MessageFormat(format);
}
catch (IllegalArgumentException e)
{
ess.getLogger().log(Level.SEVERE, "Invalid Translation key for '" + string + "': " + e.getMessage());
format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
messageFormat = new MessageFormat(format);
}
messageFormatCache.put(format, messageFormat); messageFormatCache.put(format, messageFormat);
} }
return messageFormat.format(objects); return messageFormat.format(objects);