diff options
| author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-15 14:56:06 +0000 |
|---|---|---|
| committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-15 14:56:06 +0000 |
| commit | 403963cf968cc3ee82ca6ce5b9f264f3a655417d (patch) | |
| tree | b0737330b7b4d4e5d82eb0e1b78210dca5510526 | |
| parent | e4967815eba19f8603d8663bdab45917b2ad5d87 (diff) | |
| download | Essentials-403963cf968cc3ee82ca6ce5b9f264f3a655417d.tar Essentials-403963cf968cc3ee82ca6ce5b9f264f3a655417d.tar.gz Essentials-403963cf968cc3ee82ca6ce5b9f264f3a655417d.tar.lz Essentials-403963cf968cc3ee82ca6ce5b9f264f3a655417d.tar.xz Essentials-403963cf968cc3ee82ca6ce5b9f264f3a655417d.zip | |
Fix for muted translation
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1487 e251c2fe-e539-e718-e476-b85c1f46cddb
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandmute.java | 14 | ||||
| -rw-r--r-- | Essentials/src/messages.properties | 7 | ||||
| -rw-r--r-- | Essentials/src/messages_de.properties | 7 |
3 files changed, 16 insertions, 12 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java index 24316d93f..aca821aac 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java @@ -23,14 +23,20 @@ public class Commandmute extends EssentialsCommand User p = getPlayer(server, args, 0); long muteTimestamp = 0; - if (args.length > 1) { + if (args.length > 1) + { String time = getFinalArg(args, 1); muteTimestamp = Util.parseDateDiff(time, true); } p.setMuteTimeout(muteTimestamp); charge(sender); - - - sender.sendMessage(Util.format("mutedPlayer", p.getDisplayName(), (p.toggleMuted() ? Util.i18n("muted") : Util.i18n("unmuted")), (muteTimestamp > 0 ? Util.i18n("for") + Util.formatDateDiff(muteTimestamp) : ""))); + + + sender.sendMessage( + p.toggleMuted() + ? (muteTimestamp > 0 + ? Util.format("mutedPlayerFor", p.getDisplayName(), Util.formatDateDiff(muteTimestamp)) + : Util.format("mutedPlayer", p.getDisplayName())) + : Util.format("unmutedPlayer", p.getDisplayName())); } } diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index b58f50424..9f18eda84 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -195,10 +195,9 @@ mailCleared = \u00a77Mail Cleared! voiceSilenced = \u00a77Your voice has been silenced noMotd = \u00a7cThere is no message of the day." me = me -mutedPlayer = Player {0} {1} {2} {3}. -muted = muted -unMuted = unmuted -for = for +mutedPlayerFor = Player {0} muted for {1}. +mutedPlayer = Player {0} muted. +unmutedPlayer = Player {0} unmuted. nickOthersPermission = \u00a7cYou do not have permission to change the nickname of others nickNoMore = \u00a7You no longer have a nickname. nickNamesAlpha = \u00a7cNicknames must be alphanumeric. diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index 0ed3b641a..0f5b90ba6 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -195,10 +195,9 @@ mailCleared = \u00a77Mail Cleared! voiceSilenced = \u00a77Your voice has been silenced noMotd = \u00a7cThere is no message of the day." me = me -mutedPlayer = Player {0} {1} {2} {3}. -muted = muted -unMuted = unmuted -for = for +mutedPlayerFor = Player {0} muted for {1}. +mutedPlayer = Player {0} muted. +unmutedPlayer = Player {0} unmuted. nickOthersPermission = \u00a7cYou do not have permission to change the nickname of others nickNoMore = \u00a7You no longer have a nickname. nickNamesAlpha = \u00a7cNicknames must be alphanumeric. |