From f4e6f01cd9274476e3cb7334bf3819c6f2ec8856 Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Mon, 11 Aug 2014 18:40:24 +0100
Subject: Add mailFormat TL key.

---
 .../src/com/earth2me/essentials/commands/Commandmail.java      | 10 +++++-----
 Essentials/src/messages.properties                             |  1 +
 Essentials/src/messages_cs.properties                          |  1 +
 Essentials/src/messages_da.properties                          |  1 +
 Essentials/src/messages_de.properties                          |  1 +
 Essentials/src/messages_en.properties                          |  1 +
 Essentials/src/messages_es.properties                          |  1 +
 Essentials/src/messages_et.properties                          |  1 +
 Essentials/src/messages_fi.properties                          |  1 +
 Essentials/src/messages_fr.properties                          |  1 +
 Essentials/src/messages_hu.properties                          |  1 +
 Essentials/src/messages_it.properties                          |  1 +
 Essentials/src/messages_ko.properties                          |  1 +
 Essentials/src/messages_lt.properties                          |  1 +
 Essentials/src/messages_nl.properties                          |  1 +
 Essentials/src/messages_pl.properties                          |  1 +
 Essentials/src/messages_pt.properties                          |  1 +
 Essentials/src/messages_pt_BR.properties                       |  1 +
 Essentials/src/messages_ro.properties                          |  1 +
 Essentials/src/messages_ru.properties                          |  1 +
 Essentials/src/messages_sv.properties                          |  1 +
 Essentials/src/messages_tr.properties                          |  1 +
 Essentials/src/messages_zh.properties                          |  1 +
 Essentials/src/messages_zh_HK.properties                       |  1 +
 Essentials/src/messages_zh_TW.properties                       |  1 +
 25 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
index d6b44f33a..808842884 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
@@ -59,7 +59,7 @@ public class Commandmail extends EssentialsCommand
 				throw new Exception(tl("playerNeverOnServer", args[1]));
 			}
 
-			final String mail = user.getName() + ": " + StringUtil.sanitizeString(FormatUtil.stripFormat(getFinalArg(args, 2)));
+			final String mail = tl("mailFormat", user.getName(), StringUtil.sanitizeString(FormatUtil.stripFormat(getFinalArg(args, 2))));
 			if (mail.length() > 1000)
 			{
 				throw new Exception(tl("mailTooLong"));
@@ -90,7 +90,7 @@ public class Commandmail extends EssentialsCommand
 			{
 				throw new Exception(tl("noPerm", "essentials.mail.sendall"));
 			}
-			ess.runTaskAsynchronously(new SendAll(user.getName() + ": " + FormatUtil.stripFormat(getFinalArg(args, 1))));
+			ess.runTaskAsynchronously(new SendAll(tl("mailFormat", user.getName(), FormatUtil.stripFormat(getFinalArg(args, 1)))));
 			user.sendMessage(tl("mailSent"));
 			return;
 		}
@@ -121,13 +121,13 @@ public class Commandmail extends EssentialsCommand
 			{
 				throw new Exception(tl("playerNeverOnServer", args[1]));
 			}
-			u.addMail("Server: " + getFinalArg(args, 2));
+			u.addMail(tl("mailFormat", "Server", getFinalArg(args, 2)));
 			sender.sendMessage(tl("mailSent"));
 			return;
 		}
 		else if (args.length >= 2 && "sendall".equalsIgnoreCase(args[0]))
 		{
-			ess.runTaskAsynchronously(new SendAll("Server: " + getFinalArg(args, 1)));
+			ess.runTaskAsynchronously(new SendAll(tl("mailFormat", "Server", getFinalArg(args, 1))));
 			sender.sendMessage(tl("mailSent"));
 			return;
 		}
@@ -139,7 +139,7 @@ public class Commandmail extends EssentialsCommand
 			{
 				throw new Exception(tl("playerNeverOnServer", args[0]));
 			}
-			u.addMail("Server: " + getFinalArg(args, 1));
+			u.addMail(tl("mailFormat", "Server", getFinalArg(args, 1)));
 			sender.sendMessage(tl("mailSent"));
 			return;
 		}
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 6f59ea6b4..2d438cf3f 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -554,3 +554,4 @@ mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail\:
 mailMessage={0}
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties
index 154458df1..26c3e6fa4 100644
--- a/Essentials/src/messages_cs.properties
+++ b/Essentials/src/messages_cs.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index e44907671..86a5ef345 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 908681464..fa4742ae6 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 6f59ea6b4..2d438cf3f 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -554,3 +554,4 @@ mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail\:
 mailMessage={0}
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index b8e106033..74992540f 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_et.properties b/Essentials/src/messages_et.properties
index 745d65cca..ac9e9864d 100644
--- a/Essentials/src/messages_et.properties
+++ b/Essentials/src/messages_et.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties
index 09558ea92..da5451d0d 100644
--- a/Essentials/src/messages_fi.properties
+++ b/Essentials/src/messages_fi.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index a1f9b7d0e..a557fa366 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_hu.properties b/Essentials/src/messages_hu.properties
index a586a7364..0ecb75fab 100644
--- a/Essentials/src/messages_hu.properties
+++ b/Essentials/src/messages_hu.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties
index de97e343f..444173292 100644
--- a/Essentials/src/messages_it.properties
+++ b/Essentials/src/messages_it.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_ko.properties b/Essentials/src/messages_ko.properties
index 846cbec45..8f47f78ed 100644
--- a/Essentials/src/messages_ko.properties
+++ b/Essentials/src/messages_ko.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_lt.properties b/Essentials/src/messages_lt.properties
index de11c178c..3070b45c3 100644
--- a/Essentials/src/messages_lt.properties
+++ b/Essentials/src/messages_lt.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 80e69904f..51c3c6936 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties
index 45ffac5f9..f402a0e99 100644
--- a/Essentials/src/messages_pl.properties
+++ b/Essentials/src/messages_pl.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties
index e5fae6941..bcb1fb7f0 100644
--- a/Essentials/src/messages_pt.properties
+++ b/Essentials/src/messages_pt.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_pt_BR.properties b/Essentials/src/messages_pt_BR.properties
index df9c92517..d989429d5 100644
--- a/Essentials/src/messages_pt_BR.properties
+++ b/Essentials/src/messages_pt_BR.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties
index ed3285090..66341ec91 100644
--- a/Essentials/src/messages_ro.properties
+++ b/Essentials/src/messages_ro.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties
index 59b80a9be..af4e222d2 100644
--- a/Essentials/src/messages_ru.properties
+++ b/Essentials/src/messages_ru.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties
index 05bb127fc..4f5a2adda 100644
--- a/Essentials/src/messages_sv.properties
+++ b/Essentials/src/messages_sv.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_tr.properties b/Essentials/src/messages_tr.properties
index 39c3a0e9b..898458eb1 100644
--- a/Essentials/src/messages_tr.properties
+++ b/Essentials/src/messages_tr.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties
index c0cce73ba..711f8d71d 100644
--- a/Essentials/src/messages_zh.properties
+++ b/Essentials/src/messages_zh.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties
index 2b7bd0233..341373af4 100644
--- a/Essentials/src/messages_zh_HK.properties
+++ b/Essentials/src/messages_zh_HK.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties
index 0869ea9e4..b49ee4e52 100644
--- a/Essentials/src/messages_zh_TW.properties
+++ b/Essentials/src/messages_zh_TW.properties
@@ -555,3 +555,4 @@ mailMessage={0}
 
 whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
 playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
-- 
cgit v1.2.3