Tl todo cleanup round 1

7 files changed, 23 insertions, 15 deletions

diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index cc2ecde4b..db3dd53da 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -22,6 +22,8 @@ backupFinished=\u00a76Backup finished.
 backupStarted=\u00a76Backup started.
 balance=\u00a7aBalance:\u00a7c {0}
 balanceTop=\u00a76Top balances ({0})
+baltopHidden=\u00a76You are now hidden in /balancetop.
+baltopShown=\u00a76You are now shown in /balancetop.
 banExempt=\u00a74You can not ban that player.
 banFormat=Banned: {0}
 banIpAddress=\u00a76Banned IP address
@@ -108,6 +110,7 @@ gameMode=\u00a76Set game mode\u00a7c {0} \u00a76for {1}\u00a76.
 gcfree=\u00a76Free memory:\u00a7c {0} MB
 gcmax=\u00a76Maximum memory:\u00a7c {0} MB
 gctotal=\u00a76Allocated memory:\u00a7c {0} MB
+gcquene=\u00a76Essentials write queue size:\u00a7c {0} MB
 geoIpUrlEmpty=GeoIP download url is empty.
 geoIpUrlInvalid=GeoIP download url is invalid.
 geoipJoinFormat=Player {0} comes from {1}
@@ -372,6 +375,7 @@ timeSetPermission=\u00a74You are not authorized to set the time.
 timeWorldCurrent=\u00a76The current time in\u00a7c {0} \u00a76is \u00a7c{1}.
 timeWorldSet=\u00a76The time was set to\u00a7c {0} \u00a76in: \u00a7c{1}.
 tps=\u00a76Current TPS = {0}
+tpposTooFar=\u00a74Value of coordinates cannot be over 30000000.
 tradeCompleted=\u00a7aTrade completed.
 tradeSignEmpty=\u00a74The trade sign has nothing available for you.
 tradeSignEmptyOwner=\u00a74There is nothing to collect from this trade sign.
@@ -394,6 +398,8 @@ unmutedPlayer=\u00a76Player\u00a7c {0} \u00a76unmuted.
 unvanished=\u00a76You are once again visible.
 unvanishedReload=\u00a74A reload has forced you to become visible.
 upgradingFilesError=Error while upgrading the files.
+userBaltopHidden=\u00a76 is now hidden in /balancetop.
+userBaltopShown=\u00a76 is now shown in /balancetop.
 userDoesNotExist=\u00a74The user\u00a7c {0} \u00a74does not exist.
 userIsAway=\u00a75{0} \u00a75is now AFK.
 userIsNotAway=\u00a75{0} \u00a75is no longer AFK.
@@ -417,6 +423,7 @@ warpUsePermission=\u00a74You do not have Permission to use that warp.
 warpingTo=\u00a76Warping to\u00a7c {0}\u00a76.
 warps=\u00a76Warps:\u00a7r {0}
 warpsCount=\u00a76There are\u00a7c {0} \u00a76warps. Showing page {1} of {2}.
+weatherConsole=\u00a7cWhen running from console, usage is: /weather <world> <storm/sun> [duration]
 weatherStorm=\u00a76You set the weather to \u00a7cstorm\u00a76 in\u00a7c {0}.
 weatherStormFor=\u00a76You set the weather to \u00a7cstorm\u00a76 in\u00a7c {0} \u00a76for {1} seconds.
 weatherSun=\u00a76You set the weather to \u00a7csun\u00a76 in\u00a7c {0}.
@@ -438,9 +445,11 @@ whoisMuted=\u00a76 - Muted:\u00a7r {0}
 whoisNick=\u00a76 - Nick:\u00a7r {0}
 whoisOp=\u00a76 - OP:\u00a7r {0}
 whoisTop=\u00a76 ====== WhoIs:\u00a7c {0} \u00a76======
+worldnameNotFound=\u00a7cWorld named {0} not found!
 worth=\u00a7aStack of {0} worth \u00a7c{1}\u00a7a ({2} item(s) at {3} each).
 worthMeta=\u00a7aStack of {0} with metadata of {1} worth \u00a7c{2}\u00a7a ({3} item(s) at {4} each).
 worthSet=\u00a76Worth value set.
+vanillaHome=\u00a7cYou cannot remove the vanilla home point
 year=year
 years=years
 youAreHealed=\u00a76You have been healed.
diff --git a/Essentials/src/net/ess3/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java
index c353f6cb3..2b3531d52 100644
--- a/Essentials/src/net/ess3/commands/Commandbalancetop.java
+++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java
@@ -43,8 +43,8 @@ public class Commandbalancetop extends EssentialsCommand
 						user.queueSave();
 						sender.sendMessage(
 								user.getData().isBalancetopHide()
-								? "You are now hidden from /balancetop"
-								: "You are now shown in /balancetop"); //TODO:I18n
+								? _("baltopHidden")
+								: _("baltopShown")); 
 					}
 					else if (args.length == 2 && Permissions.BALANCETOP_HIDE_OTHERS.isAuthorized(sender))
 					{
@@ -53,8 +53,8 @@ public class Commandbalancetop extends EssentialsCommand
 						user.queueSave();
 						sender.sendMessage(
 								user.getData().isBalancetopHide()
-								? user.getName() + " is now hidden from /balancetop"
-								: user.getName() + " is now shown in /balancetop"); //TODO:I18n
+								? user.getName() + _("userBaltopHidden")
+								: user.getName() + _("userBaltopShown")); 
 					}
 					else
 					{
diff --git a/Essentials/src/net/ess3/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java
index 4ceb6b366..53955aaa2 100644
--- a/Essentials/src/net/ess3/commands/Commanddelhome.java
+++ b/Essentials/src/net/ess3/commands/Commanddelhome.java
@@ -48,10 +48,10 @@ public class Commanddelhome extends EssentialsCommand
 		{
 			name = expandedArg[0];
 		}
-		//TODO: Think up a nice error message
-		/*
-		 * if (name.equalsIgnoreCase("bed")) { throw new Exception("You cannot remove the vanilla home point"); }
-		 */
+		if (name.equalsIgnoreCase("bed")) 
+		{ 
+			throw new Exception (_("vanillaHome")); 
+		} 
 		user.getData().removeHome(name.toLowerCase(Locale.ENGLISH));
 		user.queueSave();
 		sender.sendMessage(_("deleteHome", name));
diff --git a/Essentials/src/net/ess3/commands/Commandgc.java b/Essentials/src/net/ess3/commands/Commandgc.java
index 71bc3dc1a..70da888dc 100644
--- a/Essentials/src/net/ess3/commands/Commandgc.java
+++ b/Essentials/src/net/ess3/commands/Commandgc.java
@@ -32,7 +32,7 @@ public class Commandgc extends EssentialsCommand
 		sender.sendMessage(_("gcmax", (Runtime.getRuntime().maxMemory() / 1024 / 1024)));
 		sender.sendMessage(_("gctotal", (Runtime.getRuntime().totalMemory() / 1024 / 1024)));
 		sender.sendMessage(_("gcfree", (Runtime.getRuntime().freeMemory() / 1024 / 1024)));
-		sender.sendMessage("Essentials write queue size: " + ess.getStorageQueue().getQueueSize()); //TODO:TL
+		sender.sendMessage(_("gcquene", (ess.getStorageQueue().getQueueSize()))); 
 
 		for (World w : server.getWorlds())
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandtppos.java b/Essentials/src/net/ess3/commands/Commandtppos.java
index 09a3efcde..6dfbc901d 100644
--- a/Essentials/src/net/ess3/commands/Commandtppos.java
+++ b/Essentials/src/net/ess3/commands/Commandtppos.java
@@ -32,7 +32,7 @@ public class Commandtppos extends EssentialsCommand
 		}
 		if (x > 30000000 ||  y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000)
 		{
-			throw new NotEnoughArgumentsException("Value of coordinates cannot be over 30000000"); //todo: I18n
+			throw new NotEnoughArgumentsException(_("tpposTooFar"));
 		}
 		final Trade charge = new Trade(commandName, ess);
 		charge.isAffordableFor(user);
@@ -64,7 +64,7 @@ public class Commandtppos extends EssentialsCommand
 		}
 		if (x > 30000000 ||  y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000)
 		{
-			throw new NotEnoughArgumentsException("Value of coordinates cannot be over 30000000"); //todo: I18n
+			throw new NotEnoughArgumentsException(_("tpposTooFar"));
 		}
 		sender.sendMessage(_("teleporting"));
 		user.sendMessage(_("teleporting"));
diff --git a/Essentials/src/net/ess3/commands/Commandweather.java b/Essentials/src/net/ess3/commands/Commandweather.java
index 66931b2a5..93309e2e6 100644
--- a/Essentials/src/net/ess3/commands/Commandweather.java
+++ b/Essentials/src/net/ess3/commands/Commandweather.java
@@ -37,20 +37,19 @@ public class Commandweather extends EssentialsCommand
 		}
 	}
 
-	//TODO: Translate these
 	@Override
 	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 2) //running from console means inserting a world arg before other args
 		{
-			throw new Exception("When running from console, usage is: /" + commandName + " <world> <storm/sun> [duration]");
+			throw new Exception(_("weatherConsole"));
 		}
 
 		final boolean isStorm = args[1].equalsIgnoreCase("storm");
 		final World world = server.getWorld(args[0]);
 		if (world == null)
 		{
-			throw new Exception("World named " + args[0] + " not found!");
+			throw new Exception(_("worldnameNotFound"));
 		}
 		if (args.length > 2)
 		{
diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java
index f33369597..e7d87c555 100644
--- a/Essentials/src/net/ess3/user/User.java
+++ b/Essentials/src/net/ess3/user/User.java
@@ -668,6 +668,6 @@ public class User extends UserBase implements IUser
 
 	private void updateThrottle()
 	{
-		lastThrottledAction = System.currentTimeMillis();;
+		lastThrottledAction = System.currentTimeMillis();
 	}
 }