summaryrefslogtreecommitdiffstats
path: root/EssentialsChat/src
diff options
context:
space:
mode:
authorFearFree <fearfree@cubetown.net>2014-03-20 10:54:07 -0500
committerChris Ward <chris@chrisgward.com>2014-03-22 16:08:11 +1100
commit51bd0d88f393dbd675d2227e84d24fe9d6313712 (patch)
tree3f1b11f2eed0ed31c63e7a82cb666c3082f2df95 /EssentialsChat/src
parent726690817781c43b2bdeaf9212cc7c7d23c2c8ff (diff)
downloadEssentials-51bd0d88f393dbd675d2227e84d24fe9d6313712.tar
Essentials-51bd0d88f393dbd675d2227e84d24fe9d6313712.tar.gz
Essentials-51bd0d88f393dbd675d2227e84d24fe9d6313712.tar.lz
Essentials-51bd0d88f393dbd675d2227e84d24fe9d6313712.tar.xz
Essentials-51bd0d88f393dbd675d2227e84d24fe9d6313712.zip
Future Java versions may not support _ as identifier.
Diffstat (limited to 'EssentialsChat/src')
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java4
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java12
2 files changed, 8 insertions, 8 deletions
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
index db1d0066c..3ce515f3b 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
@@ -1,6 +1,6 @@
package com.earth2me.essentials.chat;
-import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.tl;
import net.ess3.api.IEssentials;
import java.util.Collections;
import java.util.HashMap;
@@ -23,7 +23,7 @@ public class EssentialsChat extends JavaPlugin
final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials");
if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
{
- LOGGER.log(Level.WARNING, _("versionMismatchAll"));
+ LOGGER.log(Level.WARNING, tl("versionMismatchAll"));
}
if (!ess.isEnabled())
{
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
index 284da0a9b..07e81d9d4 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
@@ -1,6 +1,6 @@
package com.earth2me.essentials.chat;
-import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.User;
import static com.earth2me.essentials.chat.EssentialsChatPlayer.logger;
import net.ess3.api.IEssentials;
@@ -63,14 +63,14 @@ public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer
final StringBuilder format = new StringBuilder();
format.append(chatStore.getType()).append("Format");
event.setMessage(event.getMessage().substring(1));
- event.setFormat(_(format.toString(), event.getFormat()));
+ event.setFormat(tl(format.toString(), event.getFormat()));
return;
}
final StringBuilder errorMsg = new StringBuilder();
errorMsg.append("notAllowedTo").append(chatStore.getType().substring(0, 1).toUpperCase(Locale.ENGLISH)).append(chatStore.getType().substring(1));
- user.sendMessage(_(errorMsg.toString()));
+ user.sendMessage(tl(errorMsg.toString()));
event.setCancelled(true);
return;
}
@@ -100,9 +100,9 @@ public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer
}
final String format = event.getFormat();
- event.setFormat(_("chatTypeLocal").concat(event.getFormat()));
+ event.setFormat(tl("chatTypeLocal").concat(event.getFormat()));
- logger.info(_("localFormat", user.getName(), event.getMessage()));
+ logger.info(tl("localFormat", user.getName(), event.getMessage()));
final Iterator<Player> it = outList.iterator();
while (it.hasNext())
@@ -137,7 +137,7 @@ public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer
}
if (outList.size() < 2) {
- user.sendMessage(_("localNoOne"));
+ user.sendMessage(tl("localNoOne"));
}
LocalChatSpyEvent spyEvent = new LocalChatSpyEvent(event.isAsynchronous(), event.getPlayer(), format, event.getMessage(), spyList);