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
commit0b83de89254087eb83d14a99cd4d2eb7f310eec7 (patch)
tree006e989480c3e2d3a0c9895508a4f5f1dfed959c
parent504728b46b4f9e2834670b41fafb4fe98ed2164c (diff)
downloadEssentials-0b83de89254087eb83d14a99cd4d2eb7f310eec7.tar
Essentials-0b83de89254087eb83d14a99cd4d2eb7f310eec7.tar.gz
Essentials-0b83de89254087eb83d14a99cd4d2eb7f310eec7.tar.lz
Essentials-0b83de89254087eb83d14a99cd4d2eb7f310eec7.tar.xz
Essentials-0b83de89254087eb83d14a99cd4d2eb7f310eec7.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
{