Cleaned up todo lists

9 files changed, 57 insertions, 14 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
index 75abda4bb..c4857c57b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
@@ -15,7 +15,6 @@ public class Commandtogglejail extends EssentialsCommand
 		super("togglejail");
 	}
 
-	//TODO: move these to messages file
 	@Override
 	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
@@ -74,7 +73,7 @@ public class Commandtogglejail extends EssentialsCommand
 
 		if (args.length >= 2 && p.isJailed() && !args[1].equalsIgnoreCase(p.getJail()))
 		{
-			sender.sendMessage("§cPerson is already in jail " + p.getJail());
+			sender.sendMessage(Util.format("jailAlreadyIncarcerated", p.getJail()));
 			return;
 		}
 
@@ -83,7 +82,7 @@ public class Commandtogglejail extends EssentialsCommand
 			String time = getFinalArg(args, 2);
 			long timeDiff = Util.parseDateDiff(time, true);
 			p.setJailTimeout(timeDiff);
-			sender.sendMessage("Jail time extend to " + Util.formatDateDiff(timeDiff));
+			sender.sendMessage(Util.format("jailSentenceExtended", Util.formatDateDiff(timeDiff)));
 			return;
 		}
 
@@ -95,13 +94,13 @@ public class Commandtogglejail extends EssentialsCommand
 			}
 			p.setJailed(false);
 			p.setJailTimeout(0);
-			p.sendMessage("§7You have been released");
+			p.sendMessage(Util.format("jailReleasedPlayerNotify"));
 			p.setJail(null);
 			if (!(p.getBase() instanceof OfflinePlayer))
 			{
 				p.getTeleport().back();
 			}
-			sender.sendMessage("§7Player " + p.getName() + " unjailed.");
+			sender.sendMessage(Util.format("jailReleased", p.getName()));
 		}
 	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
index a58a1e70d..cb41357c4 100644
--- a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
+++ b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
@@ -21,10 +21,6 @@ public class EssentialsSign
 {
 	private static final Set<Material> EMPTY_SET = new HashSet<Material>();
 	protected transient final String signName;
-	//TODO: Add these settings to messages
-	private static final String FORMAT_SUCCESS = "§1[%s]";
-	private static final String FORMAT_TEMPLATE = "[%s]";
-	private static final String FORMAT_FAIL = "§4[%s]";
 
 	public EssentialsSign(final String signName)
 	{
@@ -42,7 +38,7 @@ public class EssentialsSign
 			// they won't change it to §1[Signname]
 			return true;
 		}
-		sign.setLine(0, String.format(FORMAT_FAIL, this.signName));
+		sign.setLine(0, Util.format("signFormatFail", this.signName));
 		try
 		{
 			final boolean ret = onSignCreate(sign, user, getUsername(user), ess);
@@ -66,12 +62,12 @@ public class EssentialsSign
 
 	public String getSuccessName()
 	{
-		return String.format(FORMAT_SUCCESS, this.signName);
+		return Util.format("signFormatSuccess", this.signName);
 	}
 
 	public String getTemplateName()
 	{
-		return String.format(FORMAT_TEMPLATE, this.signName);
+		return Util.format("signFormatTemplate", this.signName);
 	}
 
 	private String getUsername(final User user)
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java
index c595d9b03..6d405fa0c 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java
@@ -41,8 +41,7 @@ public class SignProtection extends EssentialsSign
 			sign.setLine(3, "§1" + username);
 			return true;
 		}
-		//TODO: move to messages
-		player.sendMessage("§4You are not allowed to create sign here.");
+		player.sendMessage(Util.i18n("signProtectInvalidLocation"));
 		return false;
 	}
 
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 52cefd453..d68a889d7 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -130,8 +130,12 @@ itemSold = \u00a77Sold for \u00a7c {0} \u00a77 ({1} items at {2} each)
 itemSoldConsole = {0} sold {1} for \u00a77 {2} \u00a77 ({3} items at {4} each)
 itemSpawn = \u00a77Giving {0} of {1}
 itemsCsvNotLoaded = Could not load items.csv.
+jailAlreadyIncarcerated = \u00a7cPerson is already in jail: {0}
 jailMessage = \u00a7cYou do the crime, you do the time.
 jailNotExist = That jail does not exist.
+jailReleased = \u00a77Player \u00a7e{0}\u00a77 unjailed.
+jailReleasedPlayerNotify = \u00a77You have been released!
+jailSentenceExtended = Jail time extend to: {0)
 jailSet = \u00a77Jail {0} has been set
 jumpError = That would hurt your computer''s brain.
 kickDefault = Kicked from server
@@ -162,6 +166,7 @@ minute = minute
 minutes = minutes
 missingItems = You do not have {0}x {1}.
 missingPrefixSuffix = Missing a prefix or suffix for {0}
+mobsAvailable = \u00a77Mobs: {0}
 mobSpawnError = Error while changing mob spawner.
 mobSpawnLimit = Mob quantity limited to server limit
 mobSpawnTarget = Target block must be a mob spawner.
@@ -263,6 +268,10 @@ serverFull = Server is full
 setSpawner = Changed spawner type to {0}
 sheepMalformedColor = Malformed color.
 shoutFormat = \u00a77[Shout]\u00a7f {0}
+signFormatFail = \u00a74[{0}]
+signFormatSuccess = \u00a71[{0}]
+signFormatTemplate = [{0}]
+signProtectInvalidLocation = \u00a74You are not allowed to create sign here.
 similarWarpExist = A warp with a similar name already exists.
 slimeMalformedSize = Malformed size.
 soloMob = That mob likes to be alone
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index 2000c0c3b..1c8681ed0 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -130,8 +130,12 @@ itemSold = \u00a77Solgte for \u00a7c {0} \u00a77 ({1} elementer for {2} hver)
 itemSoldConsole = {0} solgte {1} for \u00a77 {2} \u00a77 ({3} elementer for {4} hver)
 itemSpawn = \u00a77Giver {0} af {1}
 itemsCsvNotLoaded = Kunne ikke indl\u00e6se items.csv.
+jailAlreadyIncarcerated = \u00a7cPerson is already in jail: {0}
 jailMessage = \u00a7cBryd reglerne, og tag din straf.
 jailNotExist = Det f\u00e6ngsel eksisterer ikke.
+jailReleased = \u00a77Player \u00a7e{0}\u00a77 unjailed.
+jailReleasedPlayerNotify = \u00a77You have been released!
+jailSentenceExtended = Jail time extend to: {0)
 jailSet = \u00a77F\u00e6ngsel {0} er blevet sat
 jumpError = Det ville skade din computer''s hjerne.
 kickDefault = Kicket fra serveren
@@ -263,6 +267,10 @@ serverFull = Server er fuld
 setSpawner = Changed spawner type to {0}
 sheepMalformedColor = Misdannet farve.
 shoutFormat = \u00a77[R\u00e5b]\u00a7f {0}
+signFormatFail = \u00a74[{0}]
+signFormatSuccess = \u00a71[{0}]
+signFormatTemplate = [{0}]
+signProtectInvalidLocation = \u00a74You are not allowed to create sign here.
 similarWarpExist = En warp med lignende tekst eksisterer allerede.
 slimeMalformedSize = Misdannet st\u00f8rrelse.
 soloMob = Den mob kan godt lide at v\u00e6re alene
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 02e015b15..d5baa6215 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -130,8 +130,12 @@ itemSold = \u00a77Verkauft f\u00fcr \u00a7c{0}\u00a77 ({1} Einheiten je {2})
 itemSoldConsole = {0} verkauft {1} f\u00fcr \u00a77{2}\u00a77 ({3} Einheiten je {4})
 itemSpawn = \u00a77Gebe {0}x {1}
 itemsCsvNotLoaded = Konnte items.csv nicht laden.
+jailAlreadyIncarcerated = \u00a7cPerson is already in jail: {0}
 jailMessage = \u00a7cYou do the crime, you do the time.
 jailNotExist = Dieses Gef\u00e4ngnis existiert nicht.
+jailReleased = \u00a77Player \u00a7e{0}\u00a77 unjailed.
+jailReleasedPlayerNotify = \u00a77You have been released!
+jailSentenceExtended = Jail time extend to: {0)
 jailSet = \u00a77Gef\u00e4ngnis {0} wurde erstellt.
 jumpError = Das w\u00fcrde deinen Computer \u00fcberlasten.
 kickDefault = Vom Server geworfen
@@ -263,6 +267,10 @@ serverFull = Server ist voll
 setSpawner = Changed spawner type to {0}
 sheepMalformedColor = Ung\u00fcltige Farbe.
 shoutFormat = \u00a77[Schrei]\u00a7f {0}
+signFormatFail = \u00a74[{0}]
+signFormatSuccess = \u00a71[{0}]
+signFormatTemplate = [{0}]
+signProtectInvalidLocation = \u00a74You are not allowed to create sign here.
 similarWarpExist = Ein Warp-Punkt mit einem \u00e4hnlichen Namen existiert bereits.
 slimeMalformedSize = Ung\u00fcltige Gr\u00f6sse.
 soloMob = Das Monster m\u00f6chte allein sein.
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index c96c9ecb7..edf2ed94a 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -130,8 +130,12 @@ itemSold = \u00a77Sold for \u00a7c {0} \u00a77 ({1} items at {2} each)
 itemSoldConsole = {0} sold {1} for \u00a77 {2} \u00a77 ({3} items at {4} each)
 itemSpawn = \u00a77Giving {0} of {1}
 itemsCsvNotLoaded = Could not load items.csv.
+jailAlreadyIncarcerated = \u00a7cPerson is already in jail: {0}
 jailMessage = \u00a7cYou do the crime, you do the time.
 jailNotExist = That jail does not exist.
+jailReleased = \u00a77Player \u00a7e{0}\u00a77 unjailed.
+jailReleasedPlayerNotify = \u00a77You have been released!
+jailSentenceExtended = Jail time extend to: {0)
 jailSet = \u00a77Jail {0} has been set
 jumpError = That would hurt your computer''s brain.
 kickDefault = Kicked from server
@@ -263,6 +267,10 @@ serverFull = Server is full
 setSpawner = Changed spawner type to {0}
 sheepMalformedColor = Malformed color.
 shoutFormat = \u00a77[Shout]\u00a7f {0}
+signFormatFail = \u00a74[{0}]
+signFormatSuccess = \u00a71[{0}]
+signFormatTemplate = [{0}]
+signProtectInvalidLocation = \u00a74You are not allowed to create sign here.
 similarWarpExist = A warp with a similar name already exists.
 slimeMalformedSize = Malformed size.
 soloMob = That mob likes to be alone
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 79016f02d..a038e0c8e 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -130,8 +130,12 @@ itemSold = \u00a77Vendu pour \u00a7c {0} \u00a77 ({1} objet(s) \u00e0 {2} chacun
 itemSoldConsole = {0} vendu {1} pour \u00a77 {2} \u00a77 ({3} objet(s) \u00e0 {4} chacun)
 itemSpawn = \u00a77Donne {0} de {1}
 itemsCsvNotLoaded = N''a pas pu charger items.csv.
+jailAlreadyIncarcerated = \u00a7cPerson is already in jail: {0}
 jailMessage = \u00a7cVous avez commis un crime, vous en payez le prix.
 jailNotExist = Cette prison n''existe pas.
+jailReleased = \u00a77Player \u00a7e{0}\u00a77 unjailed.
+jailReleasedPlayerNotify = \u00a77You have been released!
+jailSentenceExtended = Jail time extend to: {0)
 jailSet = \u00a77La prison {0} a \u00e9t\u00e9 cr\u00e9\u00e9.
 jumpError = \u00c7a aurait pu faire mal au cerveau de votre ordinateur.
 kickDefault = Kick\u00e9 du serveur
@@ -263,6 +267,10 @@ serverFull = Le serveur est plein.
 setSpawner = Changed spawner type to {0}
 sheepMalformedColor = Couleur mal form\u00e9e.
 shoutFormat = \u00a77[Crie]\u00a7f {0}
+signFormatFail = \u00a74[{0}]
+signFormatSuccess = \u00a71[{0}]
+signFormatTemplate = [{0}]
+signProtectInvalidLocation = \u00a74You are not allowed to create sign here.
 similarWarpExist = Un warp avec un nom similaire existe d\u00e9j\u00e0.
 slimeMalformedSize = Taille mal form\u00e9e.
 soloMob = Ce monstre aime \u00eatre seul.
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index c9fa21273..42a38807c 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -130,8 +130,12 @@ itemSold = \u00a77Verkocht voor \u00a7c {0} \u00a77 ({1} voorwerpen voor {2} per
 itemSoldConsole = {0} verkocht {1} voor \u00a77 {2} \u00a77 ({3} voorwerpen voor {4} per stuk)
 itemSpawn = \u00a77Geeft {0} {1}
 itemsCsvNotLoaded = De item kunnen niet geladen worden.csv.
+jailAlreadyIncarcerated = \u00a7cPerson is already in jail: {0}
 jailMessage = \u00a7cYou do the crime, you do the time.
 jailNotExist = Die gevangenis bestaat niet.
+jailReleased = \u00a77Player \u00a7e{0}\u00a77 unjailed.
+jailReleasedPlayerNotify = \u00a77You have been released!
+jailSentenceExtended = Jail time extend to: {0)
 jailSet = \u00a77Gevangenis {0} is ingesteld
 jumpError = Dat zou je computers hersenen beschadigen.
 kickDefault = Gekicked van de server
@@ -263,6 +267,10 @@ serverFull = Server is vol
 setSpawner = Changed spawner type to {0}
 sheepMalformedColor = Misvoormde kleur.
 shoutFormat = \u00a77[Shout]\u00a7f {0}
+signFormatFail = \u00a74[{0}]
+signFormatSuccess = \u00a71[{0}]
+signFormatTemplate = [{0}]
+signProtectInvalidLocation = \u00a74You are not allowed to create sign here.
 similarWarpExist = Er bestaat al een warp met dezelfde naam.
 slimeMalformedSize = Misvoormde grootte.
 soloMob = Die mob is liever in zijn eentje