Updating actions to allow translations, and colour.

7 files changed, 12 insertions, 8 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandme.java b/Essentials/src/com/earth2me/essentials/commands/Commandme.java
index 02bcecdc2..17c3cca13 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandme.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandme.java
@@ -24,15 +24,13 @@ public class Commandme extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final StringBuilder message = new StringBuilder();
-		message.append("* ");
-		message.append(user.getDisplayName());
-		message.append(' ');
-		for (int i = 0; i < args.length; i++)
+
+		String message = getFinalArg(args, 1);
+		if (user.isAuthorized("essentials.chat.color"))
 		{
-			message.append(args[i]);
-			message.append(' ');
+			message = message.replaceAll("&([0-9a-f])", "§$1");
 		}
-		ess.broadcastMessage(user, message.toString());
+
+		ess.broadcastMessage(user, Util.format("action", user.getDisplayName(), message));
 	}
 }
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index c3019473c..4b67d5821 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -2,6 +2,7 @@
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
+action = * {0} {1}
 addedToAccount = \u00a7a{0} has been added to your account.
 addedToOthersAccount = \u00a7a{0} has been added to {1} account.
 alertBroke = broke:
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index 5ca3048b6..80e6a158d 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -2,6 +2,7 @@
 # Single quotes have to be doubled: ''
 # Translations start here
 # by: papand13, papand13@gmail.com
+action = * {0} {1}
 addedToAccount = \u00a7a{0} er tilf\u00f8jet til din konto.
 addedToOthersAccount = \u00a7a{0} er blevet tilf\u00f8jet til {1} konto.
 alertBroke = \u00f8delagde:
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index da78e0778..4e94fc414 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -2,6 +2,7 @@
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
+action = * {0} {1}
 addedToAccount = \u00a7a{0} wurden zu deiner Geldb\u00f6rse hinzugef\u00fcgt.
 addedToOthersAccount = \u00a7a{0} wurden zu {1}s Konto hinzugef\u00fcgt.
 alertBroke = zerst\u00f6rt:
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 144d1ec72..dbd72da2a 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -2,6 +2,7 @@
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
+action = * {0} {1}
 addedToAccount = \u00a7a{0} has been added to your account.
 addedToOthersAccount = \u00a7a{0} has been added to {1} account.
 alertBroke = broke:
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 7fd1cd910..9e7dfde09 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -2,6 +2,7 @@
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
+action = * {0} {1}
 addedToAccount = \u00a7a{0} a \u00e9t\u00e9 rajout\u00e9 a votre compte.
 addedToOthersAccount = \u00a7a{0} a \u00e9t\u00e9 ajout\u00e9 \u00e0 {1} compte.
 alertBroke = a cass\u00e9: 
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index e12fc07b8..d8d2e2665 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -2,6 +2,7 @@
 # Single quotes have to be doubled: ''
 # Translations start here
 # by: Geertje123
+action = * {0} {1}
 addedToAccount = \u00a7a{0} is gestort op je account.
 addedToOthersAccount = \u00a7a{0} is overgemaakt naar {1}''s rekening
 alertBroke = gebroken: