diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 20bd1d079..eec6f66e5 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -85,7 +85,7 @@ public class EssentialsPlayerListener implements Listener { user.sendMessage(tl("voiceSilenced")); } else { - user.sendMessage(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ())); + user.sendMessage(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ())); } LOGGER.info(tl("mutedUserSpeaks", user.getName(), event.getMessage())); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java index c89478382..2d78628a3 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java @@ -55,7 +55,7 @@ public class Commandafk extends EssentialsCommand { throw new Exception(tl("voiceSilenced")); } else { - throw new Exception(tl("voiceSilenced") + tl("muteFormat", sender.getMuteReason ())); + throw new Exception(tl("voiceSilenced") + tl("muteReason", sender.getMuteReason ())); } } if (!sender.isAuthorized("essentials.afk.message")) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java index cfec4e6ad..b5c5ea1d3 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java @@ -52,7 +52,7 @@ public class Commandmail extends EssentialsCommand { throw new Exception(tl("voiceSilenced")); } else { - throw new Exception(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ())); + throw new Exception(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ())); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandme.java b/Essentials/src/com/earth2me/essentials/commands/Commandme.java index cbd644ed2..0866ba9b6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandme.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandme.java @@ -28,7 +28,7 @@ public class Commandme extends EssentialsCommand { throw new Exception(tl("voiceSilenced")); } else { - throw new Exception(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ())); + throw new Exception(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ())); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java index 70e4e44b1..1510c3a27 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java @@ -72,8 +72,8 @@ public class Commandmute extends EssentialsCommand { sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime)); user.sendMessage(tl("playerMutedFor", muteTime)); } else { - sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime) + tl("muteFormat",user.getMuteReason())); - user.sendMessage(tl("playerMutedFor", muteTime) + tl("muteFormat",user.getMuteReason())); + sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime) + tl("muteReason",user.getMuteReason())); + user.sendMessage(tl("playerMutedFor", muteTime) + tl("muteReason",user.getMuteReason())); } } else { if (user.getMuteReason ().equals ("")) { @@ -82,9 +82,9 @@ public class Commandmute extends EssentialsCommand { user.sendMessage(tl("playerMuted")); } else { - sender.sendMessage(tl("mutedPlayer", user.getDisplayName()) + tl("muteFormat",user.getMuteReason())); + sender.sendMessage(tl("mutedPlayer", user.getDisplayName()) + tl("muteReason",user.getMuteReason())); /** Send the player a message, why they were muted **/ - user.sendMessage(tl("playerMuted")+ tl("muteFormat",user.getMuteReason())); + user.sendMessage(tl("playerMuted")+ tl("muteReason",user.getMuteReason())); } } final String message; @@ -93,14 +93,14 @@ public class Commandmute extends EssentialsCommand { message = tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime); } else { - message = (tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime) + tl("muteFormat",user.getMuteReason())); + message = (tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime) + tl("muteReason",user.getMuteReason())); } } else { if (user.getMuteReason ().equals ("")) { message = tl("muteNotify", sender.getSender().getName(), user.getName()); } else { - message = (tl("muteNotify", sender.getSender().getName(), user.getName()) + tl("muteFormat",user.getMuteReason())); + message = (tl("muteNotify", sender.getSender().getName(), user.getName()) + tl("muteReason",user.getMuteReason())); } } server.getLogger().log(Level.INFO, message); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/com/earth2me/essentials/commands/Commandr.java index 5030a7bc7..0542581d2 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandr.java @@ -32,7 +32,7 @@ public class Commandr extends EssentialsCommand { throw new Exception(tl("voiceSilenced")); } else { - throw new Exception(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ())); + throw new Exception(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ())); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java index fec5e8d90..cbd83c2fb 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java @@ -121,7 +121,7 @@ public class Commandseen extends EssentialsCommand { sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true")))); } else { - sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))) + tl("muteFormat", user.getMuteReason ())); + sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))) + tl("muteReason", user.getMuteReason ())); } } final String location = user.getGeoLocation(); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java index b09d1f1fc..1db31e831 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java @@ -60,7 +60,7 @@ public class Commandwhois extends EssentialsCommand { sender.sendMessage(tl("whoisMuted", (user.isMuted() ? user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false")))); } else { - sender.sendMessage(tl("whoisMuted", (user.isMuted() ? user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false"))+ tl("muteFormat", user.getMuteReason ()))); + sender.sendMessage(tl("whoisMuted", (user.isMuted() ? user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false"))+ tl("muteReason", user.getMuteReason ()))); } } diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 327a48848..44cf4af57 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -558,7 +558,6 @@ vanished=\u00a76You are now completely invisible to normal users, and hidden fro versionMismatch=\u00a74Version mismatch\! Please update {0} to the same version. versionMismatchAll=\u00a74Version mismatch\! Please update all Essentials jars to the same version. voiceSilenced=\u00a76Your voice has been silenced\! -muteFormat=\u00a74 Reason: {0} walking=walking warpDeleteError=\u00a74Problem deleting the warp file. warpingTo=\u00a76Warping to\u00a7c {0}\u00a76. @@ -602,4 +601,4 @@ worthSet=\u00a76Worth value set year=year years=years youAreHealed=\u00a76You have been healed. -youHaveNewMail=\u00a76You have\u00a7c {0} \u00a76messages\! Type \u00a7c/mail read\u00a76 to view your mail. +youHaveNewMail=\u00a76You have\u00a7c {0} \u00a76messages\! Type \u00a7c/mail read\u00a76 to view your mail. \ No newline at end of file diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index d93f2e8db..014cab96c 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -601,4 +601,4 @@ worthSet=\u00a76Cena nastavena year=rok years=roky youAreHealed=\u00a76Byl/a jsi uzdraven/a. -youHaveNewMail=\u00a76Mas \u00a7c{0} \u00a76zprav\! Napis \u00a7c/mail read\u00a76 pro precteni. +youHaveNewMail=\u00a76Mas \u00a7c{0} \u00a76zprav\! Napis \u00a7c/mail read\u00a76 pro precteni. \ No newline at end of file