From 164f592937e16bc96a13e4ef2808f9d05317dfdd Mon Sep 17 00:00:00 2001 From: ementalo Date: Mon, 9 May 2011 21:12:49 +0000 Subject: [PATCH] [trunk] translations git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1398 e251c2fe-e539-e718-e476-b85c1f46cddb --- .../com/earth2me/essentials/commands/Commandback.java | 3 ++- .../earth2me/essentials/commands/Commandbackup.java | 3 ++- .../earth2me/essentials/commands/Commandbalance.java | 4 ++-- .../com/earth2me/essentials/commands/Commandban.java | 7 ++++--- .../com/earth2me/essentials/commands/Commandbanip.java | 3 ++- .../earth2me/essentials/commands/Commandbigtree.java | 4 ++-- Essentials/src/messages.properties | 10 +++++++++- 7 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandback.java b/Essentials/src/com/earth2me/essentials/commands/Commandback.java index b67da7826..f9a45857b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandback.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandback.java @@ -1,6 +1,7 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.User; +import com.earth2me.essentials.Util; import org.bukkit.Server; @@ -15,7 +16,7 @@ public class Commandback extends EssentialsCommand protected void run(Server server, User user, String commandLabel, String[] args) throws Exception { user.canAfford(this); - user.sendMessage("§7Returning to previous location."); + user.sendMessage(Util.i18n("backUsageMsg")); user.getTeleport().back(this.getName()); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java b/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java index 4ed5d97a8..7a1fe02c7 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java @@ -2,6 +2,7 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Backup; import com.earth2me.essentials.Essentials; +import com.earth2me.essentials.Util; import org.bukkit.Server; import org.bukkit.command.CommandSender; @@ -23,6 +24,6 @@ public class Commandbackup extends EssentialsCommand } charge(sender); backup.run(); - sender.sendMessage("Backup started"); + sender.sendMessage(Util.i18n("backupStarted")); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java index d2c847abb..2d623d33e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java @@ -22,7 +22,7 @@ public class Commandbalance extends EssentialsCommand { throw new NotEnoughArgumentsException(); } - sender.sendMessage("§7Balance: " + Util.formatCurrency(getPlayer(server, args, 0).getMoney())); + sender.sendMessage(Util.format("balance",Util.formatCurrency(getPlayer(server, args, 0).getMoney()))); } @Override @@ -32,6 +32,6 @@ public class Commandbalance extends EssentialsCommand double bal = (args.length < 1 || !user.isAuthorized("essentials.balance.other") ? user : getPlayer(server, args, 0)).getMoney(); - user.sendMessage("§7Balance: " + Util.formatCurrency(bal)); + user.sendMessage(Util.format("balance",Util.formatCurrency(bal))); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java index c9819020f..777fe08e1 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java @@ -4,6 +4,7 @@ import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.craftbukkit.CraftServer; import com.earth2me.essentials.User; +import com.earth2me.essentials.Util; public class Commandban extends EssentialsCommand @@ -25,19 +26,19 @@ public class Commandban extends EssentialsCommand if (server.matchPlayer(args[0]).isEmpty()) { ((CraftServer)server).getHandle().a(args[0]); - sender.sendMessage("§cPlayer " + args[0] + " banned"); + sender.sendMessage(Util.format("playerBanned",args[0])); } else { p = ess.getUser(server.matchPlayer(args[0]).get(0)); - String banReason = "Banned from server"; + String banReason = Util.i18n("defaultBanReason"); if(args.length > 1) { banReason = getFinalArg(args, 1); p.setBanReason(commandLabel); } p.kickPlayer(banReason); ((CraftServer)server).getHandle().a(p.getName()); - sender.sendMessage("§cPlayer " + p.getName() + " banned"); + sender.sendMessage(Util.format("playerBanned", p.getName())); } ess.loadBanList(); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java b/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java index 4c7f6ad49..affa869df 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java @@ -1,5 +1,6 @@ package com.earth2me.essentials.commands; +import com.earth2me.essentials.Util; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.craftbukkit.CraftServer; @@ -21,7 +22,7 @@ public class Commandbanip extends EssentialsCommand } ((CraftServer)server).getHandle().c(args[0]); - sender.sendMessage("§7Banned IP address."); + sender.sendMessage(Util.i18n("banIpAddress")); ess.loadBanList(); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java b/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java index 842dd9846..16c94793b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java @@ -59,11 +59,11 @@ public class Commandbigtree extends EssentialsCommand if (success) { charge(user); - user.sendMessage("Big tree spawned."); + user.sendMessage(Util.i18n("bigTreeSuccess")); } else { - user.sendMessage("§cBig tree generation failure. Try again on grass or dirt."); + user.sendMessage(Util.i18n("bigTreeFailure")); } } } diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 11e89f020..985473dda 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -34,4 +34,12 @@ couldNotFindTemplate = Could not find template {0} failedToWriteConfig = Failed to write config {0} failedToCloseConfig = Failed to close config {0} notEnoughMoney = You do not have sufficient funds. -missingItems = You do not have {0}x {1}. \ No newline at end of file +missingItems = You do not have {0}x {1}. +errorWithMessage = \u00a7cError: {0} +backUsageMsg = \u00a77Returning to previous location. +balance = \u00a77Balance: {0} +playerBanned = \u00a7cPlayer {0} banned +defaultBanReason = Banned from server +banIpAddress = \u00a77Banned IP address +bigTreeSuccess = \u00a77Big tree spawned. +bigTreeFailure = \u00a7cBig tree generation failure. Try again on grass or dirt. \ No newline at end of file