summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-07-10 00:03:14 +0100
committerKHobbits <rob@khobbits.co.uk>2013-07-10 00:03:14 +0100
commit9a59de75944486590b9e0afdc3d50c469f85100a (patch)
treed408e7f0975f02dc3aa6bb6c947b561274d4d5d5
parentc071cf0caabcb275703511ea1ebe7a3e4d2dbc9b (diff)
downloadEssentials-9a59de75944486590b9e0afdc3d50c469f85100a.tar
Essentials-9a59de75944486590b9e0afdc3d50c469f85100a.tar.gz
Essentials-9a59de75944486590b9e0afdc3d50c469f85100a.tar.lz
Essentials-9a59de75944486590b9e0afdc3d50c469f85100a.tar.xz
Essentials-9a59de75944486590b9e0afdc3d50c469f85100a.zip
Fix TL handling with escaped `'` marks.
-rw-r--r--Essentials/src/com/earth2me/essentials/I18n.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/I18n.java b/Essentials/src/com/earth2me/essentials/I18n.java
index aded5a5b3..2773a96c4 100644
--- a/Essentials/src/com/earth2me/essentials/I18n.java
+++ b/Essentials/src/com/earth2me/essentials/I18n.java
@@ -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
{