Add mailFormat TL key.

SkyWatcher2019 · Aug 11, 2014 · f4e6f01 · f4e6f01
1 parent a24530b
commit f4e6f01
Show file tree

Hide file tree

Showing 25 changed files with 29 additions and 5 deletions.
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
@@ -59,7 +59,7 @@ public void run(final Server server, final User user, final String commandLabel,
 				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 void run(final Server server, final User user, final String commandLabel,
 			{
 				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 @@ else if (args.length >= 3 && "send".equalsIgnoreCase(args[0]))
 			{
 				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 @@ else if (args.length >= 2)
 			{
 				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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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}