Fix TL handling with escaped ' marks.

This commit is contained in:
KHobbits 2013-07-10 00:03:14 +01:00
parent 3377e3483d
commit 499a1aee7f

View File

@ -51,17 +51,17 @@ public class I18n implements II18n
return currentLocale;
}
public String translate(final String string)
private String translate(final String string)
{
try
{
try
{
return NODOUBLEMARK.matcher(customBundle.getString(string)).replaceAll("'");
return customBundle.getString(string);
}
catch (MissingResourceException ex)
{
return NODOUBLEMARK.matcher(localeBundle.getString(string)).replaceAll("'");
return localeBundle.getString(string);
}
}
catch (MissingResourceException ex)
@ -79,7 +79,7 @@ public class I18n implements II18n
}
if (objects.length == 0)
{
return instance.translate(string);
return NODOUBLEMARK.matcher(instance.translate(string)).replaceAll("'");
}
else
{